<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>68201</bug_id>
          
          <creation_ts>2011-09-15 17:47:37 -0700</creation_ts>
          <short_desc>Report AXValueChanged when value changes in element with role=textbox.</short_desc>
          <delta_ts>2011-09-21 09:44:23 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Alice Boxhall">aboxhall</reporter>
          <assigned_to name="Alice Boxhall">aboxhall</assigned_to>
          <cc>cfleizach</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>468188</commentid>
    <comment_count>0</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-15 17:47:37 -0700</bug_when>
    <thetext>Report AXValueChanged when value changes in element with role=textbox.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468189</commentid>
    <comment_count>1</comment_count>
      <attachid>107573</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-15 17:48:28 -0700</bug_when>
    <thetext>Created attachment 107573
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468190</commentid>
    <comment_count>2</comment_count>
      <attachid>107573</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-15 17:49:48 -0700</bug_when>
    <thetext>Comment on attachment 107573
Patch

Oops, will remove the .pbxproj file shortly.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468548</commentid>
    <comment_count>3</comment_count>
      <attachid>107573</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-16 09:58:16 -0700</bug_when>
    <thetext>Comment on attachment 107573
Patch

i think using isTextControl() may cast a wider net then we want. won&apos;t it include native text controls tools? we should probably limit this to aria text controls, because the native controls are already handled</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468558</commentid>
    <comment_count>4</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 10:03:05 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; (From update of attachment 107573 [details])
&gt; i think using isTextControl() may cast a wider net then we want. won&apos;t it include native text controls tools? we should probably limit this to aria text controls, because the native controls are already handled

Ah yes, you&apos;re right: I was confused because it checks for textbox AX roles, but they are set for native text boxes as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468781</commentid>
    <comment_count>5</comment_count>
      <attachid>107717</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 13:35:29 -0700</bug_when>
    <thetext>Created attachment 107717
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468786</commentid>
    <comment_count>6</comment_count>
      <attachid>107717</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 13:39:56 -0700</bug_when>
    <thetext>Comment on attachment 107717
Patch

Just noticed an error in this patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468788</commentid>
    <comment_count>7</comment_count>
      <attachid>107718</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 13:42:42 -0700</bug_when>
    <thetext>Created attachment 107718
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468811</commentid>
    <comment_count>8</comment_count>
      <attachid>107718</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-16 14:32:38 -0700</bug_when>
    <thetext>Comment on attachment 107718
Patch

i would move isARIATextControl to AXObject.h so that you don&apos;t have to do toAccessibilityRenderObject
That&apos;s the direction the code has been moving so that we can abstract away more from AXRenderObject and only have to worry about AXObject
otherwise looks ok to me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468889</commentid>
    <comment_count>9</comment_count>
      <attachid>107743</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 16:34:07 -0700</bug_when>
    <thetext>Created attachment 107743
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468892</commentid>
    <comment_count>10</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-16 16:35:56 -0700</bug_when>
    <thetext>(In reply to comment #8)
&gt; (From update of attachment 107718 [details])
&gt; i would move isARIATextControl to AXObject.h so that you don&apos;t have to do toAccessibilityRenderObject
&gt; That&apos;s the direction the code has been moving so that we can abstract away more from AXRenderObject and only have to worry about AXObject
&gt; otherwise looks ok to me

Done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>468954</commentid>
    <comment_count>11</comment_count>
      <attachid>107743</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-16 18:02:31 -0700</bug_when>
    <thetext>Comment on attachment 107743
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107743&amp;action=review

r=me, after fix for the brackets

&gt; Source/WebCore/accessibility/AccessibilityRenderObject.cpp:3371
&gt;          }

no brackets needed for this one line else if</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>469923</commentid>
    <comment_count>12</comment_count>
      <attachid>107968</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-19 23:26:27 -0700</bug_when>
    <thetext>Created attachment 107968
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>469926</commentid>
    <comment_count>13</comment_count>
      <attachid>107743</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-19 23:30:11 -0700</bug_when>
    <thetext>Comment on attachment 107743
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107743&amp;action=review

&gt;&gt; Source/WebCore/accessibility/AccessibilityRenderObject.cpp:3371
&gt;&gt;          }
&gt; 
&gt; no brackets needed for this one line else if

Actually, I ended up changing this a bit more significantly: removed the else, and the break above. My reasoning: 
- The method below doesn&apos;t break out of the loop when it posts the AXLiveRegionChanged notification, and it seems like the logic should be similar across the two methods (in fact, possibly the loop needs to be refactored out into a common method)
- If there is both aria-live=true and role=textbox, both notifications are relevant

Please note, I also modified the selection-value-changes-for-aria-textbox LayoutTest as part of this update; it was broken by this change before.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470094</commentid>
    <comment_count>14</comment_count>
      <attachid>107968</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-20 08:53:02 -0700</bug_when>
    <thetext>Comment on attachment 107968
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107968&amp;action=review

thanks. a few thoughts inline

&gt; LayoutTests/platform/mac/accessibility/selection-value-changes-for-aria-textbox.html:34
&gt;          }

it seems like we should not be sending out two AXValueChange notifications for the same object (For the same value change). 
i suspect we might want to check that an object is only an aria text control and not a standard text control...

&gt; Source/WebCore/accessibility/AccessibilityRenderObject.cpp:3370
&gt;      }

it looks like there&apos;s already a local instance of axObjectCache() (cache) that can be used here (and also in the live region block)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470521</commentid>
    <comment_count>15</comment_count>
      <attachid>108091</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-20 17:53:02 -0700</bug_when>
    <thetext>Created attachment 108091
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470525</commentid>
    <comment_count>16</comment_count>
      <attachid>107968</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-20 18:00:07 -0700</bug_when>
    <thetext>Comment on attachment 107968
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107968&amp;action=review

&gt;&gt; LayoutTests/platform/mac/accessibility/selection-value-changes-for-aria-textbox.html:34
&gt;&gt;          }
&gt; 
&gt; it seems like we should not be sending out two AXValueChange notifications for the same object (For the same value change). 
&gt; i suspect we might want to check that an object is only an aria text control and not a standard text control...

That makes sense. This is what happens when I try to code the same day as getting off a transcontinental flight.

&gt;&gt; Source/WebCore/accessibility/AccessibilityRenderObject.cpp:3370
&gt;&gt;      }
&gt; 
&gt; it looks like there&apos;s already a local instance of axObjectCache() (cache) that can be used here (and also in the live region block)

Fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470834</commentid>
    <comment_count>17</comment_count>
      <attachid>108091</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-21 08:41:54 -0700</bug_when>
    <thetext>Comment on attachment 108091
Patch

looks ok. r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470876</commentid>
    <comment_count>18</comment_count>
      <attachid>108091</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-09-21 09:44:18 -0700</bug_when>
    <thetext>Comment on attachment 108091
Patch

Clearing flags on attachment: 108091

Committed r95641: &lt;http://trac.webkit.org/changeset/95641&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>470877</commentid>
    <comment_count>19</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-09-21 09:44:23 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>107573</attachid>
            <date>2011-09-15 17:48:28 -0700</date>
            <delta_ts>2011-09-16 13:35:21 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110916104825.patch</filename>
            <type>text/plain</type>
            <size>6805</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxMDYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwMzNhNmJiY2Q5MWZlYzliMDJlNGMy
MDkzZDJlNDdkNTc2ZWYxOTI3Li41M2MyNTlhYTllYzA0YjlmM2NjNzE0ZTg5ZjU5ZTNiM2FjMWM3
ZWRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMTUgIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdo
ZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nl
c3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0
OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJv
bGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWw6IEFkZGVkLgorCiAyMDExLTA5LTE0ICBDYXJ5
IENsYXJrICA8Y2FyeWNsYXJrQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZDsgbmV3
IGJhc2VsaW5lcyAoU2tpYSBvbiBNYWMpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLWV4
cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRi
b3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRh
Yjc5MGNlZjMzNTBiNzE4MjY5OTJhMDQyMjJkZGVlOWZmMTVmY2QKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVw
b3J0cy1ub3RpZmljYXRpb25zLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK0FMRVJUOiBT
dWNjZXNzZnVsbHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5
IHJlY2VpdmVkIEFYVmFsdWVDaGFuZ2VkLgorQUxFUlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBB
WFZhbHVlQ2hhbmdlZC4KK1RoaXMgdGVzdHMgdGhhdCB0aGUgQVhWYWx1ZUNoYW5nZWQgbm90aWZp
Y2F0aW9uIGlzIGNvcnJlY3RseSByZXBvcnRlZCBmb3Igbm9uLW5hdGl2ZSB0ZXh0IGJveGVzIHdo
ZW4gY29udGVudCBpcyBjaGFuZ2VkLgorY2hhbmdlZCBpbm5lclRleHQKKwpkaWZmIC0tZ2l0IGEv
TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4dGJveC1yb2xlLXJlcG9y
dHMtbm90aWZpY2F0aW9ucy5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2li
aWxpdHkvdGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sCm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LjA4OTlkOWJlNjlkMWQwMDlkMDZiZDFjZDZkODhjM2MzMWZmNmZjNTMKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUt
cmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwKQEAgLTAsMCArMSw0NyBAQAorPCFET0NUWVBFIEhU
TUwgUFVCTElDPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i
Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBz
dWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zh
c3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5
PgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZhbHVlQ2hhbmdlZCBub3RpZmljYXRpb24gaXMgY29y
cmVjdGx5IHJlcG9ydGVkIGZvciBub24tbmF0aXZlIHRleHQgYm94ZXMgd2hlbiBjb250ZW50IGlz
IGNoYW5nZWQuPGJyPgorPGRpdiByb2xlPSJ0ZXh0Ym94IiBpZD0iYXJpYVRleHRCb3giIGFyaWEt
bXVsdGlsaW5lPSJmYWxzZSIgdGFiaW5kZXg9IjAiPlNvbWUgdGV4dCBpbiBhIHRleHRib3guPC9k
aXY+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5s
YXlvdXRUZXN0Q29udHJvbGxlciAmJiB3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsK
KyAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKwor
ICAgICAgICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5sb2dBY2Nlc3NpYmlsaXR5RXZlbnRzKCk7
CisgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAg
ICAgICAgdmFyIGFyaWFUZXh0Qm94ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFyaWFUZXh0
Qm94Iik7CisgICAgICAgIGFyaWFUZXh0Qm94LmZvY3VzKCk7CisgICAgICAgIHZhciB0ZXh0Ym94
QXhFbGVtZW50ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CisgICAg
ICAgIHRleHRib3hBeEVsZW1lbnQuYWRkTm90aWZpY2F0aW9uTGlzdGVuZXIobG9nTm90aWZpY2F0
aW9uKTsKKyAgICAgICAgcGVuZGluZ05vdGlmaWNhdGlvbnMgPSAzOworICAgICAgICBhcmlhVGV4
dEJveC5maXJzdENoaWxkLmRlbGV0ZURhdGEoMCwgNSk7CisgICAgICAgIGFyaWFUZXh0Qm94LnRl
eHRDb250ZW50ID0gImNoYW5nZWQgdGV4dENvbnRlbnQiOworICAgICAgICBhcmlhVGV4dEJveC5p
bm5lclRleHQgPSAiY2hhbmdlZCBpbm5lclRleHQiOworICAgIH0KKworICAgIGZ1bmN0aW9uIGxv
Z05vdGlmaWNhdGlvbihub3RpZmljYXRpb24pIHsKKyAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9
PSAiQVhWYWx1ZUNoYW5nZWQiKSB7CisgICAgICAgICAgICBhbGVydCgiU3VjY2Vzc2Z1bGx5IHJl
Y2VpdmVkIEFYVmFsdWVDaGFuZ2VkLiIpOworICAgICAgICAgICAgcGVuZGluZ05vdGlmaWNhdGlv
bnMtLTsKKyAgICAgICAgICAgIGlmIChwZW5kaW5nTm90aWZpY2F0aW9ucyA9PSAwKSB7CisgICAg
ICAgICAgICAgICAgdGV4dGJveEF4RWxlbWVudC5yZW1vdmVOb3RpZmljYXRpb25MaXN0ZW5lcigp
OworICAgICAgICAgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25l
KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQ
YXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291
cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n
CmluZGV4IGIyZWVhMjIxMWIxODRiOWQ0Yjc0YmNhMTljYzk1M2VmZjIwMjkyNDguLmYyMzg3NWQ5
NGQ4MDA2ZmU5MzI1ODFhY2M4NzEyNDVlM2I0NGY5OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAxMS0wOS0xNSAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4K
KworICAgICAgICBSZXBvcnQgQVhWYWx1ZUNoYW5nZWQgd2hlbiB2YWx1ZSBjaGFuZ2VzIGluIGVs
ZW1lbnQgd2l0aCByb2xlPXRleHRib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD02ODIwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gt
cm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMuaHRtbAorCisgICAgICAgICogV2ViQ29yZS54Y29k
ZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp
bGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVu
ZGVyT2JqZWN0Ojpjb250ZW50Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls
aXR5UmVuZGVyT2JqZWN0OjpjaGlsZHJlbkNoYW5nZWQpOgorCiAyMDExLTA5LTE0ICBFcmljIENh
cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhUGxheWVyUHJp
dmF0ZUFWRm91bmRhdGlvbk9iakMncyAicGVyaW9kaWMgdGltZSBvYnNlcnZlciIgaXMgdW5uZWNl
c3NhcnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2pl
Y3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4
cHJvagppbmRleCA4ZWViNTkwMzMzNWNjZDZkNjA3NWZjNjIwMzdmZjI1ZmUyYTg4ODdhLi4wMTY5
ZjQ2ZDRlNTI3ZTU2Yzg0NjIyZDc3NmMxNDMwZWIxNzJiNDBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dl
YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yMzU2OCw3ICsyMzU2
OCw3IEBACiAJCTA4NjdENjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLyA9
IHsKIAkJCWlzYSA9IFBCWFByb2plY3Q7CiAJCQlidWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gMTQ5
QzI4NDMwODkwMkIxMTAwOEE5RUZDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJY
UHJvamVjdCAiV2ViQ29yZSIgKi87Ci0JCQljb21wYXRpYmlsaXR5VmVyc2lvbiA9ICJYY29kZSAy
LjQiOworCQkJY29tcGF0aWJpbGl0eVZlcnNpb24gPSAiWGNvZGUgMy4yIjsKIAkJCWRldmVsb3Bt
ZW50UmVnaW9uID0gRW5nbGlzaDsKIAkJCWhhc1NjYW5uZWRGb3JFbmNvZGluZ3MgPSAxOwogCQkJ
a25vd25SZWdpb25zID0gKApAQCAtMjYzNzMsNiArMjYzNzMsNyBAQAogCQkJaXNhID0gWENCdWls
ZENvbmZpZ3VyYXRpb247CiAJCQliYXNlQ29uZmlndXJhdGlvblJlZmVyZW5jZSA9IDFDREQ0NUU1
MEJBOUM4NDYwMEY5MDE0NyAvKiBXZWJDb3JlLnhjY29uZmlnICovOwogCQkJYnVpbGRTZXR0aW5n
cyA9IHsKKwkJCQlDT1BZX1BIQVNFX1NUUklQID0gWUVTOwogCQkJCUZSQU1FV09SS19TRUFSQ0hf
UEFUSFMgPSAoCiAJCQkJCSIkKGluaGVyaXRlZCkiLAogCQkJCQkiJChGUkFNRVdPUktfU0VBUkNI
X1BBVEhTX1FVT1RFRF9GT1JfVEFSR0VUXzEpIiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCmluZGV4IDgz
ODk5YTI1NzM2Mzk0MGUwNTdhNmFhNzg2NWM0NjVkZjU1YzA0OWEuLjMwMjMzZTIwMGNlYTk0ZDNh
NGE4ODIzYzk4ODVhYWVmODY4YzY4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz
c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtMzM2Niw2
ICszMzY2LDkgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb250ZW50Q2hhbmdl
ZCgpCiAgICAgICAgIGlmIChwYXJlbnQtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24oKSkgewogICAg
ICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJlbmRlclBhcmVudCwg
QVhPYmplY3RDYWNoZTo6QVhMaXZlUmVnaW9uQ2hhbmdlZCwgdHJ1ZSk7CiAgICAgICAgICAgICBi
cmVhazsKKyAgICAgICAgfSBlbHNlIGlmIChwYXJlbnQtPmlzVGV4dENvbnRyb2woKSkgeworICAg
ICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJlbmRlclBhcmVudCwg
QVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5nZWQsIHRydWUpOworICAgICAgICAgICAgYnJlYWs7
CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0zNDAzLDYgKzM0MDYsOCBAQCB2b2lkIEFjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3Q6OmNoaWxkcmVuQ2hhbmdlZCgpCiAgICAgICAgICAgICAvLyBJZiB0
aGlzIGVsZW1lbnQgc3VwcG9ydHMgQVJJQSBsaXZlIHJlZ2lvbnMsIHRoZW4gbm90aWZ5IHRoZSBB
VCBvZiBjaGFuZ2VzLgogICAgICAgICAgICAgaWYgKGF4UGFyZW50LT5zdXBwb3J0c0FSSUFMaXZl
UmVnaW9uKCkpCiAgICAgICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0
aW9uKGF4UGFyZW50LT5yZW5kZXJlcigpLCBBWE9iamVjdENhY2hlOjpBWExpdmVSZWdpb25DaGFu
Z2VkLCB0cnVlKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGF4UGFyZW50LT5pc1RleHRDb250cm9s
KCkpCisgICAgICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKGF4
UGFyZW50LT5yZW5kZXJlcigpLCBBWE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwgdHJ1ZSk7
CiAgICAgICAgIH0KICAgICB9CiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>107717</attachid>
            <date>2011-09-16 13:35:29 -0700</date>
            <delta_ts>2011-09-16 13:42:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110917063527.patch</filename>
            <type>text/plain</type>
            <size>6950</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA5ZWJjOGUwNWVhZDQxMTI1YzlmYTc4MzYyZDlhZjRlOWI0ZTYyZjlhLi5mZDBjMDMy
NjMwNzM4OTM4NjVmN2I0ODA4MDc2YzUwYjRmMjAxMzRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK
KzIwMTEtMDktMTYgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAg
ICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdoZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50
IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBv
cnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0
bWw6IEFkZGVkLgorCiAyMDExLTA5LTE2ICBKYW1lcyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBGaXggSFRNTDUgcGFyc2VyJ3MgYWRvcHRpb24gYWdlbmN5IGFs
Z29yaXRobSB0byByZXBhcmVudCBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlv
bnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv
dGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy1leHBlY3RlZC50eHQKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uZGFiNzkwY2VmMzM1MGI3MTgyNjk5MmEwNDIyMmRkZWU5ZmYxNWZjZAotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9s
ZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorQUxF
UlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFZhbHVlQ2hhbmdlZC4KK0FMRVJUOiBTdWNjZXNz
ZnVsbHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5IHJlY2Vp
dmVkIEFYVmFsdWVDaGFuZ2VkLgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZhbHVlQ2hhbmdlZCBu
b3RpZmljYXRpb24gaXMgY29ycmVjdGx5IHJlcG9ydGVkIGZvciBub24tbmF0aXZlIHRleHQgYm94
ZXMgd2hlbiBjb250ZW50IGlzIGNoYW5nZWQuCitjaGFuZ2VkIGlubmVyVGV4dAorCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUt
cmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj
ZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uMDg5OWQ5YmU2OWQxZDAwOWQwNmJkMWNkNmQ4OGMzYzMxZmY2ZmM1MwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gt
cm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8IURPQ1RZ
UEUgSFRNTCBQVUJMSUM+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo
cmVmPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0Pgor
dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i
Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor
PGJvZHk+CitUaGlzIHRlc3RzIHRoYXQgdGhlIEFYVmFsdWVDaGFuZ2VkIG5vdGlmaWNhdGlvbiBp
cyBjb3JyZWN0bHkgcmVwb3J0ZWQgZm9yIG5vbi1uYXRpdmUgdGV4dCBib3hlcyB3aGVuIGNvbnRl
bnQgaXMgY2hhbmdlZC48YnI+Cis8ZGl2IHJvbGU9InRleHRib3giIGlkPSJhcmlhVGV4dEJveCIg
YXJpYS1tdWx0aWxpbmU9ImZhbHNlIiB0YWJpbmRleD0iMCI+U29tZSB0ZXh0IGluIGEgdGV4dGJv
eC48L2Rpdj4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBpZiAod2lu
ZG93LmxheW91dFRlc3RDb250cm9sbGVyICYmIHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxl
cikgeworICAgICAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgp
OworCisgICAgICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmxvZ0FjY2Vzc2liaWxpdHlFdmVu
dHMoKTsKKyAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsK
KworICAgICAgICB2YXIgYXJpYVRleHRCb3ggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYXJp
YVRleHRCb3giKTsKKyAgICAgICAgYXJpYVRleHRCb3guZm9jdXMoKTsKKyAgICAgICAgdmFyIHRl
eHRib3hBeEVsZW1lbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsK
KyAgICAgICAgdGV4dGJveEF4RWxlbWVudC5hZGROb3RpZmljYXRpb25MaXN0ZW5lcihsb2dOb3Rp
ZmljYXRpb24pOworICAgICAgICBwZW5kaW5nTm90aWZpY2F0aW9ucyA9IDM7CisgICAgICAgIGFy
aWFUZXh0Qm94LmZpcnN0Q2hpbGQuZGVsZXRlRGF0YSgwLCA1KTsKKyAgICAgICAgYXJpYVRleHRC
b3gudGV4dENvbnRlbnQgPSAiY2hhbmdlZCB0ZXh0Q29udGVudCI7CisgICAgICAgIGFyaWFUZXh0
Qm94LmlubmVyVGV4dCA9ICJjaGFuZ2VkIGlubmVyVGV4dCI7CisgICAgfQorCisgICAgZnVuY3Rp
b24gbG9nTm90aWZpY2F0aW9uKG5vdGlmaWNhdGlvbikgeworICAgICAgICBpZiAobm90aWZpY2F0
aW9uID09ICJBWFZhbHVlQ2hhbmdlZCIpIHsKKyAgICAgICAgICAgIGFsZXJ0KCJTdWNjZXNzZnVs
bHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuIik7CisgICAgICAgICAgICBwZW5kaW5nTm90aWZp
Y2F0aW9ucy0tOworICAgICAgICAgICAgaWYgKHBlbmRpbmdOb3RpZmljYXRpb25zID09IDApIHsK
KyAgICAgICAgICAgICAgICB0ZXh0Ym94QXhFbGVtZW50LnJlbW92ZU5vdGlmaWNhdGlvbkxpc3Rl
bmVyKCk7CisgICAgICAgICAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLm5vdGlm
eURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHN1Y2Nlc3Nm
dWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMv
cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu
Z2VMb2cKaW5kZXggYWVjZDMzMjlhMDZkYjI3ZGM1MTAyNGY3ODAzNTkxMzlkNmFhNTE2Zi4uODVk
YzZjM2Q0NTQyY2YxNjNhMzg5NWIzMDdiYmZlYWE2ZTA0MGU1MyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE4IEBACisyMDExLTA5LTE2ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0u
b3JnPgorCisgICAgICAgIFJlcG9ydCBBWFZhbHVlQ2hhbmdlZCB3aGVuIHZhbHVlIGNoYW5nZXMg
aW4gZWxlbWVudCB3aXRoIHJvbGU9dGV4dGJveC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4
dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sCisKKyAgICAgICAgKiBhY2Nlc3Np
YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNBUklBVGV4dENvbnRyb2wpOgorICAgICAgICAo
V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29udGVudENoYW5nZWQpOgorICAg
ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2hpbGRyZW5DaGFuZ2Vk
KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoK
KwogMjAxMS0wOS0xNiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAg
IERGRyBKSVQgc2hvdWxkIGlubGluZSBNYXRoLmFicwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXgg
ODM4OTlhMjU3MzYzOTQwZTA1N2E2YWE3ODY1YzQ2NWRmNTVjMDQ5YS4uOWY2ZTBkMzIyOTBkZjcy
ZTcxMWU1ZGE1YTMyNGRiZGM3NGE0ZDYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj
ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC03Njcs
NiArNzY3LDExIEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNHcm91cCgpIGNv
bnN0CiB7CiAgICAgcmV0dXJuIHJvbGVWYWx1ZSgpID09IEdyb3VwUm9sZTsKIH0KKworYm9vbCBB
Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc0FSSUFUZXh0Q29udHJvbCgpIGNvbnN0Cit7Cisg
ICAgcmV0dXJuIGFyaWFSb2xlQXR0cmlidXRlKCkgPT0gVGV4dEFyZWFSb2xlIHx8IGFyaWFSb2xl
QXR0cmlidXRlKCkgPT0gVGV4dEZpZWxkUm9sZTsKK30KICAgICAKIEFjY2Vzc2liaWxpdHlPYmpl
Y3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNlbGVjdGVkUmFkaW9CdXR0b24oKQogewpA
QCAtMzM2Niw2ICszMzcxLDkgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb250
ZW50Q2hhbmdlZCgpCiAgICAgICAgIGlmIChwYXJlbnQtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24o
KSkgewogICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJlbmRl
clBhcmVudCwgQVhPYmplY3RDYWNoZTo6QVhMaXZlUmVnaW9uQ2hhbmdlZCwgdHJ1ZSk7CiAgICAg
ICAgICAgICBicmVhazsKKyAgICAgICAgfSBlbHNlIGlmIChwYXJlbnQtPmlzQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdCgpICYmIHRvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdChwYXJlbnQpLT5p
c0FSSUFUZXh0Q29udHJvbCgpKSB7CisgICAgICAgICAgICBheE9iamVjdENhY2hlKCktPnBvc3RO
b3RpZmljYXRpb24ocmVuZGVyUGFyZW50LCBBWE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwg
dHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTM0MDMs
NiArMzQxMSw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2hpbGRyZW5DaGFu
Z2VkKCkKICAgICAgICAgICAgIC8vIElmIHRoaXMgZWxlbWVudCBzdXBwb3J0cyBBUklBIGxpdmUg
cmVnaW9ucywgdGhlbiBub3RpZnkgdGhlIEFUIG9mIGNoYW5nZXMuCiAgICAgICAgICAgICBpZiAo
YXhQYXJlbnQtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24oKSkKICAgICAgICAgICAgICAgICBheE9i
amVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24oYXhQYXJlbnQtPnJlbmRlcmVyKCksIEFYT2Jq
ZWN0Q2FjaGU6OkFYTGl2ZVJlZ2lvbkNoYW5nZWQsIHRydWUpOworICAgICAgICAgICAgZWxzZSBp
ZiAoYXhQYXJlbnQtPmlzQVJJQVRleHRDb250cm9sKCkpCisgICAgICAgICAgICAgICAgYXhPYmpl
Y3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKGF4UGFyZW50LT5yZW5kZXJlcigpLCBBWE9iamVj
dENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwgdHJ1ZSk7CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP
YmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdC5oCmluZGV4IDk3YWZkZDE4ZWQ5Yjc2ZWFjMzZmODdkZTYxZjdhYTg1MzU5NDI4MDgu
LjczMWU2NDliYjRjM2JlZDg1MTIxYTExNTYzYzEzODNlOTg2ZDVkY2IgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj
dC5oCkBAIC0yODAsNiArMjgwLDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgcG9zaXRpb25hbERl
c2NyaXB0aW9uRm9yTVNBQSgpIGNvbnN0OwogICAgIFBsYWluVGV4dFJhbmdlIGFyaWFTZWxlY3Rl
ZFRleHRSYW5nZSgpIGNvbnN0OwogICAgIEVsZW1lbnQqIHJvb3RFZGl0YWJsZUVsZW1lbnRGb3JQ
b3NpdGlvbihjb25zdCBQb3NpdGlvbiYpIGNvbnN0OworICAgIGJvb2wgaXNBUklBVGV4dENvbnRy
b2woKSBjb25zdDsKICAgICBib29sIG5vZGVJc1RleHRDb250cm9sKGNvbnN0IE5vZGUqKSBjb25z
dDsKIAogICAgIEVsZW1lbnQqIG1lbnVFbGVtZW50Rm9yTWVudUJ1dHRvbigpIGNvbnN0Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>107718</attachid>
            <date>2011-09-16 13:42:42 -0700</date>
            <delta_ts>2011-09-16 16:33:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110917064240.patch</filename>
            <type>text/plain</type>
            <size>6930</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA5ZWJjOGUwNWVhZDQxMTI1YzlmYTc4MzYyZDlhZjRlOWI0ZTYyZjlhLi5mZDBjMDMy
NjMwNzM4OTM4NjVmN2I0ODA4MDc2YzUwYjRmMjAxMzRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK
KzIwMTEtMDktMTYgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAg
ICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdoZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50
IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBv
cnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0
bWw6IEFkZGVkLgorCiAyMDExLTA5LTE2ICBKYW1lcyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBGaXggSFRNTDUgcGFyc2VyJ3MgYWRvcHRpb24gYWdlbmN5IGFs
Z29yaXRobSB0byByZXBhcmVudCBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlv
bnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv
dGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy1leHBlY3RlZC50eHQKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uZGFiNzkwY2VmMzM1MGI3MTgyNjk5MmEwNDIyMmRkZWU5ZmYxNWZjZAotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9s
ZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorQUxF
UlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFZhbHVlQ2hhbmdlZC4KK0FMRVJUOiBTdWNjZXNz
ZnVsbHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5IHJlY2Vp
dmVkIEFYVmFsdWVDaGFuZ2VkLgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZhbHVlQ2hhbmdlZCBu
b3RpZmljYXRpb24gaXMgY29ycmVjdGx5IHJlcG9ydGVkIGZvciBub24tbmF0aXZlIHRleHQgYm94
ZXMgd2hlbiBjb250ZW50IGlzIGNoYW5nZWQuCitjaGFuZ2VkIGlubmVyVGV4dAorCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUt
cmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj
ZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uMDg5OWQ5YmU2OWQxZDAwOWQwNmJkMWNkNmQ4OGMzYzMxZmY2ZmM1MwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gt
cm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8IURPQ1RZ
UEUgSFRNTCBQVUJMSUM+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo
cmVmPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0Pgor
dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i
Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor
PGJvZHk+CitUaGlzIHRlc3RzIHRoYXQgdGhlIEFYVmFsdWVDaGFuZ2VkIG5vdGlmaWNhdGlvbiBp
cyBjb3JyZWN0bHkgcmVwb3J0ZWQgZm9yIG5vbi1uYXRpdmUgdGV4dCBib3hlcyB3aGVuIGNvbnRl
bnQgaXMgY2hhbmdlZC48YnI+Cis8ZGl2IHJvbGU9InRleHRib3giIGlkPSJhcmlhVGV4dEJveCIg
YXJpYS1tdWx0aWxpbmU9ImZhbHNlIiB0YWJpbmRleD0iMCI+U29tZSB0ZXh0IGluIGEgdGV4dGJv
eC48L2Rpdj4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBpZiAod2lu
ZG93LmxheW91dFRlc3RDb250cm9sbGVyICYmIHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxl
cikgeworICAgICAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgp
OworCisgICAgICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmxvZ0FjY2Vzc2liaWxpdHlFdmVu
dHMoKTsKKyAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsK
KworICAgICAgICB2YXIgYXJpYVRleHRCb3ggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYXJp
YVRleHRCb3giKTsKKyAgICAgICAgYXJpYVRleHRCb3guZm9jdXMoKTsKKyAgICAgICAgdmFyIHRl
eHRib3hBeEVsZW1lbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsK
KyAgICAgICAgdGV4dGJveEF4RWxlbWVudC5hZGROb3RpZmljYXRpb25MaXN0ZW5lcihsb2dOb3Rp
ZmljYXRpb24pOworICAgICAgICBwZW5kaW5nTm90aWZpY2F0aW9ucyA9IDM7CisgICAgICAgIGFy
aWFUZXh0Qm94LmZpcnN0Q2hpbGQuZGVsZXRlRGF0YSgwLCA1KTsKKyAgICAgICAgYXJpYVRleHRC
b3gudGV4dENvbnRlbnQgPSAiY2hhbmdlZCB0ZXh0Q29udGVudCI7CisgICAgICAgIGFyaWFUZXh0
Qm94LmlubmVyVGV4dCA9ICJjaGFuZ2VkIGlubmVyVGV4dCI7CisgICAgfQorCisgICAgZnVuY3Rp
b24gbG9nTm90aWZpY2F0aW9uKG5vdGlmaWNhdGlvbikgeworICAgICAgICBpZiAobm90aWZpY2F0
aW9uID09ICJBWFZhbHVlQ2hhbmdlZCIpIHsKKyAgICAgICAgICAgIGFsZXJ0KCJTdWNjZXNzZnVs
bHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuIik7CisgICAgICAgICAgICBwZW5kaW5nTm90aWZp
Y2F0aW9ucy0tOworICAgICAgICAgICAgaWYgKHBlbmRpbmdOb3RpZmljYXRpb25zID09IDApIHsK
KyAgICAgICAgICAgICAgICB0ZXh0Ym94QXhFbGVtZW50LnJlbW92ZU5vdGlmaWNhdGlvbkxpc3Rl
bmVyKCk7CisgICAgICAgICAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLm5vdGlm
eURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHN1Y2Nlc3Nm
dWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMv
cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu
Z2VMb2cKaW5kZXggYWVjZDMzMjlhMDZkYjI3ZGM1MTAyNGY3ODAzNTkxMzlkNmFhNTE2Zi4uODVk
YzZjM2Q0NTQyY2YxNjNhMzg5NWIzMDdiYmZlYWE2ZTA0MGU1MyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE4IEBACisyMDExLTA5LTE2ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0u
b3JnPgorCisgICAgICAgIFJlcG9ydCBBWFZhbHVlQ2hhbmdlZCB3aGVuIHZhbHVlIGNoYW5nZXMg
aW4gZWxlbWVudCB3aXRoIHJvbGU9dGV4dGJveC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4
dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sCisKKyAgICAgICAgKiBhY2Nlc3Np
YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNBUklBVGV4dENvbnRyb2wpOgorICAgICAgICAo
V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29udGVudENoYW5nZWQpOgorICAg
ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2hpbGRyZW5DaGFuZ2Vk
KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoK
KwogMjAxMS0wOS0xNiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAg
IERGRyBKSVQgc2hvdWxkIGlubGluZSBNYXRoLmFicwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXgg
ODM4OTlhMjU3MzYzOTQwZTA1N2E2YWE3ODY1YzQ2NWRmNTVjMDQ5YS4uYjg2YzM5NDc4N2U2NjU0
OTU2OTY1ODJmYmU5NDIxNTVkYjVhODAzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj
ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC03Njcs
NiArNzY3LDExIEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aXNHcm91cCgpIGNv
bnN0CiB7CiAgICAgcmV0dXJuIHJvbGVWYWx1ZSgpID09IEdyb3VwUm9sZTsKIH0KKworYm9vbCBB
Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojppc0FSSUFUZXh0Q29udHJvbCgpIGNvbnN0Cit7Cisg
ICAgcmV0dXJuIGFyaWFSb2xlQXR0cmlidXRlKCkgPT0gVGV4dEFyZWFSb2xlIHx8IGFyaWFSb2xl
QXR0cmlidXRlKCkgPT0gVGV4dEZpZWxkUm9sZTsKK30KICAgICAKIEFjY2Vzc2liaWxpdHlPYmpl
Y3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNlbGVjdGVkUmFkaW9CdXR0b24oKQogewpA
QCAtMzM2Niw2ICszMzcxLDggQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb250
ZW50Q2hhbmdlZCgpCiAgICAgICAgIGlmIChwYXJlbnQtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24o
KSkgewogICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJlbmRl
clBhcmVudCwgQVhPYmplY3RDYWNoZTo6QVhMaXZlUmVnaW9uQ2hhbmdlZCwgdHJ1ZSk7CiAgICAg
ICAgICAgICBicmVhazsKKyAgICAgICAgfSBlbHNlIGlmIChwYXJlbnQtPmlzQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdCgpICYmIHRvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdChwYXJlbnQpLT5p
c0FSSUFUZXh0Q29udHJvbCgpKSB7CisgICAgICAgICAgICBheE9iamVjdENhY2hlKCktPnBvc3RO
b3RpZmljYXRpb24ocmVuZGVyUGFyZW50LCBBWE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwg
dHJ1ZSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0zNDAzLDYgKzM0MTAsOCBAQCB2b2lkIEFj
Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNoaWxkcmVuQ2hhbmdlZCgpCiAgICAgICAgICAgICAv
LyBJZiB0aGlzIGVsZW1lbnQgc3VwcG9ydHMgQVJJQSBsaXZlIHJlZ2lvbnMsIHRoZW4gbm90aWZ5
IHRoZSBBVCBvZiBjaGFuZ2VzLgogICAgICAgICAgICAgaWYgKGF4UGFyZW50LT5zdXBwb3J0c0FS
SUFMaXZlUmVnaW9uKCkpCiAgICAgICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90
aWZpY2F0aW9uKGF4UGFyZW50LT5yZW5kZXJlcigpLCBBWE9iamVjdENhY2hlOjpBWExpdmVSZWdp
b25DaGFuZ2VkLCB0cnVlKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGF4UGFyZW50LT5pc0FSSUFU
ZXh0Q29udHJvbCgpKQorICAgICAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlm
aWNhdGlvbihheFBhcmVudC0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5n
ZWQsIHRydWUpOwogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAppbmRleCA5N2Fm
ZGQxOGVkOWI3NmVhYzM2Zjg3ZGU2MWY3YWE4NTM1OTQyODA4Li43MzFlNjQ5YmI0YzNiZWQ4NTEy
MWExMTU2M2MxMzgzZTk4NmQ1ZGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np
YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h
Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaApAQCAtMjgwLDYgKzI4MCw3
IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIHBvc2l0aW9uYWxEZXNjcmlwdGlvbkZvck1TQUEoKSBj
b25zdDsKICAgICBQbGFpblRleHRSYW5nZSBhcmlhU2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdDsK
ICAgICBFbGVtZW50KiByb290RWRpdGFibGVFbGVtZW50Rm9yUG9zaXRpb24oY29uc3QgUG9zaXRp
b24mKSBjb25zdDsKKyAgICBib29sIGlzQVJJQVRleHRDb250cm9sKCkgY29uc3Q7CiAgICAgYm9v
bCBub2RlSXNUZXh0Q29udHJvbChjb25zdCBOb2RlKikgY29uc3Q7CiAKICAgICBFbGVtZW50KiBt
ZW51RWxlbWVudEZvck1lbnVCdXR0b24oKSBjb25zdDsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>107743</attachid>
            <date>2011-09-16 16:34:07 -0700</date>
            <delta_ts>2011-09-19 23:30:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110917093405.patch</filename>
            <type>text/plain</type>
            <size>7613</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA5ZWJjOGUwNWVhZDQxMTI1YzlmYTc4MzYyZDlhZjRlOWI0ZTYyZjlhLi5mZDBjMDMy
NjMwNzM4OTM4NjVmN2I0ODA4MDc2YzUwYjRmMjAxMzRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK
KzIwMTEtMDktMTYgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAg
ICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdoZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50
IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBv
cnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0
bWw6IEFkZGVkLgorCiAyMDExLTA5LTE2ICBKYW1lcyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9t
aXVtLm9yZz4KIAogICAgICAgICBGaXggSFRNTDUgcGFyc2VyJ3MgYWRvcHRpb24gYWdlbmN5IGFs
Z29yaXRobSB0byByZXBhcmVudCBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlv
bnMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv
dGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy1leHBlY3RlZC50eHQKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uZGFiNzkwY2VmMzM1MGI3MTgyNjk5MmEwNDIyMmRkZWU5ZmYxNWZjZAotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9s
ZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorQUxF
UlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFZhbHVlQ2hhbmdlZC4KK0FMRVJUOiBTdWNjZXNz
ZnVsbHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5IHJlY2Vp
dmVkIEFYVmFsdWVDaGFuZ2VkLgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZhbHVlQ2hhbmdlZCBu
b3RpZmljYXRpb24gaXMgY29ycmVjdGx5IHJlcG9ydGVkIGZvciBub24tbmF0aXZlIHRleHQgYm94
ZXMgd2hlbiBjb250ZW50IGlzIGNoYW5nZWQuCitjaGFuZ2VkIGlubmVyVGV4dAorCmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUt
cmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNj
ZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uMDg5OWQ5YmU2OWQxZDAwOWQwNmJkMWNkNmQ4OGMzYzMxZmY2ZmM1MwotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gt
cm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8IURPQ1RZ
UEUgSFRNTCBQVUJMSUM+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo
cmVmPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0Pgor
dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i
Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor
PGJvZHk+CitUaGlzIHRlc3RzIHRoYXQgdGhlIEFYVmFsdWVDaGFuZ2VkIG5vdGlmaWNhdGlvbiBp
cyBjb3JyZWN0bHkgcmVwb3J0ZWQgZm9yIG5vbi1uYXRpdmUgdGV4dCBib3hlcyB3aGVuIGNvbnRl
bnQgaXMgY2hhbmdlZC48YnI+Cis8ZGl2IHJvbGU9InRleHRib3giIGlkPSJhcmlhVGV4dEJveCIg
YXJpYS1tdWx0aWxpbmU9ImZhbHNlIiB0YWJpbmRleD0iMCI+U29tZSB0ZXh0IGluIGEgdGV4dGJv
eC48L2Rpdj4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBpZiAod2lu
ZG93LmxheW91dFRlc3RDb250cm9sbGVyICYmIHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxl
cikgeworICAgICAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgp
OworCisgICAgICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmxvZ0FjY2Vzc2liaWxpdHlFdmVu
dHMoKTsKKyAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsK
KworICAgICAgICB2YXIgYXJpYVRleHRCb3ggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYXJp
YVRleHRCb3giKTsKKyAgICAgICAgYXJpYVRleHRCb3guZm9jdXMoKTsKKyAgICAgICAgdmFyIHRl
eHRib3hBeEVsZW1lbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsK
KyAgICAgICAgdGV4dGJveEF4RWxlbWVudC5hZGROb3RpZmljYXRpb25MaXN0ZW5lcihsb2dOb3Rp
ZmljYXRpb24pOworICAgICAgICBwZW5kaW5nTm90aWZpY2F0aW9ucyA9IDM7CisgICAgICAgIGFy
aWFUZXh0Qm94LmZpcnN0Q2hpbGQuZGVsZXRlRGF0YSgwLCA1KTsKKyAgICAgICAgYXJpYVRleHRC
b3gudGV4dENvbnRlbnQgPSAiY2hhbmdlZCB0ZXh0Q29udGVudCI7CisgICAgICAgIGFyaWFUZXh0
Qm94LmlubmVyVGV4dCA9ICJjaGFuZ2VkIGlubmVyVGV4dCI7CisgICAgfQorCisgICAgZnVuY3Rp
b24gbG9nTm90aWZpY2F0aW9uKG5vdGlmaWNhdGlvbikgeworICAgICAgICBpZiAobm90aWZpY2F0
aW9uID09ICJBWFZhbHVlQ2hhbmdlZCIpIHsKKyAgICAgICAgICAgIGFsZXJ0KCJTdWNjZXNzZnVs
bHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuIik7CisgICAgICAgICAgICBwZW5kaW5nTm90aWZp
Y2F0aW9ucy0tOworICAgICAgICAgICAgaWYgKHBlbmRpbmdOb3RpZmljYXRpb25zID09IDApIHsK
KyAgICAgICAgICAgICAgICB0ZXh0Ym94QXhFbGVtZW50LnJlbW92ZU5vdGlmaWNhdGlvbkxpc3Rl
bmVyKCk7CisgICAgICAgICAgICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLm5vdGlm
eURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHN1Y2Nlc3Nm
dWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMv
cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu
Z2VMb2cKaW5kZXggYWVjZDMzMjlhMDZkYjI3ZGM1MTAyNGY3ODAzNTkxMzlkNmFhNTE2Zi4uYmQ0
YmRiN2EwNTE0ODBkMzg1ODNjN2YyYTYwOWI0NmRiNDE1MTdjZCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDE5IEBACisyMDExLTA5LTE2ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0u
b3JnPgorCisgICAgICAgIFJlcG9ydCBBWFZhbHVlQ2hhbmdlZCB3aGVuIHZhbHVlIGNoYW5nZXMg
aW4gZWxlbWVudCB3aXRoIHJvbGU9dGV4dGJveC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTY4MjAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4
dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sCisKKyAgICAgICAgKiBhY2Nlc3Np
YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz
aWJpbGl0eU9iamVjdDo6aXNBUklBVGV4dENvbnRyb2wpOgorICAgICAgICAqIGFjY2Vzc2liaWxp
dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5
UmVuZGVyT2JqZWN0Ojpjb250ZW50Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np
YmlsaXR5UmVuZGVyT2JqZWN0OjpjaGlsZHJlbkNoYW5nZWQpOgorCiAyMDExLTA5LTE2ICBGaWxp
cCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgREZHIEpJVCBzaG91bGQgaW5s
aW5lIE1hdGguYWJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj
Y2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl
c3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCAyNjVkZjJjOGYwMTNmMzk2ZGE5NTAxYjAyMmMxNzE5
N2U5M2VmZDgzLi45MGYzYmUyZTA2NmEwMGIyMDgwNDc3NTM4YmEzZWIyOWM5M2M0ZWE5IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj
dC5jcHAKQEAgLTI0NSw2ICsyNDUsMTIgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0Ojppc0Js
b2NrcXVvdGUoKSBjb25zdAogICAgIHJldHVybiBub2RlKCkgJiYgbm9kZSgpLT5oYXNUYWdOYW1l
KGJsb2NrcXVvdGVUYWcpOwogfQogCisKK2Jvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6aXNBUklB
VGV4dENvbnRyb2woKSBjb25zdAoreworICAgIHJldHVybiBhcmlhUm9sZUF0dHJpYnV0ZSgpID09
IFRleHRBcmVhUm9sZSB8fCBhcmlhUm9sZUF0dHJpYnV0ZSgpID09IFRleHRGaWVsZFJvbGU7Cit9
CisKIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6aXNMYW5kbWFyaygpIGNvbnN0CiB7CiAgICAg
QWNjZXNzaWJpbGl0eVJvbGUgcm9sZSA9IHJvbGVWYWx1ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCBkMTE0ZmU5ZTgy
OTYzNTQyZGYwZWI1ZjAwMjExZGVkNjBlNDc0OTVmLi5lMTdlMDg4ZTlhMDVkNGQxMzk0YmQ4ZDll
NzNiYzM3NTA0YWQzZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5
L0FjY2Vzc2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5
L0FjY2Vzc2liaWxpdHlPYmplY3QuaApAQCAtMzY0LDYgKzM2NCw3IEBAIHB1YmxpYzoKICAgICB2
aXJ0dWFsIGJvb2wgaXNNZW51TGlzdFBvcHVwKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAg
ICB2aXJ0dWFsIGJvb2wgaXNNZW51TGlzdE9wdGlvbigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9
CiAgICAgYm9vbCBpc1RleHRDb250cm9sKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0g
VGV4dEFyZWFSb2xlIHx8IHJvbGVWYWx1ZSgpID09IFRleHRGaWVsZFJvbGU7IH0KKyAgICBib29s
IGlzQVJJQVRleHRDb250cm9sKCkgY29uc3Q7CiAgICAgYm9vbCBpc1RhYkxpc3QoKSBjb25zdCB7
IHJldHVybiByb2xlVmFsdWUoKSA9PSBUYWJMaXN0Um9sZTsgfQogICAgIGJvb2wgaXNUYWJJdGVt
KCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gVGFiUm9sZTsgfQogICAgIGJvb2wgaXNS
YWRpb0dyb3VwKCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gUmFkaW9Hcm91cFJvbGU7
IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3QuY3BwCmluZGV4IDgzODk5YTI1NzM2Mzk0MGUwNTdhNmFhNzg2NWM0
NjVkZjU1YzA0OWEuLjA5MzA1YTkzY2UxNjI4MzcwZTI2ZThmOWRlNmQ1NmYyZTdmODViMTYgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls
aXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtNzY3LDcgKzc2Nyw3IEBAIGJvb2wgQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdDo6aXNHcm91cCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHJvbGVWYWx1ZSgp
ID09IEdyb3VwUm9sZTsKIH0KLSAgICAKKwogQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJp
bGl0eVJlbmRlck9iamVjdDo6c2VsZWN0ZWRSYWRpb0J1dHRvbigpCiB7CiAgICAgaWYgKCFpc1Jh
ZGlvR3JvdXAoKSkKQEAgLTMzNjYsNiArMzM2Niw4IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdDo6Y29udGVudENoYW5nZWQoKQogICAgICAgICBpZiAocGFyZW50LT5zdXBwb3J0c0FS
SUFMaXZlUmVnaW9uKCkpIHsKICAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlm
aWNhdGlvbihyZW5kZXJQYXJlbnQsIEFYT2JqZWN0Q2FjaGU6OkFYTGl2ZVJlZ2lvbkNoYW5nZWQs
IHRydWUpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0gZWxzZSBpZiAocGFyZW50LT5p
c0FSSUFUZXh0Q29udHJvbCgpKSB7CisgICAgICAgICAgICBheE9iamVjdENhY2hlKCktPnBvc3RO
b3RpZmljYXRpb24ocmVuZGVyUGFyZW50LCBBWE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwg
dHJ1ZSk7CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0zNDAzLDYgKzM0MDUsOCBAQCB2b2lkIEFj
Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNoaWxkcmVuQ2hhbmdlZCgpCiAgICAgICAgICAgICAv
LyBJZiB0aGlzIGVsZW1lbnQgc3VwcG9ydHMgQVJJQSBsaXZlIHJlZ2lvbnMsIHRoZW4gbm90aWZ5
IHRoZSBBVCBvZiBjaGFuZ2VzLgogICAgICAgICAgICAgaWYgKGF4UGFyZW50LT5zdXBwb3J0c0FS
SUFMaXZlUmVnaW9uKCkpCiAgICAgICAgICAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90
aWZpY2F0aW9uKGF4UGFyZW50LT5yZW5kZXJlcigpLCBBWE9iamVjdENhY2hlOjpBWExpdmVSZWdp
b25DaGFuZ2VkLCB0cnVlKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGF4UGFyZW50LT5pc0FSSUFU
ZXh0Q29udHJvbCgpKQorICAgICAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlm
aWNhdGlvbihheFBhcmVudC0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5n
ZWQsIHRydWUpOwogICAgICAgICB9CiAgICAgfQogfQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>107968</attachid>
            <date>2011-09-19 23:26:27 -0700</date>
            <delta_ts>2011-09-20 18:00:07 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110920162624.patch</filename>
            <type>text/plain</type>
            <size>11082</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA2M2RmOTlmOWNkNzlmNjY0YTFjYjcwMWUwYWJiZWRiZDQ5YzY3YjgwLi4zOWJlMzg0
Y2YzZDI2MzI0YWNiMzcyOWU3ZDYzYjVjZjdkNmNlOTIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK
KzIwMTEtMDktMTkgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAg
ICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdoZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50
IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdGlvbi12YWx1ZS1j
aGFuZ2VzLWZvci1hcmlhLXRleHRib3gtZXhwZWN0ZWQudHh0OiBSZWJhc2VsaW5lZC4KKyAgICAg
ICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3Rpb24tdmFsdWUtY2hhbmdlcy1m
b3ItYXJpYS10ZXh0Ym94Lmh0bWw6CisgICAgICAgIE5lZWRlZCB0byBiZSB0d2Vha2VkIGFzIG5v
dyB0d28gQVhWYWx1ZUNoYW5nZWQgbm90aWZpY2F0aW9ucyBhcmUgc2VudCBmb3IgdGhlIGNvbnRl
bnRlZGl0YWJsZSBkaXYuCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4
dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg
ICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5v
dGlmaWNhdGlvbnMuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMTkgIFNoZXJpZmYgQm90ICA8d2Vi
a2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcg
b3V0IHI5NTQ4Mi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np
YmlsaXR5L3NlbGVjdGlvbi12YWx1ZS1jaGFuZ2VzLWZvci1hcmlhLXRleHRib3gtZXhwZWN0ZWQu
dHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0aW9uLXZh
bHVlLWNoYW5nZXMtZm9yLWFyaWEtdGV4dGJveC1leHBlY3RlZC50eHQKaW5kZXggZTNjNTM4NmUz
MTc2ZGU2NmU5NmIwMmQ0MzhmZWI2NDk2YmUwMmFmZC4uYjE1OWZlYmM3MTMzMTNkYTI3MDBlOGVm
NjQ0MWIzNjRkNzFjZmVmOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj
Y2Vzc2liaWxpdHkvc2VsZWN0aW9uLXZhbHVlLWNoYW5nZXMtZm9yLWFyaWEtdGV4dGJveC1leHBl
Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2Vs
ZWN0aW9uLXZhbHVlLWNoYW5nZXMtZm9yLWFyaWEtdGV4dGJveC1leHBlY3RlZC50eHQKQEAgLTIs
NiArMiw3IEBAIEFMRVJUOiBTdWNjZXNzZnVsbHkgcmVjZWl2ZWQgQVhTZWxlY3RlZFRleHRDaGFu
Z2VkCiBBTEVSVDogU3VjY2Vzc2Z1bGx5IHJlY2VpdmVkIEFYU2VsZWN0ZWRUZXh0Q2hhbmdlZAog
QUxFUlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFNlbGVjdGVkVGV4dENoYW5nZWQKIEFMRVJU
OiBTdWNjZXNzZnVsbHkgcmVjZWl2ZWQgQVhTZWxlY3RlZFRleHRDaGFuZ2VkCitBTEVSVDogU3Vj
Y2Vzc2Z1bGx5IHJlY2VpdmVkIEFYVmFsdWVDaGFuZ2VkCiBBTEVSVDogU3VjY2Vzc2Z1bGx5IHJl
Y2VpdmVkIEFYU2VsZWN0ZWRUZXh0Q2hhbmdlZAogQUxFUlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZl
ZCBBWFZhbHVlQ2hhbmdlZAogY29uaGVsbG8gdGVudCBpbnNpZGUKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdGlvbi12YWx1ZS1jaGFuZ2Vz
LWZvci1hcmlhLXRleHRib3guaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np
YmlsaXR5L3NlbGVjdGlvbi12YWx1ZS1jaGFuZ2VzLWZvci1hcmlhLXRleHRib3guaHRtbAppbmRl
eCBiMTdjZmQwMWExOTI2ZDZiMjZlNDE5Y2FmODdmZGFhYjk0ODFlZDk2Li5kMjYyZDU2NGNhY2Rk
NDNkYzAyNTJmYjcyMjg2ZDRlZDA2MmQ5ZTFkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0
Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3Rpb24tdmFsdWUtY2hhbmdlcy1mb3ItYXJpYS10
ZXh0Ym94Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv
c2VsZWN0aW9uLXZhbHVlLWNoYW5nZXMtZm9yLWFyaWEtdGV4dGJveC5odG1sCkBAIC0yMSwxMSAr
MjEsMTYgQEAgY29udGVudCBpbnNpZGUKICAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0
IEFSSUEgcmVtb3ZpbmcgYW4gZWxlbWVudCBmcm9tIGEgbGl2ZSByZWdpb24gc2VuZHMgdGhlIGNv
cnJlY3Qgbm90aWZpY2F0aW9uLiIpOwogCiAgICAgdmFyIGF4VGV4dGJveCA9IDA7CisgICAgdmFy
IHZhbHVlQ2hhbmdlZE5vdGlmaWNhdGlvbnMgPSAwOwogICAgIGZ1bmN0aW9uIG5vdGlmaWNhdGlv
bkNhbGxiYWNrKG5vdGlmaWNhdGlvbikgewogICAgICAgICBpZiAobm90aWZpY2F0aW9uID09ICJB
WFZhbHVlQ2hhbmdlZCIpIHsKICAgICAgICAgICAgYWxlcnQoIlN1Y2Nlc3NmdWxseSByZWNlaXZl
ZCAiICsgbm90aWZpY2F0aW9uKTsKLSAgICAgICAgICAgYXhUZXh0Ym94LnJlbW92ZU5vdGlmaWNh
dGlvbkxpc3RlbmVyKCk7Ci0gICAgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5u
b3RpZnlEb25lKCk7CisgICAgICAgICAgIHZhbHVlQ2hhbmdlZE5vdGlmaWNhdGlvbnMrKzsKKyAg
ICAgICAgICAgaWYgKHZhbHVlQ2hhbmdlZE5vdGlmaWNhdGlvbnMgPT0gMikgeworICAgICAgICAg
ICAgIC8vIFRoZXJlIHdpbGwgYmUgdHdvIEFYVmFsdWVDaGFuZ2VkIG5vdGlmaWNhdGlvbnMsIGFz
IHRleHRib3ggaXMgYm90aCBjb250ZW50ZWRpdGFibGUgYW5kIHJvbGU9dGV4dGJveC4KKyAgICAg
ICAgICAgICBheFRleHRib3gucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKKyAgICAgICAg
ICAgICB3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICAg
ICB9CiAgICAgICAgIH0KICAgICAgICAgZWxzZSBpZiAobm90aWZpY2F0aW9uID09ICJBWFNlbGVj
dGVkVGV4dENoYW5nZWQiKSB7CiAgICAgICAgICAgIGFsZXJ0KCJTdWNjZXNzZnVsbHkgcmVjZWl2
ZWQgIiArIG5vdGlmaWNhdGlvbik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLWV4cGVj
dGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gt
cm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw
NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRhYjc5
MGNlZjMzNTBiNzE4MjY5OTJhMDQyMjJkZGVlOWZmMTVmY2QKLS0tIC9kZXYvbnVsbAorKysgYi9M
YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0
cy1ub3RpZmljYXRpb25zLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDYgQEAKK0FMRVJUOiBTdWNj
ZXNzZnVsbHkgcmVjZWl2ZWQgQVhWYWx1ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5IHJl
Y2VpdmVkIEFYVmFsdWVDaGFuZ2VkLgorQUxFUlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFZh
bHVlQ2hhbmdlZC4KK1RoaXMgdGVzdHMgdGhhdCB0aGUgQVhWYWx1ZUNoYW5nZWQgbm90aWZpY2F0
aW9uIGlzIGNvcnJlY3RseSByZXBvcnRlZCBmb3Igbm9uLW5hdGl2ZSB0ZXh0IGJveGVzIHdoZW4g
Y29udGVudCBpcyBjaGFuZ2VkLgorY2hhbmdlZCBpbm5lclRleHQKKwpkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4dGJveC1yb2xlLXJlcG9ydHMt
bm90aWZpY2F0aW9ucy5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxp
dHkvdGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sCm5ldyBmaWxlIG1vZGUg
MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA4
OTlkOWJlNjlkMWQwMDlkMDZiZDFjZDZkODhjM2MzMWZmNmZjNTMKLS0tIC9kZXYvbnVsbAorKysg
Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVw
b3J0cy1ub3RpZmljYXRpb25zLmh0bWwKQEAgLTAsMCArMSw0NyBAQAorPCFET0NUWVBFIEhUTUwg
UFVCTElDPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4v
ZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNj
ZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3Qv
anMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5Pgor
VGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZhbHVlQ2hhbmdlZCBub3RpZmljYXRpb24gaXMgY29ycmVj
dGx5IHJlcG9ydGVkIGZvciBub24tbmF0aXZlIHRleHQgYm94ZXMgd2hlbiBjb250ZW50IGlzIGNo
YW5nZWQuPGJyPgorPGRpdiByb2xlPSJ0ZXh0Ym94IiBpZD0iYXJpYVRleHRCb3giIGFyaWEtbXVs
dGlsaW5lPSJmYWxzZSIgdGFiaW5kZXg9IjAiPlNvbWUgdGV4dCBpbiBhIHRleHRib3guPC9kaXY+
Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlv
dXRUZXN0Q29udHJvbGxlciAmJiB3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAg
ICAgICAgd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKworICAg
ICAgICBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5sb2dBY2Nlc3NpYmlsaXR5RXZlbnRzKCk7Cisg
ICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICAg
ICAgdmFyIGFyaWFUZXh0Qm94ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFyaWFUZXh0Qm94
Iik7CisgICAgICAgIGFyaWFUZXh0Qm94LmZvY3VzKCk7CisgICAgICAgIHZhciB0ZXh0Ym94QXhF
bGVtZW50ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CisgICAgICAg
IHRleHRib3hBeEVsZW1lbnQuYWRkTm90aWZpY2F0aW9uTGlzdGVuZXIobG9nTm90aWZpY2F0aW9u
KTsKKyAgICAgICAgcGVuZGluZ05vdGlmaWNhdGlvbnMgPSAzOworICAgICAgICBhcmlhVGV4dEJv
eC5maXJzdENoaWxkLmRlbGV0ZURhdGEoMCwgNSk7CisgICAgICAgIGFyaWFUZXh0Qm94LnRleHRD
b250ZW50ID0gImNoYW5nZWQgdGV4dENvbnRlbnQiOworICAgICAgICBhcmlhVGV4dEJveC5pbm5l
clRleHQgPSAiY2hhbmdlZCBpbm5lclRleHQiOworICAgIH0KKworICAgIGZ1bmN0aW9uIGxvZ05v
dGlmaWNhdGlvbihub3RpZmljYXRpb24pIHsKKyAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSAi
QVhWYWx1ZUNoYW5nZWQiKSB7CisgICAgICAgICAgICBhbGVydCgiU3VjY2Vzc2Z1bGx5IHJlY2Vp
dmVkIEFYVmFsdWVDaGFuZ2VkLiIpOworICAgICAgICAgICAgcGVuZGluZ05vdGlmaWNhdGlvbnMt
LTsKKyAgICAgICAgICAgIGlmIChwZW5kaW5nTm90aWZpY2F0aW9ucyA9PSAwKSB7CisgICAgICAg
ICAgICAgICAgdGV4dGJveEF4RWxlbWVudC5yZW1vdmVOb3RpZmljYXRpb25MaXN0ZW5lcigpOwor
ICAgICAgICAgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7
CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQYXJz
ZWQgPSB0cnVlOworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNl
cy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu
ZGV4IDJmODNiODk4Y2I4ODA0MGZjOTdjYzRiY2VlNDU3Mzg3MjRmMjg4ODYuLmE2Yjg4YmNkZTQw
YjljNjM5ODU3MmVhYzgyZjIyMTdiNTg0ZjcxNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBA
QAorMjAxMS0wOS0xOSAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4KKwor
ICAgICAgICBSZXBvcnQgQVhWYWx1ZUNoYW5nZWQgd2hlbiB2YWx1ZSBjaGFuZ2VzIGluIGVsZW1l
bnQgd2l0aCByb2xlPXRleHRib3guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD02ODIwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9s
ZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9B
Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlP
YmplY3Q6OmlzQVJJQVRleHRDb250cm9sKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vz
c2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS
ZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9i
amVjdDo6Y29udGVudENoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl
bmRlck9iamVjdDo6Y2hpbGRyZW5DaGFuZ2VkKToKKwogMjAxMS0wOS0xOSAgSmVyZW15IEFwdGhv
cnAgIDxqZXJlbXlhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBGaXggYSB1c2UtYWZ0ZXItZnJl
ZTogY2xlYXIgdGhlIGZ1bGxzY3JlZW4gY2hhbmdlIGV2ZW50IHRhcmdldCBxdWV1ZSBhdApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5j
cHAKaW5kZXggMjY1ZGYyYzhmMDEzZjM5NmRhOTUwMWIwMjJjMTcxOTdlOTNlZmQ4My4uOTBmM2Jl
MmUwNjZhMDBiMjA4MDQ3NzUzOGJhM2ViMjljOTNjNGVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0yNDUsNiAr
MjQ1LDEyIEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6aXNCbG9ja3F1b3RlKCkgY29uc3QK
ICAgICByZXR1cm4gbm9kZSgpICYmIG5vZGUoKS0+aGFzVGFnTmFtZShibG9ja3F1b3RlVGFnKTsK
IH0KIAorCitib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzQVJJQVRleHRDb250cm9sKCkgY29u
c3QKK3sKKyAgICByZXR1cm4gYXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBUZXh0QXJlYVJvbGUgfHwg
YXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBUZXh0RmllbGRSb2xlOworfQorCiBib29sIEFjY2Vzc2li
aWxpdHlPYmplY3Q6OmlzTGFuZG1hcmsoKSBjb25zdAogewogICAgIEFjY2Vzc2liaWxpdHlSb2xl
IHJvbGUgPSByb2xlVmFsdWUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li
aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0
eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggM2JjMDRkZjVhY2U1MmU5ZGU5ZDQ0OTE0NDU3
YjYyMjgyOWJkMmI2NC4uYWIxMzE2N2IwZTZkN2Y0ZGE4M2YzY2YxMjYzNWNiMmFhYzFhNjM3ZiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq
ZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2Jq
ZWN0LmgKQEAgLTM3MCw2ICszNzAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzTWVu
dUxpc3RQb3B1cCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlz
TWVudUxpc3RPcHRpb24oKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIGJvb2wgaXNUZXh0
Q29udHJvbCgpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFRleHRBcmVhUm9sZSB8fCBy
b2xlVmFsdWUoKSA9PSBUZXh0RmllbGRSb2xlOyB9CisgICAgYm9vbCBpc0FSSUFUZXh0Q29udHJv
bCgpIGNvbnN0OwogICAgIGJvb2wgaXNUYWJMaXN0KCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVl
KCkgPT0gVGFiTGlzdFJvbGU7IH0KICAgICBib29sIGlzVGFiSXRlbSgpIGNvbnN0IHsgcmV0dXJu
IHJvbGVWYWx1ZSgpID09IFRhYlJvbGU7IH0KICAgICBib29sIGlzUmFkaW9Hcm91cCgpIGNvbnN0
IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFJhZGlvR3JvdXBSb2xlOyB9CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw
IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0
LmNwcAppbmRleCA4Mzg5OWEyNTczNjM5NDBlMDU3YTZhYTc4NjVjNDY1ZGY1NWMwNDlhLi5iY2Jh
MTBlNjZjY2Y4YTkzZGZjN2JiY2VhN2YyYTBjMTNlODFiZTJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBi
L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5j
cHAKQEAgLTc2Nyw3ICs3NjcsNyBAQCBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omlz
R3JvdXAoKSBjb25zdAogewogICAgIHJldHVybiByb2xlVmFsdWUoKSA9PSBHcm91cFJvbGU7CiB9
Ci0gICAgCisKIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6
OnNlbGVjdGVkUmFkaW9CdXR0b24oKQogewogICAgIGlmICghaXNSYWRpb0dyb3VwKCkpCkBAIC0z
MzU0LDE5ICszMzU0LDE5IEBAIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2FuU2V0
VGV4dFJhbmdlQXR0cmlidXRlcygpIGNvbnN0CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9i
amVjdDo6Y29udGVudENoYW5nZWQoKQogewotICAgIC8vIElmIHRoaXMgZWxlbWVudCBzdXBwb3J0
cyBBUklBIGxpdmUgcmVnaW9ucywgdGhlbiBub3RpZnkgdGhlIEFUIG9mIGNoYW5nZXMuCisgICAg
Ly8gSWYgdGhpcyBlbGVtZW50IHN1cHBvcnRzIEFSSUEgbGl2ZSByZWdpb25zLCBvciBpcyBwYXJ0
IG9mIGEgcmVnaW9uIHdpdGggYW4gQVJJQSBlZGl0YWJsZSByb2xlLAorICAgIC8vIHRoZW4gbm90
aWZ5IHRoZSBBVCBvZiBjaGFuZ2VzLgogICAgIEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmpl
Y3RDYWNoZSgpOwogICAgIGZvciAoUmVuZGVyT2JqZWN0KiByZW5kZXJQYXJlbnQgPSBtX3JlbmRl
cmVyOyByZW5kZXJQYXJlbnQ7IHJlbmRlclBhcmVudCA9IHJlbmRlclBhcmVudC0+cGFyZW50KCkp
IHsKICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogcGFyZW50ID0gY2FjaGUtPmdldChyZW5k
ZXJQYXJlbnQpOwogICAgICAgICBpZiAoIXBhcmVudCkKICAgICAgICAgICAgIGNvbnRpbnVlOwog
ICAgICAgICAKLSAgICAgICAgLy8gSWYgd2UgZmluZCBhIHBhcmVudCB0aGF0IGhhcyBBUklBIGxp
dmUgcmVnaW9uIG9uLCBzZW5kIHRoZSBub3RpZmljYXRpb24gYW5kIHN0b3AgcHJvY2Vzc2luZy4K
LSAgICAgICAgLy8gVGhlIHNwZWMgZG9lcyBub3QgdGFsayBhYm91dCBuZXN0ZWQgbGl2ZSByZWdp
b25zLgotICAgICAgICBpZiAocGFyZW50LT5zdXBwb3J0c0FSSUFMaXZlUmVnaW9uKCkpIHsKKyAg
ICAgICAgaWYgKHBhcmVudC0+c3VwcG9ydHNBUklBTGl2ZVJlZ2lvbigpKQogICAgICAgICAgICAg
YXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJlbmRlclBhcmVudCwgQVhPYmplY3RD
YWNoZTo6QVhMaXZlUmVnaW9uQ2hhbmdlZCwgdHJ1ZSk7Ci0gICAgICAgICAgICBicmVhazsKLSAg
ICAgICAgfQorCisgICAgICAgIGlmIChwYXJlbnQtPmlzQVJJQVRleHRDb250cm9sKCkpCisgICAg
ICAgICAgICBheE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24ocmVuZGVyUGFyZW50LCBB
WE9iamVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwgdHJ1ZSk7CiAgICAgfQogfQogICAgIApAQCAt
MzQwMyw2ICszNDAzLDEwIEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2hpbGRy
ZW5DaGFuZ2VkKCkKICAgICAgICAgICAgIC8vIElmIHRoaXMgZWxlbWVudCBzdXBwb3J0cyBBUklB
IGxpdmUgcmVnaW9ucywgdGhlbiBub3RpZnkgdGhlIEFUIG9mIGNoYW5nZXMuCiAgICAgICAgICAg
ICBpZiAoYXhQYXJlbnQtPnN1cHBvcnRzQVJJQUxpdmVSZWdpb24oKSkKICAgICAgICAgICAgICAg
ICBheE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24oYXhQYXJlbnQtPnJlbmRlcmVyKCks
IEFYT2JqZWN0Q2FjaGU6OkFYTGl2ZVJlZ2lvbkNoYW5nZWQsIHRydWUpOworCisgICAgICAgICAg
ICAvLyBJZiB0aGlzIGVsZW1lbnQgaXMgYW4gQVJJQSB0ZXh0IGNvbnRyb2wsIG5vdGlmeSB0aGUg
QVQgb2YgY2hhbmdlcy4KKyAgICAgICAgICAgIGlmIChheFBhcmVudC0+aXNBUklBVGV4dENvbnRy
b2woKSkKKyAgICAgICAgICAgICAgICBheE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24o
YXhQYXJlbnQtPnJlbmRlcmVyKCksIEFYT2JqZWN0Q2FjaGU6OkFYVmFsdWVDaGFuZ2VkLCB0cnVl
KTsKICAgICAgICAgfQogICAgIH0KIH0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>108091</attachid>
            <date>2011-09-20 17:53:02 -0700</date>
            <delta_ts>2011-09-21 09:44:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-68201-20110921105258.patch</filename>
            <type>text/plain</type>
            <size>9092</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv
ZwppbmRleCA2M2RmOTlmOWNkNzlmNjY0YTFjYjcwMWUwYWJiZWRiZDQ5YzY3YjgwLi43ZTdkMjIx
MjZlYWZmNjg0ZDYzYzgzNjIzNjBmMDdiZDI3OGRkNzBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0
cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK
KzIwMTEtMDktMTkgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAg
ICAgICAgUmVwb3J0IEFYVmFsdWVDaGFuZ2VkIHdoZW4gdmFsdWUgY2hhbmdlcyBpbiBlbGVtZW50
IHdpdGggcm9sZT10ZXh0Ym94LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NjgyMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBv
cnRzLW5vdGlmaWNhdGlvbnMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0
bWw6IEFkZGVkLgorCiAyMDExLTA5LTE5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90
QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTU0ODIuCmRp
ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94
LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3Bs
YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlv
bnMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRhYjc5MGNlZjMzNTBiNzE4MjY5OTJhMDQyMjJk
ZGVlOWZmMTVmY2QKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv
YWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLWV4cGVjdGVk
LnR4dApAQCAtMCwwICsxLDYgQEAKK0FMRVJUOiBTdWNjZXNzZnVsbHkgcmVjZWl2ZWQgQVhWYWx1
ZUNoYW5nZWQuCitBTEVSVDogU3VjY2Vzc2Z1bGx5IHJlY2VpdmVkIEFYVmFsdWVDaGFuZ2VkLgor
QUxFUlQ6IFN1Y2Nlc3NmdWxseSByZWNlaXZlZCBBWFZhbHVlQ2hhbmdlZC4KK1RoaXMgdGVzdHMg
dGhhdCB0aGUgQVhWYWx1ZUNoYW5nZWQgbm90aWZpY2F0aW9uIGlzIGNvcnJlY3RseSByZXBvcnRl
ZCBmb3Igbm9uLW5hdGl2ZSB0ZXh0IGJveGVzIHdoZW4gY29udGVudCBpcyBjaGFuZ2VkLgorY2hh
bmdlZCBpbm5lclRleHQKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj
Y2Vzc2liaWxpdHkvdGV4dGJveC1yb2xlLXJlcG9ydHMtbm90aWZpY2F0aW9ucy5odG1sIGIvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGV4dGJveC1yb2xlLXJlcG9ydHMt
bm90aWZpY2F0aW9ucy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA4OTlkOWJlNjlkMWQwMDlkMDZiZDFjZDZk
ODhjM2MzMWZmNmZjNTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMvYWNjZXNzaWJpbGl0eS90ZXh0Ym94LXJvbGUtcmVwb3J0cy1ub3RpZmljYXRpb25zLmh0bWwK
QEAgLTAsMCArMSw0NyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDPgorPGh0bWw+Cis8aGVhZD4K
KzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVz
dC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsK
Kzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJl
LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorVGhpcyB0ZXN0cyB0aGF0IHRoZSBBWFZh
bHVlQ2hhbmdlZCBub3RpZmljYXRpb24gaXMgY29ycmVjdGx5IHJlcG9ydGVkIGZvciBub24tbmF0
aXZlIHRleHQgYm94ZXMgd2hlbiBjb250ZW50IGlzIGNoYW5nZWQuPGJyPgorPGRpdiByb2xlPSJ0
ZXh0Ym94IiBpZD0iYXJpYVRleHRCb3giIGFyaWEtbXVsdGlsaW5lPSJmYWxzZSIgdGFiaW5kZXg9
IjAiPlNvbWUgdGV4dCBpbiBhIHRleHRib3guPC9kaXY+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rp
dj4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlciAmJiB3aW5k
b3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgd2luZG93LmxheW91dFRlc3RD
b250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKworICAgICAgICBhY2Nlc3NpYmlsaXR5Q29udHJv
bGxlci5sb2dBY2Nlc3NpYmlsaXR5RXZlbnRzKCk7CisgICAgICAgIHdpbmRvdy5sYXlvdXRUZXN0
Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICAgICAgdmFyIGFyaWFUZXh0Qm94ID0gZG9j
dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImFyaWFUZXh0Qm94Iik7CisgICAgICAgIGFyaWFUZXh0Qm94
LmZvY3VzKCk7CisgICAgICAgIHZhciB0ZXh0Ym94QXhFbGVtZW50ID0gYWNjZXNzaWJpbGl0eUNv
bnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CisgICAgICAgIHRleHRib3hBeEVsZW1lbnQuYWRkTm90
aWZpY2F0aW9uTGlzdGVuZXIobG9nTm90aWZpY2F0aW9uKTsKKyAgICAgICAgcGVuZGluZ05vdGlm
aWNhdGlvbnMgPSAzOworICAgICAgICBhcmlhVGV4dEJveC5maXJzdENoaWxkLmRlbGV0ZURhdGEo
MCwgNSk7CisgICAgICAgIGFyaWFUZXh0Qm94LnRleHRDb250ZW50ID0gImNoYW5nZWQgdGV4dENv
bnRlbnQiOworICAgICAgICBhcmlhVGV4dEJveC5pbm5lclRleHQgPSAiY2hhbmdlZCBpbm5lclRl
eHQiOworICAgIH0KKworICAgIGZ1bmN0aW9uIGxvZ05vdGlmaWNhdGlvbihub3RpZmljYXRpb24p
IHsKKyAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSAiQVhWYWx1ZUNoYW5nZWQiKSB7CisgICAg
ICAgICAgICBhbGVydCgiU3VjY2Vzc2Z1bGx5IHJlY2VpdmVkIEFYVmFsdWVDaGFuZ2VkLiIpOwor
ICAgICAgICAgICAgcGVuZGluZ05vdGlmaWNhdGlvbnMtLTsKKyAgICAgICAgICAgIGlmIChwZW5k
aW5nTm90aWZpY2F0aW9ucyA9PSAwKSB7CisgICAgICAgICAgICAgICAgdGV4dGJveEF4RWxlbWVu
dC5yZW1vdmVOb3RpZmljYXRpb25MaXN0ZW5lcigpOworICAgICAgICAgICAgICAgIHdpbmRvdy5s
YXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICB9CisgICAgICAg
IH0KKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+CisK
KzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2Ny
aXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDJmODNiODk4Y2I4ODA0MGZjOTdj
YzRiY2VlNDU3Mzg3MjRmMjg4ODYuLmE2Yjg4YmNkZTQwYjljNjM5ODU3MmVhYzgyZjIyMTdiNTg0
ZjcxNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wOS0xOSAgQWxpY2UgQm94
aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXBvcnQgQVhWYWx1ZUNo
YW5nZWQgd2hlbiB2YWx1ZSBjaGFuZ2VzIGluIGVsZW1lbnQgd2l0aCByb2xlPXRleHRib3guCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODIwMQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IHBsYXRm
b3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RleHRib3gtcm9sZS1yZXBvcnRzLW5vdGlmaWNhdGlvbnMu
aHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoK
KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzQVJJQVRleHRDb250cm9s
KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAg
ICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29udGVudENoYW5nZWQpOgor
ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2hpbGRyZW5DaGFu
Z2VkKToKKwogMjAxMS0wOS0xOSAgSmVyZW15IEFwdGhvcnAgIDxqZXJlbXlhQGNocm9taXVtLm9y
Zz4KIAogICAgICAgICBGaXggYSB1c2UtYWZ0ZXItZnJlZTogY2xlYXIgdGhlIGZ1bGxzY3JlZW4g
Y2hhbmdlIGV2ZW50IHRhcmdldCBxdWV1ZSBhdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj
Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggMjY1ZGYyYzhmMDEzZjM5
NmRhOTUwMWIwMjJjMTcxOTdlOTNlZmQ4My4uOTBmM2JlMmUwNjZhMDBiMjA4MDQ3NzUzOGJhM2Vi
MjljOTNjNGVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl
c3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj
Y2Vzc2liaWxpdHlPYmplY3QuY3BwCkBAIC0yNDUsNiArMjQ1LDEyIEBAIGJvb2wgQWNjZXNzaWJp
bGl0eU9iamVjdDo6aXNCbG9ja3F1b3RlKCkgY29uc3QKICAgICByZXR1cm4gbm9kZSgpICYmIG5v
ZGUoKS0+aGFzVGFnTmFtZShibG9ja3F1b3RlVGFnKTsKIH0KIAorCitib29sIEFjY2Vzc2liaWxp
dHlPYmplY3Q6OmlzQVJJQVRleHRDb250cm9sKCkgY29uc3QKK3sKKyAgICByZXR1cm4gYXJpYVJv
bGVBdHRyaWJ1dGUoKSA9PSBUZXh0QXJlYVJvbGUgfHwgYXJpYVJvbGVBdHRyaWJ1dGUoKSA9PSBU
ZXh0RmllbGRSb2xlOworfQorCiBib29sIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmlzTGFuZG1hcmso
KSBjb25zdAogewogICAgIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGUgPSByb2xlVmFsdWUoKTsKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj
dC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgK
aW5kZXggM2JjMDRkZjVhY2U1MmU5ZGU5ZDQ0OTE0NDU3YjYyMjgyOWJkMmI2NC4uYWIxMzE2N2Iw
ZTZkN2Y0ZGE4M2YzY2YxMjYzNWNiMmFhYzFhNjM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTM3MCw2ICszNzAsNyBA
QCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzTWVudUxpc3RQb3B1cCgpIGNvbnN0IHsgcmV0
dXJuIGZhbHNlOyB9CiAgICAgdmlydHVhbCBib29sIGlzTWVudUxpc3RPcHRpb24oKSBjb25zdCB7
IHJldHVybiBmYWxzZTsgfQogICAgIGJvb2wgaXNUZXh0Q29udHJvbCgpIGNvbnN0IHsgcmV0dXJu
IHJvbGVWYWx1ZSgpID09IFRleHRBcmVhUm9sZSB8fCByb2xlVmFsdWUoKSA9PSBUZXh0RmllbGRS
b2xlOyB9CisgICAgYm9vbCBpc0FSSUFUZXh0Q29udHJvbCgpIGNvbnN0OwogICAgIGJvb2wgaXNU
YWJMaXN0KCkgY29uc3QgeyByZXR1cm4gcm9sZVZhbHVlKCkgPT0gVGFiTGlzdFJvbGU7IH0KICAg
ICBib29sIGlzVGFiSXRlbSgpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09IFRhYlJvbGU7
IH0KICAgICBib29sIGlzUmFkaW9Hcm91cCgpIGNvbnN0IHsgcmV0dXJuIHJvbGVWYWx1ZSgpID09
IFJhZGlvR3JvdXBSb2xlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls
aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz
aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCA4Mzg5OWEyNTczNjM5
NDBlMDU3YTZhYTc4NjVjNDY1ZGY1NWMwNDlhLi45NWMyMzE4MGQyZTE1MDk3ODU4N2RkNjM5YTk4
MmNkOGE4NDhmMDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj
Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li
aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTc2Nyw3ICs3NjcsNyBAQCBi
b29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmlzR3JvdXAoKSBjb25zdAogewogICAgIHJl
dHVybiByb2xlVmFsdWUoKSA9PSBHcm91cFJvbGU7CiB9Ci0gICAgCisKIEFjY2Vzc2liaWxpdHlP
YmplY3QqIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNlbGVjdGVkUmFkaW9CdXR0b24oKQog
ewogICAgIGlmICghaXNSYWRpb0dyb3VwKCkpCkBAIC0zMzU0LDE5ICszMzU0LDE5IEBAIGJvb2wg
QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y2FuU2V0VGV4dFJhbmdlQXR0cmlidXRlcygpIGNv
bnN0CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6Y29udGVudENoYW5nZWQoKQog
ewotICAgIC8vIElmIHRoaXMgZWxlbWVudCBzdXBwb3J0cyBBUklBIGxpdmUgcmVnaW9ucywgdGhl
biBub3RpZnkgdGhlIEFUIG9mIGNoYW5nZXMuCisgICAgLy8gSWYgdGhpcyBlbGVtZW50IHN1cHBv
cnRzIEFSSUEgbGl2ZSByZWdpb25zLCBvciBpcyBwYXJ0IG9mIGEgcmVnaW9uIHdpdGggYW4gQVJJ
QSBlZGl0YWJsZSByb2xlLAorICAgIC8vIHRoZW4gbm90aWZ5IHRoZSBBVCBvZiBjaGFuZ2VzLgog
ICAgIEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpOwogICAgIGZvciAoUmVu
ZGVyT2JqZWN0KiByZW5kZXJQYXJlbnQgPSBtX3JlbmRlcmVyOyByZW5kZXJQYXJlbnQ7IHJlbmRl
clBhcmVudCA9IHJlbmRlclBhcmVudC0+cGFyZW50KCkpIHsKICAgICAgICAgQWNjZXNzaWJpbGl0
eU9iamVjdCogcGFyZW50ID0gY2FjaGUtPmdldChyZW5kZXJQYXJlbnQpOwogICAgICAgICBpZiAo
IXBhcmVudCkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAKLSAgICAgICAgLy8gSWYg
d2UgZmluZCBhIHBhcmVudCB0aGF0IGhhcyBBUklBIGxpdmUgcmVnaW9uIG9uLCBzZW5kIHRoZSBu
b3RpZmljYXRpb24gYW5kIHN0b3AgcHJvY2Vzc2luZy4KLSAgICAgICAgLy8gVGhlIHNwZWMgZG9l
cyBub3QgdGFsayBhYm91dCBuZXN0ZWQgbGl2ZSByZWdpb25zLgotICAgICAgICBpZiAocGFyZW50
LT5zdXBwb3J0c0FSSUFMaXZlUmVnaW9uKCkpIHsKLSAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUo
KS0+cG9zdE5vdGlmaWNhdGlvbihyZW5kZXJQYXJlbnQsIEFYT2JqZWN0Q2FjaGU6OkFYTGl2ZVJl
Z2lvbkNoYW5nZWQsIHRydWUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAg
ICAgaWYgKHBhcmVudC0+c3VwcG9ydHNBUklBTGl2ZVJlZ2lvbigpKQorICAgICAgICAgICAgY2Fj
aGUtPnBvc3ROb3RpZmljYXRpb24ocmVuZGVyUGFyZW50LCBBWE9iamVjdENhY2hlOjpBWExpdmVS
ZWdpb25DaGFuZ2VkLCB0cnVlKTsKKworICAgICAgICBpZiAocGFyZW50LT5pc0FSSUFUZXh0Q29u
dHJvbCgpICYmICFwYXJlbnQtPmlzTmF0aXZlVGV4dENvbnRyb2woKSAmJiAhcGFyZW50LT5ub2Rl
KCktPmlzQ29udGVudEVkaXRhYmxlKCkpCisgICAgICAgICAgICBjYWNoZS0+cG9zdE5vdGlmaWNh
dGlvbihyZW5kZXJQYXJlbnQsIEFYT2JqZWN0Q2FjaGU6OkFYVmFsdWVDaGFuZ2VkLCB0cnVlKTsK
ICAgICB9CiB9CiAgICAgCkBAIC0zMzc1LDcgKzMzNzUsNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlS
ZW5kZXJPYmplY3Q6OmNoaWxkcmVuQ2hhbmdlZCgpCiAgICAgLy8gVGhpcyBtZXRob2QgaXMgbWVh
bnQgYXMgYSBxdWljayB3YXkgb2YgbWFya2luZyBhIHBvcnRpb24gb2YgdGhlIGFjY2Vzc2liaWxp
dHkgdHJlZSBkaXJ0eS4KICAgICBpZiAoIW1fcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKLSAg
ICAKKwogICAgIGJvb2wgc2VudENoaWxkcmVuQ2hhbmdlZCA9IGZhbHNlOwogICAgIAogICAgIC8v
IEdvIHVwIHRoZSBhY2Nlc3NpYmlsaXR5IHBhcmVudCBjaGFpbiwgYnV0IG9ubHkgaWYgdGhlIGVs
ZW1lbnQgYWxyZWFkeSBleGlzdHMuIFRoaXMgbWV0aG9kIGlzCkBAIC0zNDAzLDYgKzM0MDMsMTAg
QEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpjaGlsZHJlbkNoYW5nZWQoKQogICAg
ICAgICAgICAgLy8gSWYgdGhpcyBlbGVtZW50IHN1cHBvcnRzIEFSSUEgbGl2ZSByZWdpb25zLCB0
aGVuIG5vdGlmeSB0aGUgQVQgb2YgY2hhbmdlcy4KICAgICAgICAgICAgIGlmIChheFBhcmVudC0+
c3VwcG9ydHNBUklBTGl2ZVJlZ2lvbigpKQogICAgICAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUo
KS0+cG9zdE5vdGlmaWNhdGlvbihheFBhcmVudC0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6
QVhMaXZlUmVnaW9uQ2hhbmdlZCwgdHJ1ZSk7CisKKyAgICAgICAgICAgIC8vIElmIHRoaXMgZWxl
bWVudCBpcyBhbiBBUklBIHRleHQgY29udHJvbCwgbm90aWZ5IHRoZSBBVCBvZiBjaGFuZ2VzLgor
ICAgICAgICAgICAgaWYgKGF4UGFyZW50LT5pc0FSSUFUZXh0Q29udHJvbCgpICYmICFheFBhcmVu
dC0+aXNOYXRpdmVUZXh0Q29udHJvbCgpICYmICFheFBhcmVudC0+bm9kZSgpLT5pc0NvbnRlbnRF
ZGl0YWJsZSgpKQorICAgICAgICAgICAgICAgIGF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNh
dGlvbihheFBhcmVudC0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5nZWQs
IHRydWUpOwogICAgICAgICB9CiAgICAgfQogfQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>