<?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>62351</bug_id>
          
          <creation_ts>2011-06-08 21:08:12 -0700</creation_ts>
          <short_desc>AX: aria-labelledby should be used in preference to aria-labeledby</short_desc>
          <delta_ts>2013-11-18 22:08:00 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Accessibility</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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>66745</dependson>
          
          <everconfirmed>0</everconfirmed>
          <reporter name="Alice Boxhall">aboxhall</reporter>
          <assigned_to name="Samuel White">samuel_white</assigned_to>
          <cc>apinheiro</cc>
    
    <cc>cfleizach</cc>
    
    <cc>commit-queue</cc>
    
    <cc>dmazzoni</cc>
    
    <cc>jcraig</cc>
    
    <cc>jdiggs</cc>
    
    <cc>mario</cc>
    
    <cc>samuel_white</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>417789</commentid>
    <comment_count>0</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-06-08 21:08:12 -0700</bug_when>
    <thetext>As per http://www.accessibleculture.org/blog/2011/03/its-spelled-aria-labelledby/</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>417795</commentid>
    <comment_count>1</comment_count>
      <attachid>96542</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-06-08 21:21:50 -0700</bug_when>
    <thetext>Created attachment 96542
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>417797</commentid>
    <comment_count>2</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-06-08 21:26:23 -0700</bug_when>
    <thetext>There may be some opposition to the method name change, but I was finding it confusing to type when the standard is aria-labelledby.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>453278</commentid>
    <comment_count>3</comment_count>
      <attachid>96542</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-08-18 12:50:36 -0700</bug_when>
    <thetext>Comment on attachment 96542
Patch

Sorry this took so long to review. r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>454460</commentid>
    <comment_count>4</comment_count>
      <attachid>104644</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-21 23:03:04 -0700</bug_when>
    <thetext>Created attachment 104644
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>454462</commentid>
    <comment_count>5</comment_count>
      <attachid>104644</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-21 23:04:11 -0700</bug_when>
    <thetext>Comment on attachment 104644
Patch

Rebased patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>454466</commentid>
    <comment_count>6</comment_count>
      <attachid>104644</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-08-21 23:17:32 -0700</bug_when>
    <thetext>Comment on attachment 104644
Patch

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

&gt; Source/WebCore/accessibility/AccessibilityRenderObject.cpp:1307
&gt; +

the last patch did not change this logic. this patch looks like it&apos;s now changing what&apos;s returned in title</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>454471</commentid>
    <comment_count>7</comment_count>
      <attachid>104647</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-21 23:31:22 -0700</bug_when>
    <thetext>Created attachment 104647
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>454472</commentid>
    <comment_count>8</comment_count>
      <attachid>104647</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-21 23:37:35 -0700</bug_when>
    <thetext>Comment on attachment 104647
Patch

Thanks for the quick review; not sure how that extra logic got in the last patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>455082</commentid>
    <comment_count>9</comment_count>
      <attachid>104647</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-22 17:24:43 -0700</bug_when>
    <thetext>Comment on attachment 104647
Patch

Clearing flags on attachment: 104647

Committed r93565: &lt;http://trac.webkit.org/changeset/93565&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>455083</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-08-22 17:24:47 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>455201</commentid>
    <comment_count>11</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-22 22:58:47 -0700</bug_when>
    <thetext>Reopening after rollout.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>455221</commentid>
    <comment_count>12</comment_count>
      <attachid>104795</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-23 00:20:30 -0700</bug_when>
    <thetext>Created attachment 104795
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>455222</commentid>
    <comment_count>13</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-08-23 00:22:10 -0700</bug_when>
    <thetext>Fixed the bug that caused a bunch of test breakages, and updated the test to work with the changes in bug 61995.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462283</commentid>
    <comment_count>14</comment_count>
      <attachid>104795</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-05 17:14:43 -0700</bug_when>
    <thetext>Comment on attachment 104795
Patch

Is this ok?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462302</commentid>
    <comment_count>15</comment_count>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-05 18:18:37 -0700</bug_when>
    <thetext>(In reply to comment #14)
&gt; (From update of attachment 104795 [details])
&gt; Is this ok?

is the windows build failure due to something else?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462308</commentid>
    <comment_count>16</comment_count>
      <attachid>106373</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-05 18:29:27 -0700</bug_when>
    <thetext>Created attachment 106373
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462309</commentid>
    <comment_count>17</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-09-05 18:31:03 -0700</bug_when>
    <thetext>(In reply to comment #15)
&gt; (In reply to comment #14)
&gt; &gt; (From update of attachment 104795 [details] [details])
&gt; &gt; Is this ok?
&gt; 
&gt; is the windows build failure due to something else?

Not sure; just uploaded a rebaselined patch; if that fails on Windows I&apos;ll check it out.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>462372</commentid>
    <comment_count>18</comment_count>
      <attachid>106373</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-09-05 23:14:08 -0700</bug_when>
    <thetext>Comment on attachment 106373
Patch

win build failure

5&gt;..\AccessibleImage.cpp(49) : error C2039: &apos;ariaLabeledByAttribute&apos; : is not a member of &apos;WebCore::AccessibilityRenderObject&apos;
5&gt;        C:\cygwin\home\buildbot\WebKitBuild\Debug\Include\WebCore/AccessibilityRenderObject.h(58) : see declaration of &apos;WebCore::AccessibilityRenderObject&apos;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>495180</commentid>
    <comment_count>19</comment_count>
      <attachid>113427</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-11-02 20:50:38 -0700</bug_when>
    <thetext>Created attachment 113427
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>495181</commentid>
    <comment_count>20</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-11-02 20:51:31 -0700</bug_when>
    <thetext>Re-submitting patch as it builds for me on Windows now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>495197</commentid>
    <comment_count>21</comment_count>
      <attachid>113430</attachid>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-11-02 21:54:35 -0700</bug_when>
    <thetext>Created attachment 113430
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>495198</commentid>
    <comment_count>22</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-11-02 21:55:12 -0700</bug_when>
    <thetext>Trying that again without my local hacks... still getting used to Windows.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>495205</commentid>
    <comment_count>23</comment_count>
    <who name="Alice Boxhall">aboxhall</who>
    <bug_when>2011-11-02 22:24:17 -0700</bug_when>
    <thetext>Ok, still not building on EWS. Will look into why.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>503894</commentid>
    <comment_count>24</comment_count>
      <attachid>113430</attachid>
    <who name="chris fleizach">cfleizach</who>
    <bug_when>2011-11-16 08:11:06 -0800</bug_when>
    <thetext>Comment on attachment 113430
Patch

r- until it builds on windows</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>951846</commentid>
    <comment_count>25</comment_count>
    <who name="James Craig">jcraig</who>
    <bug_when>2013-11-18 15:46:27 -0800</bug_when>
    <thetext>&lt;rdar://problem/15497230&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>951869</commentid>
    <comment_count>26</comment_count>
      <attachid>217249</attachid>
    <who name="Samuel White">samuel_white</who>
    <bug_when>2013-11-18 16:32:58 -0800</bug_when>
    <thetext>Created attachment 217249
Patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>951957</commentid>
    <comment_count>27</comment_count>
      <attachid>217249</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-11-18 22:07:56 -0800</bug_when>
    <thetext>Comment on attachment 217249
Patch.

Clearing flags on attachment: 217249

Committed r159482: &lt;http://trac.webkit.org/changeset/159482&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>951958</commentid>
    <comment_count>28</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-11-18 22:08:00 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>96542</attachid>
            <date>2011-06-08 21:21:50 -0700</date>
            <delta_ts>2011-08-21 23:02:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20110609142147.patch</filename>
            <type>text/plain</type>
            <size>8247</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODg0MTYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZTQ0NTgxZmMwZmM5YjI2YTVjMzFh
ZjQzMTA1ZjAzODlhNzgzOTY5Li44ZDFmMWExYmRhNjE4OTBkZjc0MGI5MzQyMjVhMTJmZTNmNWRj
MTEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMDggIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVu
Y2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxs
ZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDYtMDggIEphbWVzIEtvemlhbnNraSAgPGtvekBjaHJv
bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkLiBBZGQgVElNRU9VVCB0
byBzdHlsZXMtZGlzYWJsZS10aGVuLWNoYW5nZS5odG1sLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz
dHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5
LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5
LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDZhNjZi
YzhkN2Q5MWJkYjkwMjEzNTVkMzNkNjllZGYyZmU4ODYxMQotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxh
YmVsZWRieS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMiBAQAorQWxwaGEgQmV0YSBHYW1tYSBE
ZWx0YSBFcHNpbG9uCitUaGlzIHRlc3RzIHRoYXQgaWYgYXJpYS1sYWJlbGxlZGJ5IGlzIHVzZWQs
IHRoZW4gbm9uLXN0YW5kYXJkIGFyaWEtbGFiZWxlZGJ5IGF0dHJpYnV0ZXMgYXJlIGlnbm9yZWQu
CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMs
IGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIG9iai50aXRsZSBpcyAiQVhU
aXRsZTogR2FtbWEiCitQQVNTIG9iai50aXRsZSBpcyAiQVhUaXRsZTogRXBzaWxvbiIKK1BBU1Mg
c3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQg
YS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJp
YS1sYWJlbGVkYnkuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxl
ZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu
ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmMwZGYzMmFhMGNm
NzBmODI1OTY0MjNmMGMyMjViMGYwMDMyMjYxNDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU
ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbApAQCAtMCwwICsxLDU0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYv
L0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBo
cmVmPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0Pgor
dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i
Li4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor
PGJvZHkgaWQ9ImJvZHkiPgorCis8YnV0dG9uIGFyaWEtbGFiZWxsZWRieT0iZ2FtbWEiIGFyaWEt
bGFiZWxlZGJ5PSJkZWx0YSI+QWxwaGE8L2J1dHRvbj4KKzxidXR0b24gYXJpYS1sYWJlbGVkYnk9
ImVwc2lsb24iPkJldGE8L2J1dHRvbj4KKzxzcGFuIGlkPSJnYW1tYSI+R2FtbWE8L3NwYW4+Cis8
c3BhbiBpZD0iZGVsdGEiPkRlbHRhPC9zcGFuPgorPHNwYW4gaWQ9ImVwc2lsb24iPkVwc2lsb248
L3NwYW4+CisKKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPHVsIGlkPSJjb25zb2xlIj48L3Vs
PgorCis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgaWYgYXJpYS1s
YWJlbGxlZGJ5IGlzIHVzZWQsIHRoZW4gbm9uLXN0YW5kYXJkIGFyaWEtbGFiZWxlZGJ5IGF0dHJp
YnV0ZXMgYXJlIGlnbm9yZWQuIik7CisKKyAgICBmdW5jdGlvbiBsb2coc3RyKSB7CisgICAgICAg
IHZhciBjb25zb2xlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKTsKKyAgICAg
ICAgdmFyIGxpID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGkiKTsKKyAgICAgICAgbGkuYXBw
ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoc3RyKSk7CisgICAgICAgIGNvbnNvbGUu
YXBwZW5kQ2hpbGQobGkpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGxvZ0FYT2JqZWN0KG9iaikg
eworICAgICAgICAgIGxvZygiZm9yICIgKyBvYmouYWxsQXR0cmlidXRlcygpKTsKKyAgICAgICAg
ICBsb2coImNoaWxkcmVuOlxuIiArIG9iai5hdHRyaWJ1dGVzT2ZDaGlsZHJlbigpKTsKKyAgICAg
ICAgICBsb2coIm9iai50aXRsZSBpcyAiICsgb2JqLnRpdGxlKTsKKyAgICAgICAgICBsb2coIm9i
ai5kZXNjcmlwdGlvbiBpcyAiICsgb2JqLmRlc2NyaXB0aW9uKTsKKyAgICB9CisgICAgaWYgKHdp
bmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICAgIHZhciBib2R5ID0gZG9j
dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJvZHkiKTsKKyAgICAgICAgICBib2R5LmZvY3VzKCk7Cisg
ICAgICAgICAgdmFyIGdyb3VwT2JqID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVs
ZW1lbnQuY2hpbGRBdEluZGV4KDApOworICAgICAgICAgIHZhciBvYmogPSBncm91cE9iai5jaGls
ZEF0SW5kZXgoMCk7CisgICAgICAgICAgLy8gVGl0bGUgZnJvbSBhcmlhLWxhYmVsbGVkYnkgZWxl
bWVudCwgYXJpYS1sYWJlbGVkYnkgaXMgaWdub3JlZAorICAgICAgICAgIHNob3VsZEJlKCJvYmou
dGl0bGUiLCAnIkFYVGl0bGU6IEdhbW1hIicpOworICAgICAgICAgIHZhciBvYmogPSBncm91cE9i
ai5jaGlsZEF0SW5kZXgoMSk7CisgICAgICAgICAgLy8gYXJpYS1sYWJlbGVkYnkgaXMgdXNlZCBp
ZiBubyBhcmlhLWxhYmVsbGVkYnkgcHJlc2VudAorICAgICAgICAgIHNob3VsZEJlKCJvYmoudGl0
bGUiLCAnIkFYVGl0bGU6IEVwc2lsb24iJyk7CisgICAgfQorCisgICAgc3VjY2Vzc2Z1bGx5UGFy
c2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJj
ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp
bmRleCA4ZGYwZmU2ODlkNzY3ZGZlOGUwZGQ5MGY3ODM2MzJjNTNiZjIyNjZkLi45M2Y0YzI0ODAy
ZTIyMDkzNmM3MWFmMGM5ODRjYzI4Zjg1ODMxODJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg
QEAKKzIwMTEtMDYtMDggIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXJpYS1sYWJl
bGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVuY2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzUxCisKKyAg
ICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEt
bGFiZWxlZGJ5Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl
bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq
ZWN0OjphcmlhTGFiZWxsZWRCeUVsZW1lbnRzKTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlF
bGVtZW50cy4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFy
aWFMYWJlbGxlZEJ5QXR0cmlidXRlKTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlBdHRyaWJ1
dGUsCisgICAgICAgIGFuZCByZS1vcmRlcmVkIHRvIHByZWZlciB0aGUgc3RhbmRhcmQgc3BlbGxp
bmcuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZSk6
CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpoYXNUZXh0QWx0
ZXJuYXRpdmUpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9i
amVjdC5oOgorCiAyMDExLTA2LTA4ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4K
IAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIv
U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw
cAppbmRleCBiODgwZTFkYTdlNWJjODFmMmQ3ZjYxZThiZDVkNDk5OWNjY2E0MjJhLi41ZDU3MjBl
OWI2ODU1YTMxZmE1NzU3MDE4MWE1ODUwN2JiMzc5Y2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAK
QEAgLTEyNDYsMTcgKzEyNDYsMTcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpl
bGVtZW50c0Zyb21BdHRyaWJ1dGUoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMKICAgICB9CiB9
CiAgICAgCi12b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlFbGVt
ZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3QKK3ZvaWQgQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBl
bGVtZW50cykgY29uc3QKIHsKLSAgICBlbGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFy
aWFfbGFiZWxlZGJ5QXR0cik7CisgICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBh
cmlhX2xhYmVsbGVkYnlBdHRyKTsKICAgICBpZiAoIWVsZW1lbnRzLnNpemUoKSkKLSAgICAgICAg
ZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsbGVkYnlBdHRyKTsKKyAg
ICAgICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsZWRieUF0dHIp
OwogfQogICAgCi1TdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsZWRC
eUF0dHJpYnV0ZSgpIGNvbnN0CitTdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJp
YUxhYmVsbGVkQnlBdHRyaWJ1dGUoKSBjb25zdAogewogICAgIFZlY3RvcjxFbGVtZW50Kj4gZWxl
bWVudHM7Ci0gICAgYXJpYUxhYmVsZWRCeUVsZW1lbnRzKGVsZW1lbnRzKTsKKyAgICBhcmlhTGFi
ZWxsZWRCeUVsZW1lbnRzKGVsZW1lbnRzKTsKICAgICAKICAgICByZXR1cm4gYWNjZXNzaWJpbGl0
eURlc2NyaXB0aW9uRm9yRWxlbWVudHMoZWxlbWVudHMpOwogfQpAQCAtMTMwNSw3ICsxMzA1LDcg
QEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRpdGxlKCkgY29uc3QKICAgICBp
ZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKICAgICAKLSAgICBTdHJpbmcgYXJp
YUxhYmVsID0gYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpOworICAgIFN0cmluZyBhcmlhTGFiZWwg
PSBhcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSgpOwogICAgIGlmICghYXJpYUxhYmVsLmlzRW1wdHko
KSkKICAgICAgICAgcmV0dXJuIGFyaWFMYWJlbDsKICAgICAKQEAgLTE1OTUsOSArMTU5NSw5IEBA
IHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bGlua2VkVUlFbGVtZW50cyhBY2Nlc3Np
YmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGxpCiAKIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj
dDo6aGFzVGV4dEFsdGVybmF0aXZlKCkgY29uc3QKIHsKLSAgICAvLyBBUklBOiBzZWN0aW9uIDJB
LCBidWxsZXQgIzMgc2F5cyBpZiBhcmlhLWxhYmVsZWRieSBvciBhcmlhLWxhYmVsIGFwcGVhcnMs
IGl0IHNob3VsZAorICAgIC8vIEFSSUE6IHNlY3Rpb24gMkEsIGJ1bGxldCAjMyBzYXlzIGlmIGFy
aWEtbGFiZWxsZWRieSBvciBhcmlhLWxhYmVsIGFwcGVhcnMsIGl0IHNob3VsZAogICAgIC8vIG92
ZXJyaWRlIHRoZSAibGFiZWwiIGVsZW1lbnQgYXNzb2NpYXRpb24uCi0gICAgaWYgKCFhcmlhTGFi
ZWxlZEJ5QXR0cmlidXRlKCkuaXNFbXB0eSgpIHx8ICFnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0
dHIpLmlzRW1wdHkoKSkKKyAgICBpZiAoIWFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkuaXNFbXB0
eSgpIHx8ICFnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpLmlzRW1wdHkoKSkKICAgICAgICAg
cmV0dXJuIHRydWU7CiAgICAgICAgIAogICAgIHJldHVybiBmYWxzZTsgICAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5o
IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0
LmgKaW5kZXggZDEzNmI4YWQzNGE0MTU1MzljOTE5YjJjMTJkYzRiOThhMDFmNmNiYy4uMDJhMjRl
MzBlMDRkMzhiMmIyODJiODI4YTg3OTJkOGIwMGQwZGNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKKysrIGIvU291
cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKQEAg
LTE3Niw3ICsxNzYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBQbGFpblRleHRSYW5nZSBzZWxl
Y3RlZFRleHRSYW5nZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgVmlzaWJsZVNlbGVjdGlvbiBzZWxl
Y3Rpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBzdHJpbmdWYWx1ZSgpIGNvbnN0Owot
ICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKSBjb25zdDsKKyAgICB2
aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1
YWwgU3RyaW5nIHRpdGxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgYXJpYURlc2NyaWJl
ZEJ5QXR0cmlidXRlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgYWNjZXNzaWJpbGl0eURl
c2NyaXB0aW9uKCkgY29uc3Q7CkBAIC0yNTcsNyArMjU3LDcgQEAgcHJvdGVjdGVkOgogICAgIG11
dGFibGUgYm9vbCBtX2NoaWxkcmVuRGlydHk7CiAgICAgCiAgICAgdm9pZCBzZXRSZW5kZXJPYmpl
Y3QoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikgeyBtX3JlbmRlcmVyID0gcmVuZGVyZXI7IH0KLSAg
ICB2b2lkIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykg
Y29uc3Q7CisgICAgdm9pZCBhcmlhTGFiZWxsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50Kj4m
IGVsZW1lbnRzKSBjb25zdDsKICAgICBib29sIG5lZWRzVG9VcGRhdGVDaGlsZHJlbigpIGNvbnN0
IHsgcmV0dXJuIG1fY2hpbGRyZW5EaXJ0eTsgfQogICAgIAogICAgIHZpcnR1YWwgYm9vbCBpc0Rl
dGFjaGVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVuZGVyZXI7IH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104644</attachid>
            <date>2011-08-21 23:03:04 -0700</date>
            <delta_ts>2011-08-21 23:31:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20110822160301.patch</filename>
            <type>text/plain</type>
            <size>8299</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0OTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwMjk3MjIxOTYyMWNjYWI4NTFlODU2
OTk0NDVjNWVjMTMzMGY2NWZhLi4wOWJjMzM5MmM5MzlmYjFhNDVkZWUzZDBkMGQzMzNlZGE0ODA1
OTFjIDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMDggIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVu
Y2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxs
ZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDgtMjEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu
Y29tPgogCiAgICAgICAgIFVwZGF0ZSByZXN1bHRzIGZvciBtb3JlIHRlc3RzIGFmZmVjdGVkIGJ5
IHRoZSBhZGRpdGlvbiBvZiB0aGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxp
dHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJp
YS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ2YTY2YmM4ZDdkOTFiZGI5MDIx
MzU1ZDMzZDY5ZWRmMmZlODg2MTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nl
c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0FscGhhIEJldGEgR2FtbWEgRGVsdGEgRXBzaWxvbgor
VGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBpcyB1c2VkLCB0aGVuIG5vbi1zdGFu
ZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBpZ25vcmVkLgorCitPbiBzdWNjZXNz
LCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAi
VEVTVCBDT01QTEVURSIuCisKKworUEFTUyBvYmoudGl0bGUgaXMgIkFYVGl0bGU6IEdhbW1hIgor
UEFTUyBvYmoudGl0bGUgaXMgIkFYVGl0bGU6IEVwc2lsb24iCitQQVNTIHN1Y2Nlc3NmdWxseVBh
cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
YWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0
bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMt
YXJpYS1sYWJlbGVkYnkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMGRmMzJhYTBjZjcwZjgyNTk2NDIzZjBj
MjI1YjBmMDAzMjI2MTQ3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp
bGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKQEAgLTAs
MCArMSw1NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4i
PgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9q
cy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVs
bHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVz
b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5
Ij4KKworPGJ1dHRvbiBhcmlhLWxhYmVsbGVkYnk9ImdhbW1hIiBhcmlhLWxhYmVsZWRieT0iZGVs
dGEiPkFscGhhPC9idXR0b24+Cis8YnV0dG9uIGFyaWEtbGFiZWxlZGJ5PSJlcHNpbG9uIj5CZXRh
PC9idXR0b24+Cis8c3BhbiBpZD0iZ2FtbWEiPkdhbW1hPC9zcGFuPgorPHNwYW4gaWQ9ImRlbHRh
Ij5EZWx0YTwvc3Bhbj4KKzxzcGFuIGlkPSJlcHNpbG9uIj5FcHNpbG9uPC9zcGFuPgorCis8cCBp
ZD0iZGVzY3JpcHRpb24iPjwvcD4KKzx1bCBpZD0iY29uc29sZSI+PC91bD4KKworPHNjcmlwdD4K
KyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBpcyB1
c2VkLCB0aGVuIG5vbi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBpZ25v
cmVkLiIpOworCisgICAgZnVuY3Rpb24gbG9nKHN0cikgeworICAgICAgICB2YXIgY29uc29sZSA9
IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIik7CisgICAgICAgIHZhciBsaSA9IGRv
Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImxpIik7CisgICAgICAgIGxpLmFwcGVuZENoaWxkKGRvY3Vt
ZW50LmNyZWF0ZVRleHROb2RlKHN0cikpOworICAgICAgICBjb25zb2xlLmFwcGVuZENoaWxkKGxp
KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2dBWE9iamVjdChvYmopIHsKKyAgICAgICAgICBs
b2coImZvciAiICsgb2JqLmFsbEF0dHJpYnV0ZXMoKSk7CisgICAgICAgICAgbG9nKCJjaGlsZHJl
bjpcbiIgKyBvYmouYXR0cmlidXRlc09mQ2hpbGRyZW4oKSk7CisgICAgICAgICAgbG9nKCJvYmou
dGl0bGUgaXMgIiArIG9iai50aXRsZSk7CisgICAgICAgICAgbG9nKCJvYmouZGVzY3JpcHRpb24g
aXMgIiArIG9iai5kZXNjcmlwdGlvbik7CisgICAgfQorICAgIGlmICh3aW5kb3cuYWNjZXNzaWJp
bGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgICB2YXIgYm9keSA9IGRvY3VtZW50LmdldEVsZW1l
bnRCeUlkKCJib2R5Iik7CisgICAgICAgICAgYm9keS5mb2N1cygpOworICAgICAgICAgIHZhciBn
cm91cE9iaiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmNoaWxkQXRJ
bmRleCgwKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4KDApOwor
ICAgICAgICAgIC8vIFRpdGxlIGZyb20gYXJpYS1sYWJlbGxlZGJ5IGVsZW1lbnQsIGFyaWEtbGFi
ZWxlZGJ5IGlzIGlnbm9yZWQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLnRpdGxlIiwgJyJBWFRp
dGxlOiBHYW1tYSInKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4
KDEpOworICAgICAgICAgIC8vIGFyaWEtbGFiZWxlZGJ5IGlzIHVzZWQgaWYgbm8gYXJpYS1sYWJl
bGxlZGJ5IHByZXNlbnQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLnRpdGxlIiwgJyJBWFRpdGxl
OiBFcHNpbG9uIicpOworICAgIH0KKworICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8
L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z
dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA1MjQ0NzRl
OGQyM2IxYTAyZjljNzExMzE3Y2NiMzNhN2JiMjYyYy4uYWJkYjljNjFjMjU0YTRiZTA2NGU0MmU2
MDY0MDdkZmEwYmNiMzZlMiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr
KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTA2LTA4
ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGFyaWEtbGFiZWxsZWRieSBzaG91bGQg
YmUgdXNlZCBpbiBwcmVmZXJlbmNlIHRvIGFyaWEtbGFiZWxlZGJ5CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjM1MQorCisgICAgICAgIFRlc3Q6IGFj
Y2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS5odG1s
CisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVs
bGVkQnlFbGVtZW50cyk6IFJlbmFtZWQgZnJvbSBhcmlhTGFiZWxlZEJ5RWxlbWVudHMuCisgICAg
ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRCeUF0
dHJpYnV0ZSk6IFJlbmFtZWQgZnJvbSBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlLAorICAgICAgICBh
bmQgcmUtb3JkZXJlZCB0byBwcmVmZXIgdGhlIHN0YW5kYXJkIHNwZWxsaW5nLgorICAgICAgICAo
V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dGl0bGUpOgorICAgICAgICAoV2Vi
Q29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aGFzVGV4dEFsdGVybmF0aXZlKToKKyAg
ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKwogMjAx
MS0wOC0yMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgRml4ICdtYWtlIGRpc3QnIGZvciBXZWJLaXRHVEsrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5k
ZXggMGQ4YTdiOWZjNDlhNjhmMmI1ZWUyOWY2YjE0NDNkMjYwNjcwNTcxMC4uMWI3MTBjZjU2ODMx
NDA1OGQ1NzkyZjIxNWVjM2M5NWNiODg4OGQ3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0x
MjQxLDE3ICsxMjQxLDE3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZWxlbWVu
dHNGcm9tQXR0cmlidXRlKFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzCiAgICAgfQogfQogICAg
IAotdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxlZEJ5RWxlbWVudHMo
VmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0Cit2b2lkIEFjY2Vzc2liaWxpdHlSZW5k
ZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5RWxlbWVudHMoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVu
dHMpIGNvbnN0CiB7Ci0gICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xh
YmVsZWRieUF0dHIpOworICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9s
YWJlbGxlZGJ5QXR0cik7CiAgICAgaWYgKCFlbGVtZW50cy5zaXplKCkpCi0gICAgICAgIGVsZW1l
bnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGxlZGJ5QXR0cik7CisgICAgICAg
IGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGVkYnlBdHRyKTsKIH0K
ICAgIAotU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlBdHRy
aWJ1dGUoKSBjb25zdAorU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJl
bGxlZEJ5QXR0cmlidXRlKCkgY29uc3QKIHsKICAgICBWZWN0b3I8RWxlbWVudCo+IGVsZW1lbnRz
OwotICAgIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhlbGVtZW50cyk7CisgICAgYXJpYUxhYmVsbGVk
QnlFbGVtZW50cyhlbGVtZW50cyk7CiAgICAgCiAgICAgcmV0dXJuIGFjY2Vzc2liaWxpdHlEZXNj
cmlwdGlvbkZvckVsZW1lbnRzKGVsZW1lbnRzKTsKIH0KQEAgLTEzMDAsNiArMTMwMCwxMSBAQCBT
dHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dGl0bGUoKSBjb25zdAogICAgIGlmICgh
bm9kZSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogICAgIAorCisgICAgU3RyaW5nIGFyaWFM
YWJlbCA9IGFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCk7CisgICAgaWYgKCFhcmlhTGFiZWwuaXNF
bXB0eSgpKQorICAgICAgICByZXR1cm4gYXJpYUxhYmVsOworCiAgICAgY29uc3QgQXRvbWljU3Ry
aW5nJiB0aXRsZSA9IGdldEF0dHJpYnV0ZSh0aXRsZUF0dHIpOwogICAgIGlmICghdGl0bGUuaXNF
bXB0eSgpKQogICAgICAgICByZXR1cm4gdGl0bGU7CkBAIC0xNTkwLDkgKzE1OTUsOSBAQCB2b2lk
IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmxpbmtlZFVJRWxlbWVudHMoQWNjZXNzaWJpbGl0
eUNoaWxkcmVuVmVjdG9yJiBsaQogCiBib29sIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omhh
c1RleHRBbHRlcm5hdGl2ZSgpIGNvbnN0CiB7Ci0gICAgLy8gQVJJQTogc2VjdGlvbiAyQSwgYnVs
bGV0ICMzIHNheXMgaWYgYXJpYS1sYWJlbGVkYnkgb3IgYXJpYS1sYWJlbCBhcHBlYXJzLCBpdCBz
aG91bGQKKyAgICAvLyBBUklBOiBzZWN0aW9uIDJBLCBidWxsZXQgIzMgc2F5cyBpZiBhcmlhLWxh
YmVsbGVkYnkgb3IgYXJpYS1sYWJlbCBhcHBlYXJzLCBpdCBzaG91bGQKICAgICAvLyBvdmVycmlk
ZSB0aGUgImxhYmVsIiBlbGVtZW50IGFzc29jaWF0aW9uLgotICAgIGlmICghYXJpYUxhYmVsZWRC
eUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAhZ2V0QXR0cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5p
c0VtcHR5KCkpCisgICAgaWYgKCFhcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8
fCAhZ2V0QXR0cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy
biB0cnVlOwogICAgICAgICAKICAgICByZXR1cm4gZmFsc2U7ICAgCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaCBiL1Nv
dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCmlu
ZGV4IDM5NzBjNWU4ODYzNWQ4ZDMxNGM0MjM4MWYyMDliOWI3NjY3NzQ1ODIuLjQzYmI4NDhiZmFm
NmIyOTU4MzYwZmRkZDQ1Yjc5MzlmZmFmMzYyOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCkBAIC0xODUs
NyArMTg1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgUGxhaW5UZXh0UmFuZ2Ugc2VsZWN0ZWRU
ZXh0UmFuZ2UoKSBjb25zdDsKICAgICB2aXJ0dWFsIFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aW9u
KCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgc3RyaW5nVmFsdWUoKSBjb25zdDsKLSAgICB2
aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkgY29uc3Q7CisgICAgdmlydHVh
bCBTdHJpbmcgYXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0
cmluZyB0aXRsZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFEZXNjcmliZWRCeUF0
dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlw
dGlvbigpIGNvbnN0OwpAQCAtMjY2LDcgKzI2Niw3IEBAIHByb3RlY3RlZDoKICAgICBtdXRhYmxl
IGJvb2wgbV9jaGlsZHJlbkRpcnR5OwogICAgIAogICAgIHZvaWQgc2V0UmVuZGVyT2JqZWN0KFJl
bmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJlciA9IHJlbmRlcmVyOyB9Ci0gICAgdm9p
ZCBhcmlhTGFiZWxlZEJ5RWxlbWVudHMoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0
OworICAgIHZvaWQgYXJpYUxhYmVsbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVt
ZW50cykgY29uc3Q7CiAgICAgYm9vbCBuZWVkc1RvVXBkYXRlQ2hpbGRyZW4oKSBjb25zdCB7IHJl
dHVybiBtX2NoaWxkcmVuRGlydHk7IH0KICAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNEZXRhY2hl
ZCgpIGNvbnN0IHsgcmV0dXJuICFtX3JlbmRlcmVyOyB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104647</attachid>
            <date>2011-08-21 23:31:22 -0700</date>
            <delta_ts>2011-08-23 00:20:22 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20110822163120.patch</filename>
            <type>text/plain</type>
            <size>8187</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0OTIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAwMjk3MjIxOTYyMWNjYWI4NTFlODU2
OTk0NDVjNWVjMTMzMGY2NWZhLi4wOWJjMzM5MmM5MzlmYjFhNDVkZWUzZDBkMGQzMzNlZGE0ODA1
OTFjIDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMDggIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVu
Y2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxs
ZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDgtMjEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUu
Y29tPgogCiAgICAgICAgIFVwZGF0ZSByZXN1bHRzIGZvciBtb3JlIHRlc3RzIGFmZmVjdGVkIGJ5
IHRoZSBhZGRpdGlvbiBvZiB0aGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxp
dHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQg
Yi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJp
YS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ2YTY2YmM4ZDdkOTFiZGI5MDIx
MzU1ZDMzZDY5ZWRmMmZlODg2MTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nl
c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0
ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0FscGhhIEJldGEgR2FtbWEgRGVsdGEgRXBzaWxvbgor
VGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBpcyB1c2VkLCB0aGVuIG5vbi1zdGFu
ZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBpZ25vcmVkLgorCitPbiBzdWNjZXNz
LCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAi
VEVTVCBDT01QTEVURSIuCisKKworUEFTUyBvYmoudGl0bGUgaXMgIkFYVGl0bGU6IEdhbW1hIgor
UEFTUyBvYmoudGl0bGUgaXMgIkFYVGl0bGU6IEVwc2lsb24iCitQQVNTIHN1Y2Nlc3NmdWxseVBh
cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
YWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0
bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMt
YXJpYS1sYWJlbGVkYnkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMGRmMzJhYTBjZjcwZjgyNTk2NDIzZjBj
MjI1YjBmMDAzMjI2MTQ3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp
bGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKQEAgLTAs
MCArMSw1NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4i
PgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9q
cy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVs
bHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVz
b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5
Ij4KKworPGJ1dHRvbiBhcmlhLWxhYmVsbGVkYnk9ImdhbW1hIiBhcmlhLWxhYmVsZWRieT0iZGVs
dGEiPkFscGhhPC9idXR0b24+Cis8YnV0dG9uIGFyaWEtbGFiZWxlZGJ5PSJlcHNpbG9uIj5CZXRh
PC9idXR0b24+Cis8c3BhbiBpZD0iZ2FtbWEiPkdhbW1hPC9zcGFuPgorPHNwYW4gaWQ9ImRlbHRh
Ij5EZWx0YTwvc3Bhbj4KKzxzcGFuIGlkPSJlcHNpbG9uIj5FcHNpbG9uPC9zcGFuPgorCis8cCBp
ZD0iZGVzY3JpcHRpb24iPjwvcD4KKzx1bCBpZD0iY29uc29sZSI+PC91bD4KKworPHNjcmlwdD4K
KyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBpcyB1
c2VkLCB0aGVuIG5vbi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBpZ25v
cmVkLiIpOworCisgICAgZnVuY3Rpb24gbG9nKHN0cikgeworICAgICAgICB2YXIgY29uc29sZSA9
IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIik7CisgICAgICAgIHZhciBsaSA9IGRv
Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImxpIik7CisgICAgICAgIGxpLmFwcGVuZENoaWxkKGRvY3Vt
ZW50LmNyZWF0ZVRleHROb2RlKHN0cikpOworICAgICAgICBjb25zb2xlLmFwcGVuZENoaWxkKGxp
KTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2dBWE9iamVjdChvYmopIHsKKyAgICAgICAgICBs
b2coImZvciAiICsgb2JqLmFsbEF0dHJpYnV0ZXMoKSk7CisgICAgICAgICAgbG9nKCJjaGlsZHJl
bjpcbiIgKyBvYmouYXR0cmlidXRlc09mQ2hpbGRyZW4oKSk7CisgICAgICAgICAgbG9nKCJvYmou
dGl0bGUgaXMgIiArIG9iai50aXRsZSk7CisgICAgICAgICAgbG9nKCJvYmouZGVzY3JpcHRpb24g
aXMgIiArIG9iai5kZXNjcmlwdGlvbik7CisgICAgfQorICAgIGlmICh3aW5kb3cuYWNjZXNzaWJp
bGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgICB2YXIgYm9keSA9IGRvY3VtZW50LmdldEVsZW1l
bnRCeUlkKCJib2R5Iik7CisgICAgICAgICAgYm9keS5mb2N1cygpOworICAgICAgICAgIHZhciBn
cm91cE9iaiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmNoaWxkQXRJ
bmRleCgwKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4KDApOwor
ICAgICAgICAgIC8vIFRpdGxlIGZyb20gYXJpYS1sYWJlbGxlZGJ5IGVsZW1lbnQsIGFyaWEtbGFi
ZWxlZGJ5IGlzIGlnbm9yZWQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLnRpdGxlIiwgJyJBWFRp
dGxlOiBHYW1tYSInKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4
KDEpOworICAgICAgICAgIC8vIGFyaWEtbGFiZWxlZGJ5IGlzIHVzZWQgaWYgbm8gYXJpYS1sYWJl
bGxlZGJ5IHByZXNlbnQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLnRpdGxlIiwgJyJBWFRpdGxl
OiBFcHNpbG9uIicpOworICAgIH0KKworICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8
L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z
dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA1MjQ0NzRl
OGQyM2IxYTAyZjljNzExMzE3Y2NiMzNhN2JiMjYyYy4uYWJkYjljNjFjMjU0YTRiZTA2NGU0MmU2
MDY0MDdkZmEwYmNiMzZlMiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr
KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTA2LTA4
ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGFyaWEtbGFiZWxsZWRieSBzaG91bGQg
YmUgdXNlZCBpbiBwcmVmZXJlbmNlIHRvIGFyaWEtbGFiZWxlZGJ5CisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjM1MQorCisgICAgICAgIFRlc3Q6IGFj
Y2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS5odG1s
CisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw
OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVs
bGVkQnlFbGVtZW50cyk6IFJlbmFtZWQgZnJvbSBhcmlhTGFiZWxlZEJ5RWxlbWVudHMuCisgICAg
ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRCeUF0
dHJpYnV0ZSk6IFJlbmFtZWQgZnJvbSBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlLAorICAgICAgICBh
bmQgcmUtb3JkZXJlZCB0byBwcmVmZXIgdGhlIHN0YW5kYXJkIHNwZWxsaW5nLgorICAgICAgICAo
V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dGl0bGUpOgorICAgICAgICAoV2Vi
Q29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aGFzVGV4dEFsdGVybmF0aXZlKToKKyAg
ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKwogMjAx
MS0wOC0yMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg
ICAgRml4ICdtYWtlIGRpc3QnIGZvciBXZWJLaXRHVEsrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5k
ZXggMGQ4YTdiOWZjNDlhNjhmMmI1ZWUyOWY2YjE0NDNkMjYwNjcwNTcxMC4uOTFmZGE1NjgyNjA1
MmYwNzUyMzZhZTgxODAwYmJjM2E2ZTI2NDdmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0x
MjQxLDE3ICsxMjQxLDE3IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZWxlbWVu
dHNGcm9tQXR0cmlidXRlKFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzCiAgICAgfQogfQogICAg
IAotdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxlZEJ5RWxlbWVudHMo
VmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0Cit2b2lkIEFjY2Vzc2liaWxpdHlSZW5k
ZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5RWxlbWVudHMoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVu
dHMpIGNvbnN0CiB7Ci0gICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xh
YmVsZWRieUF0dHIpOworICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9s
YWJlbGxlZGJ5QXR0cik7CiAgICAgaWYgKCFlbGVtZW50cy5zaXplKCkpCi0gICAgICAgIGVsZW1l
bnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGxlZGJ5QXR0cik7CisgICAgICAg
IGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGVkYnlBdHRyKTsKIH0K
ICAgIAotU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlBdHRy
aWJ1dGUoKSBjb25zdAorU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJl
bGxlZEJ5QXR0cmlidXRlKCkgY29uc3QKIHsKICAgICBWZWN0b3I8RWxlbWVudCo+IGVsZW1lbnRz
OwotICAgIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhlbGVtZW50cyk7CisgICAgYXJpYUxhYmVsbGVk
QnlFbGVtZW50cyhlbGVtZW50cyk7CiAgICAgCiAgICAgcmV0dXJuIGFjY2Vzc2liaWxpdHlEZXNj
cmlwdGlvbkZvckVsZW1lbnRzKGVsZW1lbnRzKTsKIH0KQEAgLTEzMDAsNiArMTMwMCw3IEBAIFN0
cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZSgpIGNvbnN0CiAgICAgaWYgKCFu
b2RlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAgCisKICAgICBjb25zdCBBdG9taWNT
dHJpbmcmIHRpdGxlID0gZ2V0QXR0cmlidXRlKHRpdGxlQXR0cik7CiAgICAgaWYgKCF0aXRsZS5p
c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0aXRsZTsKQEAgLTE1OTAsOSArMTU5MSw5IEBAIHZv
aWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bGlua2VkVUlFbGVtZW50cyhBY2Nlc3NpYmls
aXR5Q2hpbGRyZW5WZWN0b3ImIGxpCiAKIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6
aGFzVGV4dEFsdGVybmF0aXZlKCkgY29uc3QKIHsKLSAgICAvLyBBUklBOiBzZWN0aW9uIDJBLCBi
dWxsZXQgIzMgc2F5cyBpZiBhcmlhLWxhYmVsZWRieSBvciBhcmlhLWxhYmVsIGFwcGVhcnMsIGl0
IHNob3VsZAorICAgIC8vIEFSSUE6IHNlY3Rpb24gMkEsIGJ1bGxldCAjMyBzYXlzIGlmIGFyaWEt
bGFiZWxsZWRieSBvciBhcmlhLWxhYmVsIGFwcGVhcnMsIGl0IHNob3VsZAogICAgIC8vIG92ZXJy
aWRlIHRoZSAibGFiZWwiIGVsZW1lbnQgYXNzb2NpYXRpb24uCi0gICAgaWYgKCFhcmlhTGFiZWxl
ZEJ5QXR0cmlidXRlKCkuaXNFbXB0eSgpIHx8ICFnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIp
LmlzRW1wdHkoKSkKKyAgICBpZiAoIWFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkuaXNFbXB0eSgp
IHx8ICFnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0
dXJuIHRydWU7CiAgICAgICAgIAogICAgIHJldHVybiBmYWxzZTsgICAKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oIGIv
U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgK
aW5kZXggMzk3MGM1ZTg4NjM1ZDhkMzE0YzQyMzgxZjIwOWI5Yjc2Njc3NDU4Mi4uNDNiYjg0OGJm
YWY2YjI5NTgzNjBmZGRkNDViNzkzOWZmYWYzNjI4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNl
L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKQEAgLTE4
NSw3ICsxODUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBQbGFpblRleHRSYW5nZSBzZWxlY3Rl
ZFRleHRSYW5nZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgVmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rp
b24oKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBzdHJpbmdWYWx1ZSgpIGNvbnN0OwotICAg
IHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKSBjb25zdDsKKyAgICB2aXJ0
dWFsIFN0cmluZyBhcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwg
U3RyaW5nIHRpdGxlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgYXJpYURlc2NyaWJlZEJ5
QXR0cmlidXRlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgYWNjZXNzaWJpbGl0eURlc2Ny
aXB0aW9uKCkgY29uc3Q7CkBAIC0yNjYsNyArMjY2LDcgQEAgcHJvdGVjdGVkOgogICAgIG11dGFi
bGUgYm9vbCBtX2NoaWxkcmVuRGlydHk7CiAgICAgCiAgICAgdm9pZCBzZXRSZW5kZXJPYmplY3Qo
UmVuZGVyT2JqZWN0KiByZW5kZXJlcikgeyBtX3JlbmRlcmVyID0gcmVuZGVyZXI7IH0KLSAgICB2
b2lkIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29u
c3Q7CisgICAgdm9pZCBhcmlhTGFiZWxsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50Kj4mIGVs
ZW1lbnRzKSBjb25zdDsKICAgICBib29sIG5lZWRzVG9VcGRhdGVDaGlsZHJlbigpIGNvbnN0IHsg
cmV0dXJuIG1fY2hpbGRyZW5EaXJ0eTsgfQogICAgIAogICAgIHZpcnR1YWwgYm9vbCBpc0RldGFj
aGVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVuZGVyZXI7IH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>104795</attachid>
            <date>2011-08-23 00:20:30 -0700</date>
            <delta_ts>2011-09-05 18:29:18 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20110823172027.patch</filename>
            <type>text/plain</type>
            <size>9566</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1NzgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1Y2ZhNDFjMGVjMmU4MGExYWE2ODUz
ZWM5Yjc4Y2ZkNjY0YTk1NzhkLi4xYjUxOGIxYTNhNjRkZjliOWZkMmM0YzE1YjI5NzYxNWNhNDM5
M2M3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMjIgIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVu
Y2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxs
ZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDgtMjIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll
dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5MzU2
NS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5
LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nl
c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0
ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAuLmUzNzc1MDg2ZTU1NjRjMGFlOTQyNTliZTliYmMzNWM4MGJiNmRl
YzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFi
ZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs
MTIgQEAKK0FscGhhIEJldGEgR2FtbWEgRGVsdGEgRXBzaWxvbgorVGhpcyB0ZXN0cyB0aGF0IGlm
IGFyaWEtbGFiZWxsZWRieSBpcyB1c2VkLCB0aGVuIG5vbi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRi
eSBhdHRyaWJ1dGVzIGFyZSBpZ25vcmVkLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz
ZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisK
KworUEFTUyBvYmouZGVzY3JpcHRpb24gaXMgIkFYRGVzY3JpcHRpb246IEdhbW1hIgorUEFTUyBv
YmouZGVzY3JpcHRpb24gaXMgIkFYRGVzY3JpcHRpb246IEVwc2lsb24iCitQQVNTIHN1Y2Nlc3Nm
dWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0
VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxl
ZGJ5Lmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVy
cmlkZXMtYXJpYS1sYWJlbGVkYnkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40MWFhNzcwZTQ0YTlhYjA4NzRj
YWY2YjY3YzdmMGFmZTk0NjkwMmMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNj
ZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwK
QEAgLTAsMCArMSw1NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRN
TC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4v
ZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNj
ZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3Qv
anMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlk
PSJib2R5Ij4KKworPGJ1dHRvbiBhcmlhLWxhYmVsbGVkYnk9ImdhbW1hIiBhcmlhLWxhYmVsZWRi
eT0iZGVsdGEiPkFscGhhPC9idXR0b24+Cis8YnV0dG9uIGFyaWEtbGFiZWxlZGJ5PSJlcHNpbG9u
Ij5CZXRhPC9idXR0b24+Cis8c3BhbiBpZD0iZ2FtbWEiPkdhbW1hPC9zcGFuPgorPHNwYW4gaWQ9
ImRlbHRhIj5EZWx0YTwvc3Bhbj4KKzxzcGFuIGlkPSJlcHNpbG9uIj5FcHNpbG9uPC9zcGFuPgor
Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzx1bCBpZD0iY29uc29sZSI+PC91bD4KKworPHNj
cmlwdD4KKyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRi
eSBpcyB1c2VkLCB0aGVuIG5vbi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFy
ZSBpZ25vcmVkLiIpOworCisgICAgZnVuY3Rpb24gbG9nKHN0cikgeworICAgICAgICB2YXIgY29u
c29sZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIik7CisgICAgICAgIHZhciBs
aSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImxpIik7CisgICAgICAgIGxpLmFwcGVuZENoaWxk
KGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHN0cikpOworICAgICAgICBjb25zb2xlLmFwcGVuZENo
aWxkKGxpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2dBWE9iamVjdChvYmopIHsKKyAgICAg
ICAgICBsb2coImZvciAiICsgb2JqLmFsbEF0dHJpYnV0ZXMoKSk7CisgICAgICAgICAgbG9nKCJj
aGlsZHJlbjpcbiIgKyBvYmouYXR0cmlidXRlc09mQ2hpbGRyZW4oKSk7CisgICAgICAgICAgbG9n
KCJvYmoudGl0bGUgaXMgIiArIG9iai50aXRsZSk7CisgICAgICAgICAgbG9nKCJvYmouZGVzY3Jp
cHRpb24gaXMgIiArIG9iai5kZXNjcmlwdGlvbik7CisgICAgfQorICAgIGlmICh3aW5kb3cuYWNj
ZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgICB2YXIgYm9keSA9IGRvY3VtZW50Lmdl
dEVsZW1lbnRCeUlkKCJib2R5Iik7CisgICAgICAgICAgYm9keS5mb2N1cygpOworICAgICAgICAg
IHZhciBncm91cE9iaiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmNo
aWxkQXRJbmRleCgwKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4
KDApOworICAgICAgICAgIC8vIERlc2NyaXB0aW9uIGZyb20gYXJpYS1sYWJlbGxlZGJ5IGVsZW1l
bnQsIGFyaWEtbGFiZWxlZGJ5IGlzIGlnbm9yZWQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLmRl
c2NyaXB0aW9uIiwgJyJBWERlc2NyaXB0aW9uOiBHYW1tYSInKTsKKyAgICAgICAgICB2YXIgb2Jq
ID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4KDEpOworICAgICAgICAgIC8vIGFyaWEtbGFiZWxlZGJ5
IGlzIHVzZWQgaWYgbm8gYXJpYS1sYWJlbGxlZGJ5IHByZXNlbnQKKyAgICAgICAgICBzaG91bGRC
ZSgib2JqLmRlc2NyaXB0aW9uIiwgJyJBWERlc2NyaXB0aW9uOiBFcHNpbG9uIicpOworICAgIH0K
KworICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBz
cmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2Jv
ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy
Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ4N2Q5NzRlMDY1ZDRjM2Y3MTNjYWMxMmNhODAy
ZjFlM2M1YWFlNi4uMzE3NGUxYWM4NzI1ZTIxMmVkMjdkMDBhMjVmY2M4NjU3ZWNlNzM3YSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTA4LTIyICBBbGljZSBCb3hoYWxsICA8YWJv
eGhhbGxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorCisgICAgICAgIGFyaWEtbGFiZWxsZWRieSBzaG91bGQgYmUgdXNlZCBpbiBwcmVmZXJlbmNl
IHRvIGFyaWEtbGFiZWxlZGJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD02MjM1MQorCisgICAgICAgIFRlc3Q6IGFjY2Vzc2liaWxpdHkvYXJpYS1sYWJl
bGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS5odG1sCisKKyAgICAgICAgKiBhY2Nlc3Np
YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsbGVkQnlFbGVtZW50cyk6IFJlbmFt
ZWQgZnJvbSBhcmlhTGFiZWxlZEJ5RWxlbWVudHMuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3Np
YmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSk6IFJlbmFtZWQgZnJv
bSBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlLAorICAgICAgICBhbmQgcmUtb3JkZXJlZCB0byBwcmVm
ZXIgdGhlIHN0YW5kYXJkIHNwZWxsaW5nLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdDo6dGl0bGUpOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJl
bmRlck9iamVjdDo6aGFzVGV4dEFsdGVybmF0aXZlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5
L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKwogMjAxMS0wOC0yMiAgU2hlcmlmZiBCb3Qg
IDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s
bGluZyBvdXQgcjkzNTY1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0
eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj
Y2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA1OTk4YmEyOWEwNTFkZWE2YmYwNzMzMTk4NGRmNjA1
YTBiNzU5YzkwLi4xOTMyMjVhZTkzMGFiNDUzNWU0NjE4YTRlYWU0OWNmN2U1ZDFkOTMyIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu
aApAQCAtNDg2LDcgKzQ4Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0Um9sZVZhbHVlKEFj
Y2Vzc2liaWxpdHlSb2xlIHJvbGUpIHsgbV9yb2xlID0gcm9sZTsgfQogICAgIHZpcnR1YWwgQWNj
ZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9yb2xlOyB9Ci0gICAg
dmlydHVhbCBTdHJpbmcgYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0IHsgcmV0dXJuIFN0
cmluZygpOyB9CisgICAgdmlydHVhbCBTdHJpbmcgYXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUoKSBj
b25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFEZXNjcmli
ZWRCeUF0dHJpYnV0ZSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmlydHVhbCBT
dHJpbmcgYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7
IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls
aXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggMGQ4YTdiOWZjNDlhNjhmMmI1ZWUyOWY2YjE0
NDNkMjYwNjcwNTcxMC4uNDI4ODBmMjg4ZTU5YThhZWIzZmY4MmYwNDM3YzljNzg1NzUwNTVlOCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu
ZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0xMjQxLDE4ICsxMjQxLDE3IEBAIHZvaWQgQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdDo6ZWxlbWVudHNGcm9tQXR0cmlidXRlKFZlY3RvcjxFbGVtZW50
Kj4mIGVsZW1lbnRzCiAgICAgfQogfQogICAgIAotdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq
ZWN0OjphcmlhTGFiZWxlZEJ5RWxlbWVudHMoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMpIGNv
bnN0Cit2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5RWxlbWVu
dHMoVmVjdG9yPEVsZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0CiB7Ci0gICAgZWxlbWVudHNGcm9t
QXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsZWRieUF0dHIpOworICAgIGVsZW1lbnRzRnJv
bUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGxlZGJ5QXR0cik7CiAgICAgaWYgKCFlbGVt
ZW50cy5zaXplKCkpCi0gICAgICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJp
YV9sYWJlbGxlZGJ5QXR0cik7CisgICAgICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50
cywgYXJpYV9sYWJlbGVkYnlBdHRyKTsKIH0KICAgIAotU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5k
ZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKSBjb25zdAorU3RyaW5nIEFjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkgY29uc3QKIHsKICAg
ICBWZWN0b3I8RWxlbWVudCo+IGVsZW1lbnRzOwotICAgIGFyaWFMYWJlbGVkQnlFbGVtZW50cyhl
bGVtZW50cyk7Ci0gICAgCisgICAgYXJpYUxhYmVsbGVkQnlFbGVtZW50cyhlbGVtZW50cyk7CiAg
ICAgcmV0dXJuIGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbkZvckVsZW1lbnRzKGVsZW1lbnRzKTsK
IH0KIApAQCAtMTI5OSw3ICsxMjk4LDcgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmpl
Y3Q6OnRpdGxlKCkgY29uc3QKICAgICBOb2RlKiBub2RlID0gbV9yZW5kZXJlci0+bm9kZSgpOwog
ICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwotICAgIAorCiAgICAgY29u
c3QgQXRvbWljU3RyaW5nJiB0aXRsZSA9IGdldEF0dHJpYnV0ZSh0aXRsZUF0dHIpOwogICAgIGlm
ICghdGl0bGUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdGl0bGU7CkBAIC0xMzQyLDkgKzEz
NDEsOSBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYURlc2NyaWJlZEJ5
QXR0cmlidXRlKCkgY29uc3QKICAgICAKIFN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0
OjphcmlhQWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkgY29uc3QKIHsKLSAgICBTdHJpbmcgYXJp
YUxhYmVsZWRCeSA9IGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKTsKLSAgICBpZiAoIWFyaWFMYWJl
bGVkQnkuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gYXJpYUxhYmVsZWRCeTsKKyAgICBTdHJp
bmcgYXJpYUxhYmVsbGVkQnkgPSBhcmlhTGFiZWxsZWRCeUF0dHJpYnV0ZSgpOworICAgIGlmICgh
YXJpYUxhYmVsbGVkQnkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gYXJpYUxhYmVsbGVkQnk7
CiAKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGFyaWFMYWJlbCA9IGdldEF0dHJpYnV0ZShhcmlh
X2xhYmVsQXR0cik7CiAgICAgaWYgKCFhcmlhTGFiZWwuaXNFbXB0eSgpKQpAQCAtMTU5MCw5ICsx
NTg5LDkgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpsaW5rZWRVSUVsZW1lbnRz
KEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgbGkKIAogYm9vbCBBY2Nlc3NpYmlsaXR5UmVu
ZGVyT2JqZWN0OjpoYXNUZXh0QWx0ZXJuYXRpdmUoKSBjb25zdAogewotICAgIC8vIEFSSUE6IHNl
Y3Rpb24gMkEsIGJ1bGxldCAjMyBzYXlzIGlmIGFyaWEtbGFiZWxlZGJ5IG9yIGFyaWEtbGFiZWwg
YXBwZWFycywgaXQgc2hvdWxkCisgICAgLy8gQVJJQTogc2VjdGlvbiAyQSwgYnVsbGV0ICMzIHNh
eXMgaWYgYXJpYS1sYWJlbGxlZGJ5IG9yIGFyaWEtbGFiZWwgYXBwZWFycywgaXQgc2hvdWxkCiAg
ICAgLy8gb3ZlcnJpZGUgdGhlICJsYWJlbCIgZWxlbWVudCBhc3NvY2lhdGlvbi4KLSAgICBpZiAo
IWFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUoKS5pc0VtcHR5KCkgfHwgIWdldEF0dHJpYnV0ZShhcmlh
X2xhYmVsQXR0cikuaXNFbXB0eSgpKQorICAgIGlmICghYXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUo
KS5pc0VtcHR5KCkgfHwgIWdldEF0dHJpYnV0ZShhcmlhX2xhYmVsQXR0cikuaXNFbXB0eSgpKQog
ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgCiAgICAgcmV0dXJuIGZhbHNlOyAgIApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy
T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5k
ZXJPYmplY3QuaAppbmRleCAzOTcwYzVlODg2MzVkOGQzMTRjNDIzODFmMjA5YjliNzY2Nzc0NTgy
Li40M2JiODQ4YmZhZjZiMjk1ODM2MGZkZGQ0NWI3OTM5ZmZhZjM2MjhiIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmpl
Y3QuaApAQCAtMTg1LDcgKzE4NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFBsYWluVGV4dFJh
bmdlIHNlbGVjdGVkVGV4dFJhbmdlKCkgY29uc3Q7CiAgICAgdmlydHVhbCBWaXNpYmxlU2VsZWN0
aW9uIHNlbGVjdGlvbigpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIHN0cmluZ1ZhbHVlKCkg
Y29uc3Q7Ci0gICAgdmlydHVhbCBTdHJpbmcgYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0
OworICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkgY29uc3Q7CiAg
ICAgdmlydHVhbCBTdHJpbmcgdGl0bGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBhcmlh
RGVzY3JpYmVkQnlBdHRyaWJ1dGUoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBhY2Nlc3Np
YmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdDsKQEAgLTI2Niw3ICsyNjYsNyBAQCBwcm90ZWN0ZWQ6
CiAgICAgbXV0YWJsZSBib29sIG1fY2hpbGRyZW5EaXJ0eTsKICAgICAKICAgICB2b2lkIHNldFJl
bmRlck9iamVjdChSZW5kZXJPYmplY3QqIHJlbmRlcmVyKSB7IG1fcmVuZGVyZXIgPSByZW5kZXJl
cjsgfQotICAgIHZvaWQgYXJpYUxhYmVsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50Kj4mIGVs
ZW1lbnRzKSBjb25zdDsKKyAgICB2b2lkIGFyaWFMYWJlbGxlZEJ5RWxlbWVudHMoVmVjdG9yPEVs
ZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0OwogICAgIGJvb2wgbmVlZHNUb1VwZGF0ZUNoaWxkcmVu
KCkgY29uc3QgeyByZXR1cm4gbV9jaGlsZHJlbkRpcnR5OyB9CiAgICAgCiAgICAgdmlydHVhbCBi
b29sIGlzRGV0YWNoZWQoKSBjb25zdCB7IHJldHVybiAhbV9yZW5kZXJlcjsgfQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>106373</attachid>
            <date>2011-09-05 18:29:27 -0700</date>
            <delta_ts>2011-11-02 20:50:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20110906112924.patch</filename>
            <type>text/plain</type>
            <size>9591</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ1NDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmMzFiZWQ4ZWIyOTA0ZTlmMjE4OGNm
NWZjYzA5YzI3MmJkOTYxZDA3Li5iOTdlNWI2OGNlZGY4NjIwYTk3MjJmODVmMzYyMGJlNWRjNzMz
NzIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMjIgIEFsaWNlIEJveGhhbGwgIDxh
Ym94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVu
Y2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxs
ZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg
ICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMDUgIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRl
bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGFrZSBwYWdlU2NhbGVGYWN0b3IgaW50byBhY2Nv
dW50IGZvciBNb3VzZVJlbGF0ZWRFdmVudHMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nl
c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0
ZWQudHh0IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJp
ZGVzLWFyaWEtbGFiZWxlZGJ5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl
eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lMzc3NTA4NmU1NTY0
YzBhZTk0MjU5YmU5YmJjMzVjODBiYjZkZWM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz
dHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5
LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEyIEBACitBbHBoYSBCZXRhIEdhbW1hIERlbHRhIEVw
c2lsb24KK1RoaXMgdGVzdHMgdGhhdCBpZiBhcmlhLWxhYmVsbGVkYnkgaXMgdXNlZCwgdGhlbiBu
b24tc3RhbmRhcmQgYXJpYS1sYWJlbGVkYnkgYXR0cmlidXRlcyBhcmUgaWdub3JlZC4KKworT24g
c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93
ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgb2JqLmRlc2NyaXB0aW9uIGlzICJBWERl
c2NyaXB0aW9uOiBHYW1tYSIKK1BBU1Mgb2JqLmRlc2NyaXB0aW9uIGlzICJBWERlc2NyaXB0aW9u
OiBFcHNpbG9uIgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBM
RVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxl
ZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJp
bGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKbmV3IGZp
bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMC4uNDFhYTc3MGU0NGE5YWIwODc0Y2FmNmI2N2M3ZjBhZmU5NDY5MDJjMQotLS0gL2Rldi9u
dWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJy
aWRlcy1hcmlhLWxhYmVsZWRieS5odG1sCkBAIC0wLDAgKzEsNTQgQEAKKzwhRE9DVFlQRSBIVE1M
IFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayBy
ZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUu
Y3NzIj4KKzxzY3JpcHQ+Cit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7Cis8L3Njcmlw
dD4KKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9z
Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzxidXR0b24gYXJpYS1sYWJlbGxl
ZGJ5PSJnYW1tYSIgYXJpYS1sYWJlbGVkYnk9ImRlbHRhIj5BbHBoYTwvYnV0dG9uPgorPGJ1dHRv
biBhcmlhLWxhYmVsZWRieT0iZXBzaWxvbiI+QmV0YTwvYnV0dG9uPgorPHNwYW4gaWQ9ImdhbW1h
Ij5HYW1tYTwvc3Bhbj4KKzxzcGFuIGlkPSJkZWx0YSI+RGVsdGE8L3NwYW4+Cis8c3BhbiBpZD0i
ZXBzaWxvbiI+RXBzaWxvbjwvc3Bhbj4KKworPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8dWwg
aWQ9ImNvbnNvbGUiPjwvdWw+CisKKzxzY3JpcHQ+CisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVz
dHMgdGhhdCBpZiBhcmlhLWxhYmVsbGVkYnkgaXMgdXNlZCwgdGhlbiBub24tc3RhbmRhcmQgYXJp
YS1sYWJlbGVkYnkgYXR0cmlidXRlcyBhcmUgaWdub3JlZC4iKTsKKworICAgIGZ1bmN0aW9uIGxv
ZyhzdHIpIHsKKyAgICAgICAgdmFyIGNvbnNvbGUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi
Y29uc29sZSIpOworICAgICAgICB2YXIgbGkgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJsaSIp
OworICAgICAgICBsaS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShzdHIpKTsK
KyAgICAgICAgY29uc29sZS5hcHBlbmRDaGlsZChsaSk7CisgICAgfQorCisgICAgZnVuY3Rpb24g
bG9nQVhPYmplY3Qob2JqKSB7CisgICAgICAgICAgbG9nKCJmb3IgIiArIG9iai5hbGxBdHRyaWJ1
dGVzKCkpOworICAgICAgICAgIGxvZygiY2hpbGRyZW46XG4iICsgb2JqLmF0dHJpYnV0ZXNPZkNo
aWxkcmVuKCkpOworICAgICAgICAgIGxvZygib2JqLnRpdGxlIGlzICIgKyBvYmoudGl0bGUpOwor
ICAgICAgICAgIGxvZygib2JqLmRlc2NyaXB0aW9uIGlzICIgKyBvYmouZGVzY3JpcHRpb24pOwor
ICAgIH0KKyAgICBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgICAg
ICAgdmFyIGJvZHkgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIpOworICAgICAgICAg
IGJvZHkuZm9jdXMoKTsKKyAgICAgICAgICB2YXIgZ3JvdXBPYmogPSBhY2Nlc3NpYmlsaXR5Q29u
dHJvbGxlci5mb2N1c2VkRWxlbWVudC5jaGlsZEF0SW5kZXgoMCk7CisgICAgICAgICAgdmFyIG9i
aiA9IGdyb3VwT2JqLmNoaWxkQXRJbmRleCgwKTsKKyAgICAgICAgICAvLyBEZXNjcmlwdGlvbiBm
cm9tIGFyaWEtbGFiZWxsZWRieSBlbGVtZW50LCBhcmlhLWxhYmVsZWRieSBpcyBpZ25vcmVkCisg
ICAgICAgICAgc2hvdWxkQmUoIm9iai5kZXNjcmlwdGlvbiIsICciQVhEZXNjcmlwdGlvbjogR2Ft
bWEiJyk7CisgICAgICAgICAgdmFyIG9iaiA9IGdyb3VwT2JqLmNoaWxkQXRJbmRleCgxKTsKKyAg
ICAgICAgICAvLyBhcmlhLWxhYmVsZWRieSBpcyB1c2VkIGlmIG5vIGFyaWEtbGFiZWxsZWRieSBw
cmVzZW50CisgICAgICAgICAgc2hvdWxkQmUoIm9iai5kZXNjcmlwdGlvbiIsICciQVhEZXNjcmlw
dGlvbjogRXBzaWxvbiInKTsKKyAgICB9CisKKyAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVl
OworPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0
LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGIwN2Zl
NzdmMDQyYTViZmVkMWMzMGQxNGM0ZDBmYjhhODJkMzFhZWUuLjEwOTlmMGNkMTZlYzcwOGE2NDdl
MWMyOTY0ZmVkOWU5ZWE2YTBhYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0w
OC0yMiAgQWxpY2UgQm94aGFsbCAgPGFib3hoYWxsQGNocm9taXVtLm9yZz4KKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBhcmlhLWxhYmVsbGVkYnkgc2hv
dWxkIGJlIHVzZWQgaW4gcHJlZmVyZW5jZSB0byBhcmlhLWxhYmVsZWRieQorICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIzNTEKKworICAgICAgICBUZXN0
OiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnku
aHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFM
YWJlbGxlZEJ5RWxlbWVudHMpOiBSZW5hbWVkIGZyb20gYXJpYUxhYmVsZWRCeUVsZW1lbnRzLgor
ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsbGVk
QnlBdHRyaWJ1dGUpOiBSZW5hbWVkIGZyb20gYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSwKKyAgICAg
ICAgYW5kIHJlLW9yZGVyZWQgdG8gcHJlZmVyIHRoZSBzdGFuZGFyZCBzcGVsbGluZy4KKyAgICAg
ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnRpdGxlKToKKyAgICAgICAg
KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omhhc1RleHRBbHRlcm5hdGl2ZSk6
CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisK
IDIwMTEtMDktMDUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog
CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5NDUzNy4KZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNl
L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggNTk5OGJh
MjlhMDUxZGVhNmJmMDczMzE5ODRkZjYwNWEwYjc1OWM5MC4uMTkzMjI1YWU5MzBhYjQ1MzVlNDYx
OGE0ZWFlNDljZjdlNWQxZDkzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp
bGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp
bGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAgLTQ4Niw3ICs0ODYsNyBAQCBwdWJsaWM6CiAK
ICAgICB2b2lkIHNldFJvbGVWYWx1ZShBY2Nlc3NpYmlsaXR5Um9sZSByb2xlKSB7IG1fcm9sZSA9
IHJvbGU7IH0KICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0
IHsgcmV0dXJuIG1fcm9sZTsgfQotICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFMYWJlbGVkQnlBdHRy
aWJ1dGUoKSBjb25zdCB7IHJldHVybiBTdHJpbmcoKTsgfQorICAgIHZpcnR1YWwgU3RyaW5nIGFy
aWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2
aXJ0dWFsIFN0cmluZyBhcmlhRGVzY3JpYmVkQnlBdHRyaWJ1dGUoKSBjb25zdCB7IHJldHVybiBT
dHJpbmcoKTsgfQogICAgIHZpcnR1YWwgU3RyaW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigp
IGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2Vi
Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCmluZGV4IDg1
MzAzZjY0Yjg3NzExOTYyNGUxOWQ1NjE4Nzk5MWRkZGZkODBhNzAuLmFkYzhmMGFjNTI3YmY1ZDBl
NzVmOTczMDRjM2ViZGNlOTQxNjc1MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz
c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNv
cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcApAQCAtMTI0MSwx
OCArMTI0MSwxNyBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmVsZW1lbnRzRnJv
bUF0dHJpYnV0ZShWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cwogICAgIH0KIH0KICAgICAKLXZv
aWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsZWRCeUVsZW1lbnRzKFZlY3Rv
cjxFbGVtZW50Kj4mIGVsZW1lbnRzKSBjb25zdAordm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq
ZWN0OjphcmlhTGFiZWxsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzKSBj
b25zdAogewotICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50cywgYXJpYV9sYWJlbGVk
YnlBdHRyKTsKKyAgICBlbGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxs
ZWRieUF0dHIpOwogICAgIGlmICghZWxlbWVudHMuc2l6ZSgpKQotICAgICAgICBlbGVtZW50c0Zy
b21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxsZWRieUF0dHIpOworICAgICAgICBlbGVt
ZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxlZGJ5QXR0cik7CiB9CiAgICAK
LVN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxlZEJ5QXR0cmlidXRl
KCkgY29uc3QKK1N0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRC
eUF0dHJpYnV0ZSgpIGNvbnN0CiB7CiAgICAgVmVjdG9yPEVsZW1lbnQqPiBlbGVtZW50czsKLSAg
ICBhcmlhTGFiZWxlZEJ5RWxlbWVudHMoZWxlbWVudHMpOwotICAgIAorICAgIGFyaWFMYWJlbGxl
ZEJ5RWxlbWVudHMoZWxlbWVudHMpOwogICAgIHJldHVybiBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRp
b25Gb3JFbGVtZW50cyhlbGVtZW50cyk7CiB9CiAKQEAgLTEyOTksNyArMTI5OCw3IEBAIFN0cmlu
ZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZSgpIGNvbnN0CiAgICAgTm9kZSogbm9k
ZSA9IG1fcmVuZGVyZXItPm5vZGUoKTsKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBT
dHJpbmcoKTsKLSAgICAKKwogICAgIGNvbnN0IEF0b21pY1N0cmluZyYgdGl0bGUgPSBnZXRBdHRy
aWJ1dGUodGl0bGVBdHRyKTsKICAgICBpZiAoIXRpdGxlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0
dXJuIHRpdGxlOwpAQCAtMTM0Miw5ICsxMzQxLDkgQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlSZW5k
ZXJPYmplY3Q6OmFyaWFEZXNjcmliZWRCeUF0dHJpYnV0ZSgpIGNvbnN0CiAgICAgCiBTdHJpbmcg
QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigp
IGNvbnN0CiB7Ci0gICAgU3RyaW5nIGFyaWFMYWJlbGVkQnkgPSBhcmlhTGFiZWxlZEJ5QXR0cmli
dXRlKCk7Ci0gICAgaWYgKCFhcmlhTGFiZWxlZEJ5LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu
IGFyaWFMYWJlbGVkQnk7CisgICAgU3RyaW5nIGFyaWFMYWJlbGxlZEJ5ID0gYXJpYUxhYmVsbGVk
QnlBdHRyaWJ1dGUoKTsKKyAgICBpZiAoIWFyaWFMYWJlbGxlZEJ5LmlzRW1wdHkoKSkKKyAgICAg
ICAgcmV0dXJuIGFyaWFMYWJlbGxlZEJ5OwogCiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBhcmlh
TGFiZWwgPSBnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpOwogICAgIGlmICghYXJpYUxhYmVs
LmlzRW1wdHkoKSkKQEAgLTE1OTAsOSArMTU4OSw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdDo6bGlua2VkVUlFbGVtZW50cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGxp
CiAKIGJvb2wgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aGFzVGV4dEFsdGVybmF0aXZlKCkg
Y29uc3QKIHsKLSAgICAvLyBBUklBOiBzZWN0aW9uIDJBLCBidWxsZXQgIzMgc2F5cyBpZiBhcmlh
LWxhYmVsZWRieSBvciBhcmlhLWxhYmVsIGFwcGVhcnMsIGl0IHNob3VsZAorICAgIC8vIEFSSUE6
IHNlY3Rpb24gMkEsIGJ1bGxldCAjMyBzYXlzIGlmIGFyaWEtbGFiZWxsZWRieSBvciBhcmlhLWxh
YmVsIGFwcGVhcnMsIGl0IHNob3VsZAogICAgIC8vIG92ZXJyaWRlIHRoZSAibGFiZWwiIGVsZW1l
bnQgYXNzb2NpYXRpb24uCi0gICAgaWYgKCFhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkuaXNFbXB0
eSgpIHx8ICFnZXRBdHRyaWJ1dGUoYXJpYV9sYWJlbEF0dHIpLmlzRW1wdHkoKSkKKyAgICBpZiAo
IWFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCkuaXNFbXB0eSgpIHx8ICFnZXRBdHRyaWJ1dGUoYXJp
YV9sYWJlbEF0dHIpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIAog
ICAgIHJldHVybiBmYWxzZTsgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li
aWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz
aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKaW5kZXggOTdhZmRkMThlZDliNzZl
YWMzNmY4N2RlNjFmN2FhODUzNTk0MjgwOC4uOGE5NDJiNzk4M2ExN2NmZjAyZGU4NWNhZGJmODIz
YjI5YTQ4ZTEzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl
c3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0
eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKQEAgLTE4NCw3ICsxODQsNyBAQCBwdWJsaWM6
CiAgICAgdmlydHVhbCBQbGFpblRleHRSYW5nZSBzZWxlY3RlZFRleHRSYW5nZSgpIGNvbnN0Owog
ICAgIHZpcnR1YWwgVmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rpb24oKSBjb25zdDsKICAgICB2aXJ0
dWFsIFN0cmluZyBzdHJpbmdWYWx1ZSgpIGNvbnN0OwotICAgIHZpcnR1YWwgU3RyaW5nIGFyaWFM
YWJlbGVkQnlBdHRyaWJ1dGUoKSBjb25zdDsKKyAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxs
ZWRCeUF0dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIHRpdGxlKCkgY29uc3Q7
CiAgICAgdmlydHVhbCBTdHJpbmcgYXJpYURlc2NyaWJlZEJ5QXR0cmlidXRlKCkgY29uc3Q7CiAg
ICAgdmlydHVhbCBTdHJpbmcgYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKCkgY29uc3Q7CkBAIC0y
NjUsNyArMjY1LDcgQEAgcHJvdGVjdGVkOgogICAgIG11dGFibGUgYm9vbCBtX2NoaWxkcmVuRGly
dHk7CiAgICAgCiAgICAgdm9pZCBzZXRSZW5kZXJPYmplY3QoUmVuZGVyT2JqZWN0KiByZW5kZXJl
cikgeyBtX3JlbmRlcmVyID0gcmVuZGVyZXI7IH0KLSAgICB2b2lkIGFyaWFMYWJlbGVkQnlFbGVt
ZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3Q7CisgICAgdm9pZCBhcmlhTGFi
ZWxsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzKSBjb25zdDsKICAgICBi
b29sIG5lZWRzVG9VcGRhdGVDaGlsZHJlbigpIGNvbnN0IHsgcmV0dXJuIG1fY2hpbGRyZW5EaXJ0
eTsgfQogICAgIAogICAgIHZpcnR1YWwgYm9vbCBpc0RldGFjaGVkKCkgY29uc3QgeyByZXR1cm4g
IW1fcmVuZGVyZXI7IH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>113427</attachid>
            <date>2011-11-02 20:50:38 -0700</date>
            <delta_ts>2011-11-02 21:54:26 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20111103145035.patch</filename>
            <type>text/plain</type>
            <size>12780</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTkxMTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ZTdlYWQxMTVmNmM2Njg0
ZTIxYzIyMmFiZTAwNWFkYzVkN2Q5N2NiLi5lODY4NGE1ODdjMzczNTM1MjBlYmU2MDFmZGNiZGUz
NjIwYmM0MzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTAtMjQgIEFsaWNl
IEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2Vk
IGluIHByZWZlcmVuY2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJp
bGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKKworICAg
ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRCeUVs
ZW1lbnRzKTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlFbGVtZW50cy4KKyAgICAgICAgKFdl
YkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5QXR0cmlidXRl
KTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUsCisgICAgICAgIGFuZCByZS1v
cmRlcmVkIHRvIHByZWZlciB0aGUgc3RhbmRhcmQgc3BlbGxpbmcuCisgICAgICAgIChXZWJDb3Jl
OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpB
Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpoYXNUZXh0QWx0ZXJuYXRpdmUpOgorICAgICAgICAq
IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oOgorCiAyMDExLTExLTAy
ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTd2l0Y2ggUmVu
ZGVyVGV4dCB0byBuZXcgbGF5b3V0IHR5cGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h
Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz
c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCmluZGV4IGM5NDVjM2ZlY2IwMTNjZmNhZjYy
YTc2N2FkMDUyODdkMWNkMTc4NmQuLjMwYTRjNTVjOGM4ZDExYzA0ODI5YzUxMjhmMzdiOWQzMzhk
ZDgxMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp
bGl0eU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp
bGl0eU9iamVjdC5oCkBAIC00OTksNyArNDk5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRS
b2xlVmFsdWUoQWNjZXNzaWJpbGl0eVJvbGUgcm9sZSkgeyBtX3JvbGUgPSByb2xlOyB9CiAgICAg
dmlydHVhbCBBY2Nlc3NpYmlsaXR5Um9sZSByb2xlVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3Jv
bGU7IH0KLSAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkgY29uc3Qg
eyByZXR1cm4gU3RyaW5nKCk7IH0KKyAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxsZWRCeUF0
dHJpYnV0ZSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmlydHVhbCBTdHJpbmcg
YXJpYURlc2NyaWJlZEJ5QXR0cmlidXRlKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAg
ICB2aXJ0dWFsIFN0cmluZyBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdCB7IHJldHVy
biBTdHJpbmcoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5
L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp
bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBiNDAyZWFkNzZjYjkwMzNk
NzdiNmQzZDZiNmZkM2VlZDEwYmNjZjI1Li42YTBlMTY2NmEyYjY2YmIwN2NlYTA0MzI2OGYwYWVm
MTE3ZWY0NGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz
c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp
dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTEyNDcsMTggKzEyNDcsMTcgQEAg
dm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjplbGVtZW50c0Zyb21BdHRyaWJ1dGUoVmVj
dG9yPEVsZW1lbnQqPiYgZWxlbWVudHMKICAgICB9CiB9CiAgICAgCi12b2lkIEFjY2Vzc2liaWxp
dHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBl
bGVtZW50cykgY29uc3QKK3ZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVs
bGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3QKIHsKLSAgICBl
bGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxlZGJ5QXR0cik7CisgICAg
ZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsbGVkYnlBdHRyKTsKICAg
ICBpZiAoIWVsZW1lbnRzLnNpemUoKSkKLSAgICAgICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVs
ZW1lbnRzLCBhcmlhX2xhYmVsbGVkYnlBdHRyKTsKKyAgICAgICAgZWxlbWVudHNGcm9tQXR0cmli
dXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsZWRieUF0dHIpOwogfQogICAgCi1TdHJpbmcgQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0CitTdHJp
bmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUoKSBj
b25zdAogewogICAgIFZlY3RvcjxFbGVtZW50Kj4gZWxlbWVudHM7Ci0gICAgYXJpYUxhYmVsZWRC
eUVsZW1lbnRzKGVsZW1lbnRzKTsKLSAgICAKKyAgICBhcmlhTGFiZWxsZWRCeUVsZW1lbnRzKGVs
ZW1lbnRzKTsKICAgICByZXR1cm4gYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uRm9yRWxlbWVudHMo
ZWxlbWVudHMpOwogfQogCkBAIC0xMzA1LDcgKzEzMDQsNyBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdDo6dGl0bGUoKSBjb25zdAogICAgIE5vZGUqIG5vZGUgPSBtX3JlbmRlcmVy
LT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAg
CisKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHRpdGxlID0gZ2V0QXR0cmlidXRlKHRpdGxlQXR0
cik7CiAgICAgaWYgKCF0aXRsZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0aXRsZTsKQEAg
LTEzNTMsOSArMTM1Miw5IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojphcmlh
RGVzY3JpYmVkQnlBdHRyaWJ1dGUoKSBjb25zdAogICAgIAogU3RyaW5nIEFjY2Vzc2liaWxpdHlS
ZW5kZXJPYmplY3Q6OmFyaWFBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdAogewotICAg
IFN0cmluZyBhcmlhTGFiZWxlZEJ5ID0gYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpOwotICAgIGlm
ICghYXJpYUxhYmVsZWRCeS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBhcmlhTGFiZWxlZEJ5
OworICAgIFN0cmluZyBhcmlhTGFiZWxsZWRCeSA9IGFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCk7
CisgICAgaWYgKCFhcmlhTGFiZWxsZWRCeS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBhcmlh
TGFiZWxsZWRCeTsKIAogICAgIGNvbnN0IEF0b21pY1N0cmluZyYgYXJpYUxhYmVsID0gZ2V0QXR0
cmlidXRlKGFyaWFfbGFiZWxBdHRyKTsKICAgICBpZiAoIWFyaWFMYWJlbC5pc0VtcHR5KCkpCkBA
IC0xNTk0LDkgKzE1OTMsOSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omxpbmtl
ZFVJRWxlbWVudHMoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBsaQogCiBib29sIEFjY2Vz
c2liaWxpdHlSZW5kZXJPYmplY3Q6Omhhc1RleHRBbHRlcm5hdGl2ZSgpIGNvbnN0CiB7Ci0gICAg
Ly8gQVJJQTogc2VjdGlvbiAyQSwgYnVsbGV0ICMzIHNheXMgaWYgYXJpYS1sYWJlbGVkYnkgb3Ig
YXJpYS1sYWJlbCBhcHBlYXJzLCBpdCBzaG91bGQKKyAgICAvLyBBUklBOiBzZWN0aW9uIDJBLCBi
dWxsZXQgIzMgc2F5cyBpZiBhcmlhLWxhYmVsbGVkYnkgb3IgYXJpYS1sYWJlbCBhcHBlYXJzLCBp
dCBzaG91bGQKICAgICAvLyBvdmVycmlkZSB0aGUgImxhYmVsIiBlbGVtZW50IGFzc29jaWF0aW9u
LgotICAgIGlmICghYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAhZ2V0QXR0
cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5pc0VtcHR5KCkpCisgICAgaWYgKCFhcmlhTGFiZWxsZWRC
eUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAhZ2V0QXR0cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5p
c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAKICAgICByZXR1cm4gZmFs
c2U7ICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdC5oCmluZGV4IGY2ZTIwNTg4Mzc5Mzg1MDU3YTY2Y2M5NThhMGJj
NWIyZDEwYjJjMmYuLjE2OGFhMGIxNTRkYjhhNjk0MDJkYTQxMjgyM2U0ZWNmYWFmYWUwNzAgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdC5oCkBAIC0xODQsNyArMTg0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg
UGxhaW5UZXh0UmFuZ2Ugc2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdDsKICAgICB2aXJ0dWFsIFZp
c2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgc3Ry
aW5nVmFsdWUoKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmli
dXRlKCkgY29uc3Q7CisgICAgdmlydHVhbCBTdHJpbmcgYXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUo
KSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0OwogICAgIHZpcnR1YWwg
U3RyaW5nIGFyaWFEZXNjcmliZWRCeUF0dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3Ry
aW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigpIGNvbnN0OwpAQCAtMjY0LDcgKzI2NCw3IEBA
IHByb3RlY3RlZDoKICAgICBtdXRhYmxlIGJvb2wgbV9jaGlsZHJlbkRpcnR5OwogICAgIAogICAg
IHZvaWQgc2V0UmVuZGVyT2JqZWN0KFJlbmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJl
ciA9IHJlbmRlcmVyOyB9Ci0gICAgdm9pZCBhcmlhTGFiZWxlZEJ5RWxlbWVudHMoVmVjdG9yPEVs
ZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0OworICAgIHZvaWQgYXJpYUxhYmVsbGVkQnlFbGVtZW50
cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3Q7CiAgICAgYm9vbCBuZWVkc1RvVXBk
YXRlQ2hpbGRyZW4oKSBjb25zdCB7IHJldHVybiBtX2NoaWxkcmVuRGlydHk7IH0KICAgICAKICAg
ICB2aXJ0dWFsIGJvb2wgaXNEZXRhY2hlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3JlbmRlcmVyOyB9
CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5zbG4gYi9U
b29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5zbG4KaW5kZXggNjYyYzViYzllZTQ3
ZDYzYjA4MzE3MTU3Mzk3ZGY4ZmE3NTgzOWE3My4uNWQwNGUzM2NmOWY2YWFlZjQ4MzE4YWEwYWJi
ZWE1YzI4Y2E3MTRjZCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRl
clRyZWUuc2xuCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLnNsbgpA
QCAtMSwxNyArMSwxMSBAQAog77u/Ci1NaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyBTb2x1dGlvbiBG
aWxlLCBGb3JtYXQgVmVyc2lvbiA5LjAwCi0jIFZpc3VhbCBTdHVkaW8gMjAwNQotUHJvamVjdCgi
ezhCQzlDRUI4LThCNEEtMTFEMC04RDExLTAwQTBDOTFCQzk0Mn0iKSA9ICJEdW1wUmVuZGVyVHJl
ZSIsICJ3aW5cRHVtcFJlbmRlclRyZWUudmNwcm9qIiwgIns2NTY3REZENC1ENkRFLTRDRDUtODI1
RC0xN0UzNTNEMTYwRTF9IgotCVByb2plY3RTZWN0aW9uKFByb2plY3REZXBlbmRlbmNpZXMpID0g
cG9zdFByb2plY3QKLQkJe0MwNzM3Mzk4LTM1NjUtNDM5RS1BMkI4LUFCMkJFNEQ1NDMwQ30gPSB7
QzA3MzczOTgtMzU2NS00MzlFLUEyQjgtQUIyQkU0RDU0MzBDfQotCUVuZFByb2plY3RTZWN0aW9u
CitNaWNyb3NvZnQgVmlzdWFsIFN0dWRpbyBTb2x1dGlvbiBGaWxlLCBGb3JtYXQgVmVyc2lvbiAx
MS4wMAorIyBWaXN1YWwgU3R1ZGlvIDIwMTAKK1Byb2plY3QoIns4QkM5Q0VCOC04QjRBLTExRDAt
OEQxMS0wMEEwQzkxQkM5NDJ9IikgPSAiRHVtcFJlbmRlclRyZWUiLCAid2luXER1bXBSZW5kZXJU
cmVlLnZjeHByb2oiLCAiezY1NjdERkQ0LUQ2REUtNENENS04MjVELTE3RTM1M0QxNjBFMX0iCiBF
bmRQcm9qZWN0Ci1Qcm9qZWN0KCJ7OEJDOUNFQjgtOEI0QS0xMUQwLThEMTEtMDBBMEM5MUJDOTQy
fSIpID0gIlRlc3ROZXRzY2FwZVBsdWdpbiIsICJUZXN0TmV0c2NhcGVQbHVnaW5cd2luXFRlc3RO
ZXRzY2FwZVBsdWdpbi52Y3Byb2oiLCAie0MwNzM3Mzk4LTM1NjUtNDM5RS1BMkI4LUFCMkJFNEQ1
NDMwQ30iCi0JUHJvamVjdFNlY3Rpb24oUHJvamVjdERlcGVuZGVuY2llcykgPSBwb3N0UHJvamVj
dAotCQl7NTlDQzA1NDctNzBBQy00OTlDLTlCMTktRUMwMUM2RjYxMTM3fSA9IHs1OUNDMDU0Ny03
MEFDLTQ5OUMtOUIxOS1FQzAxQzZGNjExMzd9Ci0JRW5kUHJvamVjdFNlY3Rpb24KK1Byb2plY3Qo
Ins4QkM5Q0VCOC04QjRBLTExRDAtOEQxMS0wMEEwQzkxQkM5NDJ9IikgPSAiVGVzdE5ldHNjYXBl
UGx1Z2luIiwgIlRlc3ROZXRzY2FwZVBsdWdpblx3aW5cVGVzdE5ldHNjYXBlUGx1Z2luLnZjeHBy
b2oiLCAie0MwNzM3Mzk4LTM1NjUtNDM5RS1BMkI4LUFCMkJFNEQ1NDMwQ30iCiBFbmRQcm9qZWN0
Ci1Qcm9qZWN0KCJ7OEJDOUNFQjgtOEI0QS0xMUQwLThEMTEtMDBBMEM5MUJDOTQyfSIpID0gIklt
YWdlRGlmZiIsICJ3aW5cSW1hZ2VEaWZmLnZjcHJvaiIsICJ7NTlDQzA1NDctNzBBQy00OTlDLTlC
MTktRUMwMUM2RjYxMTM3fSIKK1Byb2plY3QoIns4QkM5Q0VCOC04QjRBLTExRDAtOEQxMS0wMEEw
QzkxQkM5NDJ9IikgPSAiSW1hZ2VEaWZmIiwgIndpblxJbWFnZURpZmYudmN4cHJvaiIsICJ7NTlD
QzA1NDctNzBBQy00OTlDLTlCMTktRUMwMUM2RjYxMTM3fSIKIEVuZFByb2plY3QKIEdsb2JhbAog
CUdsb2JhbFNlY3Rpb24oU29sdXRpb25Db25maWd1cmF0aW9uUGxhdGZvcm1zKSA9IHByZVNvbHV0
aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3BhcmFsbGVsY2wgYi9Ub29scy9TY3JpcHRz
L3BhcmFsbGVsY2wKaW5kZXggOGE0NjM2NWViMWI2ZTY0NzBjNjQ3NDY2ODNmYTA1OWU1MjM5M2Vk
ZS4uMjUwYmJlOWQyYjU3M2ExNzlhYjQ3M2JiYmI1NDQxMDU5NWY4ZjA2ZSAxMDA3NTUKLS0tIGEv
VG9vbHMvU2NyaXB0cy9wYXJhbGxlbGNsCisrKyBiL1Rvb2xzL1NjcmlwdHMvcGFyYWxsZWxjbApA
QCAtMTYsNyArMTYsNyBAQCBzdWIgY2xlYW51cChcQCk7CiAKIG15ICRkZWJ1ZyA9IDA7CiAKLWNo
b21wKG15ICRjbGV4ZSA9IGBjeWdwYXRoIC11ICckRU5WeydWUzgwQ09NTlRPT0xTJ30vLi4vLi4v
VkMvYmluL2NsLmV4ZSdgKTsKK2Nob21wKG15ICRjbGV4ZSA9IGBjeWdwYXRoIC11ICckRU5WeydW
UzEwMENPTU5UT09MUyd9Ly4uLy4uL1ZDL2Jpbi9jbC5leGUnYCk7CiAKIGlmICgkZGVidWcpIHsK
ICAgICBwcmludCBTVERFUlIgIlJlY2VpdmVkICIgLiBAQVJHViAuICIgYXJndW1lbnRzOlxuIjsK
ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcGRldmVudiBiL1Rvb2xzL1NjcmlwdHMvcGRldmVu
dgppbmRleCA0NjQzNzI4NTA2MDkzNWZlM2FjYWEwY2YxOTAzMGY5ZmFkNTQ5Yjk4Li40ZWM4Yjkw
NDBhYjE2ODBmOTAwM2I2OTlkNDhmYzBlZWU0MzJjNjQ3IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp
cHRzL3BkZXZlbnYKKysrIGIvVG9vbHMvU2NyaXB0cy9wZGV2ZW52CkBAIC0xOSw2ICsxOSw4IEBA
IGlmICgkRU5WeydWUzgwQ09NTlRPT0xTJ30pIHsKICAgICAkdnNUb29sc1ZhciA9ICJWUzgwQ09N
TlRPT0xTIjsKIH0gZWxzaWYgKCRFTlZ7J1ZTOTBDT01OVE9PTFMnfSkgewogICAgICR2c1Rvb2xz
VmFyID0gIlZTOTBDT01OVE9PTFMiOworfSBlbHNpZiAoJEVOVnsnVlMxMDBDT01OVE9PTFMnfSkg
eworICAgICR2c1Rvb2xzVmFyID0gIlZTMTAwQ09NTlRPT0xTIjsKIH0gZWxzZSB7CiAgICAgcHJp
bnQgIioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKipcbiI7CiAgICAgcHJpbnQgIkNhbm5vdCBmaW5kIFZpc3VhbCBTdHVkaW8gdG9vbHMg
ZGlyLlxuIjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz
L0NoYW5nZUxvZwppbmRleCBlNjFjMTllYzhlMzU0YmI3MTIzYTcyZWU2NGU1MDA1YWM2MjIzYjli
Li5hMTEyYWU5NGYxM2ExYjY4NThjM2I2N2I3N2E5YTE2NzIwYmRhZTJjIDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMTMgQEAKKzIwMTEtMTAtMjQgIEFsaWNlIEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5v
cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXJp
YS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2VkIGluIHByZWZlcmVuY2UgdG8gYXJpYS1sYWJlbGVk
YnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzUx
CisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJp
YS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5
L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnkuaHRtbDogQWRkZWQuCisK
IDIwMTEtMTEtMDIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBM
YW5kIGNocm9taXVtIGJhc2VsaW5lcyBmb3IgdGVzdHMgYWRkZWQgaW4gcjk0OTEyLgpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVz
LWFyaWEtbGFiZWxlZGJ5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv
YXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQKbmV3
IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMC4uZTM3NzUwODZlNTU2NGMwYWU5NDI1OWJlOWJiYzM1YzgwYmI2ZGVjNgotLS0gL2Rl
di9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92
ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMiBAQAorQWxw
aGEgQmV0YSBHYW1tYSBEZWx0YSBFcHNpbG9uCitUaGlzIHRlc3RzIHRoYXQgaWYgYXJpYS1sYWJl
bGxlZGJ5IGlzIHVzZWQsIHRoZW4gbm9uLXN0YW5kYXJkIGFyaWEtbGFiZWxlZGJ5IGF0dHJpYnV0
ZXMgYXJlIGlnbm9yZWQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi
UEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIG9i
ai5kZXNjcmlwdGlvbiBpcyAiQVhEZXNjcmlwdGlvbjogR2FtbWEiCitQQVNTIG9iai5kZXNjcmlw
dGlvbiBpcyAiQVhEZXNjcmlwdGlvbjogRXBzaWxvbiIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk
IGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nl
c3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnkuaHRtbCBi
L0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlh
LWxhYmVsZWRieS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQxYWE3NzBlNDRhOWFiMDg3NGNhZjZiNjdjN2Yw
YWZlOTQ2OTAyYzEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5
L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnkuaHRtbApAQCAtMCwwICsx
LDU0IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8
aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9mYXN0L2pzL3Jl
c291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0PgordmFyIHN1Y2Nlc3NmdWxseVBh
cnNlZCA9IGZhbHNlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJj
ZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9ImJvZHkiPgor
Cis8YnV0dG9uIGFyaWEtbGFiZWxsZWRieT0iZ2FtbWEiIGFyaWEtbGFiZWxlZGJ5PSJkZWx0YSI+
QWxwaGE8L2J1dHRvbj4KKzxidXR0b24gYXJpYS1sYWJlbGVkYnk9ImVwc2lsb24iPkJldGE8L2J1
dHRvbj4KKzxzcGFuIGlkPSJnYW1tYSI+R2FtbWE8L3NwYW4+Cis8c3BhbiBpZD0iZGVsdGEiPkRl
bHRhPC9zcGFuPgorPHNwYW4gaWQ9ImVwc2lsb24iPkVwc2lsb248L3NwYW4+CisKKzxwIGlkPSJk
ZXNjcmlwdGlvbiI+PC9wPgorPHVsIGlkPSJjb25zb2xlIj48L3VsPgorCis8c2NyaXB0PgorICAg
IGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRoYXQgaWYgYXJpYS1sYWJlbGxlZGJ5IGlzIHVzZWQs
IHRoZW4gbm9uLXN0YW5kYXJkIGFyaWEtbGFiZWxlZGJ5IGF0dHJpYnV0ZXMgYXJlIGlnbm9yZWQu
Iik7CisKKyAgICBmdW5jdGlvbiBsb2coc3RyKSB7CisgICAgICAgIHZhciBjb25zb2xlID0gZG9j
dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnNvbGUiKTsKKyAgICAgICAgdmFyIGxpID0gZG9jdW1l
bnQuY3JlYXRlRWxlbWVudCgibGkiKTsKKyAgICAgICAgbGkuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu
Y3JlYXRlVGV4dE5vZGUoc3RyKSk7CisgICAgICAgIGNvbnNvbGUuYXBwZW5kQ2hpbGQobGkpOwor
ICAgIH0KKworICAgIGZ1bmN0aW9uIGxvZ0FYT2JqZWN0KG9iaikgeworICAgICAgICAgIGxvZygi
Zm9yICIgKyBvYmouYWxsQXR0cmlidXRlcygpKTsKKyAgICAgICAgICBsb2coImNoaWxkcmVuOlxu
IiArIG9iai5hdHRyaWJ1dGVzT2ZDaGlsZHJlbigpKTsKKyAgICAgICAgICBsb2coIm9iai50aXRs
ZSBpcyAiICsgb2JqLnRpdGxlKTsKKyAgICAgICAgICBsb2coIm9iai5kZXNjcmlwdGlvbiBpcyAi
ICsgb2JqLmRlc2NyaXB0aW9uKTsKKyAgICB9CisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5
Q29udHJvbGxlcikgeworICAgICAgICAgIHZhciBib2R5ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5
SWQoImJvZHkiKTsKKyAgICAgICAgICBib2R5LmZvY3VzKCk7CisgICAgICAgICAgdmFyIGdyb3Vw
T2JqID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuY2hpbGRBdEluZGV4
KDApOworICAgICAgICAgIHZhciBvYmogPSBncm91cE9iai5jaGlsZEF0SW5kZXgoMCk7CisgICAg
ICAgICAgLy8gRGVzY3JpcHRpb24gZnJvbSBhcmlhLWxhYmVsbGVkYnkgZWxlbWVudCwgYXJpYS1s
YWJlbGVkYnkgaXMgaWdub3JlZAorICAgICAgICAgIHNob3VsZEJlKCJvYmouZGVzY3JpcHRpb24i
LCAnIkFYRGVzY3JpcHRpb246IEdhbW1hIicpOworICAgICAgICAgIHZhciBvYmogPSBncm91cE9i
ai5jaGlsZEF0SW5kZXgoMSk7CisgICAgICAgICAgLy8gYXJpYS1sYWJlbGVkYnkgaXMgdXNlZCBp
ZiBubyBhcmlhLWxhYmVsbGVkYnkgcHJlc2VudAorICAgICAgICAgIHNob3VsZEJlKCJvYmouZGVz
Y3JpcHRpb24iLCAnIkFYRGVzY3JpcHRpb246IEVwc2lsb24iJyk7CisgICAgfQorCisgICAgc3Vj
Y2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vZmFz
dC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt
bD4KZGlmZiAtLWdpdCBhLy5naXRpZ25vcmUgYi8uZ2l0aWdub3JlCmluZGV4IDljODY0OWE5MTdi
M2QzN2Y3ZmE0MmY3OTVmZTAyZmZjYWNlMWUxMjIuLmQ5NWRjMTYxODhiMzFkOTUzZDNiMjZkMGRl
MDIxOGQ0ZTBiNjFkODUgMTAwNjQ0Ci0tLSBhLy5naXRpZ25vcmUKKysrIGIvLmdpdGlnbm9yZQpA
QCAtMTU2LDMgKzE1Niw1IEBAIExheW91dFRlc3RzL2phdmEvKi5jbGFzcwogL1dlYktpdExpYnJh
cmllcy93aW4vbGliL2xpYnhzbHQubGliCiAvV2ViS2l0TGlicmFyaWVzL3dpbi9saWIvcHRocmVh
ZFZDMi5saWIKIC9XZWJLaXRMaWJyYXJpZXMvd2luL2xpYi96ZGxsLmxpYgorKlwudmN4cHJvaioN
CisqXC5wcm9wcw0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>113430</attachid>
            <date>2011-11-02 21:54:35 -0700</date>
            <delta_ts>2011-11-16 08:11:06 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-62351-20111103155433.patch</filename>
            <type>text/plain</type>
            <size>9571</size>
            <attacher name="Alice Boxhall">aboxhall</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTkxMTMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ZTdlYWQxMTVmNmM2Njg0
ZTIxYzIyMmFiZTAwNWFkYzVkN2Q5N2NiLi5lODY4NGE1ODdjMzczNTM1MjBlYmU2MDFmZGNiZGUz
NjIwYmM0MzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTAtMjQgIEFsaWNl
IEJveGhhbGwgIDxhYm94aGFsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg
Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYXJpYS1sYWJlbGxlZGJ5IHNob3VsZCBiZSB1c2Vk
IGluIHByZWZlcmVuY2UgdG8gYXJpYS1sYWJlbGVkYnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl
YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMzUxCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJp
bGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKKworICAg
ICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAg
ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphcmlhTGFiZWxsZWRCeUVs
ZW1lbnRzKTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlFbGVtZW50cy4KKyAgICAgICAgKFdl
YkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGxlZEJ5QXR0cmlidXRl
KTogUmVuYW1lZCBmcm9tIGFyaWFMYWJlbGVkQnlBdHRyaWJ1dGUsCisgICAgICAgIGFuZCByZS1v
cmRlcmVkIHRvIHByZWZlciB0aGUgc3RhbmRhcmQgc3BlbGxpbmcuCisgICAgICAgIChXZWJDb3Jl
OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp0aXRsZSk6CisgICAgICAgIChXZWJDb3JlOjpB
Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpoYXNUZXh0QWx0ZXJuYXRpdmUpOgorICAgICAgICAq
IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oOgorCiAyMDExLTExLTAy
ICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTd2l0Y2ggUmVu
ZGVyVGV4dCB0byBuZXcgbGF5b3V0IHR5cGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h
Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz
c2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCmluZGV4IGM5NDVjM2ZlY2IwMTNjZmNhZjYy
YTc2N2FkMDUyODdkMWNkMTc4NmQuLjMwYTRjNTVjOGM4ZDExYzA0ODI5YzUxMjhmMzdiOWQzMzhk
ZDgxMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp
bGl0eU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp
bGl0eU9iamVjdC5oCkBAIC00OTksNyArNDk5LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRS
b2xlVmFsdWUoQWNjZXNzaWJpbGl0eVJvbGUgcm9sZSkgeyBtX3JvbGUgPSByb2xlOyB9CiAgICAg
dmlydHVhbCBBY2Nlc3NpYmlsaXR5Um9sZSByb2xlVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3Jv
bGU7IH0KLSAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCkgY29uc3Qg
eyByZXR1cm4gU3RyaW5nKCk7IH0KKyAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxsZWRCeUF0
dHJpYnV0ZSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmlydHVhbCBTdHJpbmcg
YXJpYURlc2NyaWJlZEJ5QXR0cmlidXRlKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAg
ICB2aXJ0dWFsIFN0cmluZyBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdCB7IHJldHVy
biBTdHJpbmcoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5
L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp
bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRleCBiNDAyZWFkNzZjYjkwMzNk
NzdiNmQzZDZiNmZkM2VlZDEwYmNjZjI1Li42YTBlMTY2NmEyYjY2YmIwN2NlYTA0MzI2OGYwYWVm
MTE3ZWY0NGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz
c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp
dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKQEAgLTEyNDcsMTggKzEyNDcsMTcgQEAg
dm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjplbGVtZW50c0Zyb21BdHRyaWJ1dGUoVmVj
dG9yPEVsZW1lbnQqPiYgZWxlbWVudHMKICAgICB9CiB9CiAgICAgCi12b2lkIEFjY2Vzc2liaWxp
dHlSZW5kZXJPYmplY3Q6OmFyaWFMYWJlbGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBl
bGVtZW50cykgY29uc3QKK3ZvaWQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVs
bGVkQnlFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3QKIHsKLSAgICBl
bGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxlZGJ5QXR0cik7CisgICAg
ZWxlbWVudHNGcm9tQXR0cmlidXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsbGVkYnlBdHRyKTsKICAg
ICBpZiAoIWVsZW1lbnRzLnNpemUoKSkKLSAgICAgICAgZWxlbWVudHNGcm9tQXR0cmlidXRlKGVs
ZW1lbnRzLCBhcmlhX2xhYmVsbGVkYnlBdHRyKTsKKyAgICAgICAgZWxlbWVudHNGcm9tQXR0cmli
dXRlKGVsZW1lbnRzLCBhcmlhX2xhYmVsZWRieUF0dHIpOwogfQogICAgCi1TdHJpbmcgQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpIGNvbnN0CitTdHJp
bmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6YXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUoKSBj
b25zdAogewogICAgIFZlY3RvcjxFbGVtZW50Kj4gZWxlbWVudHM7Ci0gICAgYXJpYUxhYmVsZWRC
eUVsZW1lbnRzKGVsZW1lbnRzKTsKLSAgICAKKyAgICBhcmlhTGFiZWxsZWRCeUVsZW1lbnRzKGVs
ZW1lbnRzKTsKICAgICByZXR1cm4gYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uRm9yRWxlbWVudHMo
ZWxlbWVudHMpOwogfQogCkBAIC0xMzA1LDcgKzEzMDQsNyBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdDo6dGl0bGUoKSBjb25zdAogICAgIE5vZGUqIG5vZGUgPSBtX3JlbmRlcmVy
LT5ub2RlKCk7CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAg
CisKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHRpdGxlID0gZ2V0QXR0cmlidXRlKHRpdGxlQXR0
cik7CiAgICAgaWYgKCF0aXRsZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0aXRsZTsKQEAg
LTEzNTMsOSArMTM1Miw5IEBAIFN0cmluZyBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojphcmlh
RGVzY3JpYmVkQnlBdHRyaWJ1dGUoKSBjb25zdAogICAgIAogU3RyaW5nIEFjY2Vzc2liaWxpdHlS
ZW5kZXJPYmplY3Q6OmFyaWFBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb24oKSBjb25zdAogewotICAg
IFN0cmluZyBhcmlhTGFiZWxlZEJ5ID0gYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpOwotICAgIGlm
ICghYXJpYUxhYmVsZWRCeS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBhcmlhTGFiZWxlZEJ5
OworICAgIFN0cmluZyBhcmlhTGFiZWxsZWRCeSA9IGFyaWFMYWJlbGxlZEJ5QXR0cmlidXRlKCk7
CisgICAgaWYgKCFhcmlhTGFiZWxsZWRCeS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBhcmlh
TGFiZWxsZWRCeTsKIAogICAgIGNvbnN0IEF0b21pY1N0cmluZyYgYXJpYUxhYmVsID0gZ2V0QXR0
cmlidXRlKGFyaWFfbGFiZWxBdHRyKTsKICAgICBpZiAoIWFyaWFMYWJlbC5pc0VtcHR5KCkpCkBA
IC0xNTk0LDkgKzE1OTMsOSBAQCB2b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6Omxpbmtl
ZFVJRWxlbWVudHMoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBsaQogCiBib29sIEFjY2Vz
c2liaWxpdHlSZW5kZXJPYmplY3Q6Omhhc1RleHRBbHRlcm5hdGl2ZSgpIGNvbnN0CiB7Ci0gICAg
Ly8gQVJJQTogc2VjdGlvbiAyQSwgYnVsbGV0ICMzIHNheXMgaWYgYXJpYS1sYWJlbGVkYnkgb3Ig
YXJpYS1sYWJlbCBhcHBlYXJzLCBpdCBzaG91bGQKKyAgICAvLyBBUklBOiBzZWN0aW9uIDJBLCBi
dWxsZXQgIzMgc2F5cyBpZiBhcmlhLWxhYmVsbGVkYnkgb3IgYXJpYS1sYWJlbCBhcHBlYXJzLCBp
dCBzaG91bGQKICAgICAvLyBvdmVycmlkZSB0aGUgImxhYmVsIiBlbGVtZW50IGFzc29jaWF0aW9u
LgotICAgIGlmICghYXJpYUxhYmVsZWRCeUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAhZ2V0QXR0
cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5pc0VtcHR5KCkpCisgICAgaWYgKCFhcmlhTGFiZWxsZWRC
eUF0dHJpYnV0ZSgpLmlzRW1wdHkoKSB8fCAhZ2V0QXR0cmlidXRlKGFyaWFfbGFiZWxBdHRyKS5p
c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAKICAgICByZXR1cm4gZmFs
c2U7ICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li
aWxpdHlSZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz
aWJpbGl0eVJlbmRlck9iamVjdC5oCmluZGV4IGY2ZTIwNTg4Mzc5Mzg1MDU3YTY2Y2M5NThhMGJj
NWIyZDEwYjJjMmYuLjE2OGFhMGIxNTRkYjhhNjk0MDJkYTQxMjgyM2U0ZWNmYWFmYWUwNzAgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl
ck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0
eVJlbmRlck9iamVjdC5oCkBAIC0xODQsNyArMTg0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwg
UGxhaW5UZXh0UmFuZ2Ugc2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdDsKICAgICB2aXJ0dWFsIFZp
c2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKCkgY29uc3Q7CiAgICAgdmlydHVhbCBTdHJpbmcgc3Ry
aW5nVmFsdWUoKSBjb25zdDsKLSAgICB2aXJ0dWFsIFN0cmluZyBhcmlhTGFiZWxlZEJ5QXR0cmli
dXRlKCkgY29uc3Q7CisgICAgdmlydHVhbCBTdHJpbmcgYXJpYUxhYmVsbGVkQnlBdHRyaWJ1dGUo
KSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyB0aXRsZSgpIGNvbnN0OwogICAgIHZpcnR1YWwg
U3RyaW5nIGFyaWFEZXNjcmliZWRCeUF0dHJpYnV0ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgU3Ry
aW5nIGFjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbigpIGNvbnN0OwpAQCAtMjY0LDcgKzI2NCw3IEBA
IHByb3RlY3RlZDoKICAgICBtdXRhYmxlIGJvb2wgbV9jaGlsZHJlbkRpcnR5OwogICAgIAogICAg
IHZvaWQgc2V0UmVuZGVyT2JqZWN0KFJlbmRlck9iamVjdCogcmVuZGVyZXIpIHsgbV9yZW5kZXJl
ciA9IHJlbmRlcmVyOyB9Ci0gICAgdm9pZCBhcmlhTGFiZWxlZEJ5RWxlbWVudHMoVmVjdG9yPEVs
ZW1lbnQqPiYgZWxlbWVudHMpIGNvbnN0OworICAgIHZvaWQgYXJpYUxhYmVsbGVkQnlFbGVtZW50
cyhWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cykgY29uc3Q7CiAgICAgYm9vbCBuZWVkc1RvVXBk
YXRlQ2hpbGRyZW4oKSBjb25zdCB7IHJldHVybiBtX2NoaWxkcmVuRGlydHk7IH0KICAgICAKICAg
ICB2aXJ0dWFsIGJvb2wgaXNEZXRhY2hlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3JlbmRlcmVyOyB9
CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKaW5kZXggZTYxYzE5ZWM4ZTM1NGJiNzEyM2E3MmVlNjRlNTAwNWFjNjIyM2I5Yi4uYTExMmFl
OTRmMTNhMWI2ODU4YzNiNjdiNzdhOWExNjcyMGJkYWUyYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA
CisyMDExLTEwLTI0ICBBbGljZSBCb3hoYWxsICA8YWJveGhhbGxAY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGFyaWEtbGFiZWxs
ZWRieSBzaG91bGQgYmUgdXNlZCBpbiBwcmVmZXJlbmNlIHRvIGFyaWEtbGFiZWxlZGJ5CisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjM1MQorCisgICAg
ICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxl
ZGJ5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLWxh
YmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWw6IEFkZGVkLgorCiAyMDExLTEx
LTAyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTGFuZCBjaHJv
bWl1bSBiYXNlbGluZXMgZm9yIHRlc3RzIGFkZGVkIGluIHI5NDkxMi4KZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxh
YmVsZWRieS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFi
ZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v
ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu
LmUzNzc1MDg2ZTU1NjRjMGFlOTQyNTliZTliYmMzNWM4MGJiNmRlYzYKLS0tIC9kZXYvbnVsbAor
KysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMt
YXJpYS1sYWJlbGVkYnktZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTIgQEAKK0FscGhhIEJldGEg
R2FtbWEgRGVsdGEgRXBzaWxvbgorVGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBp
cyB1c2VkLCB0aGVuIG5vbi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBp
Z25vcmVkLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l
c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBvYmouZGVzY3Jp
cHRpb24gaXMgIkFYRGVzY3JpcHRpb246IEdhbW1hIgorUEFTUyBvYmouZGVzY3JpcHRpb24gaXMg
IkFYRGVzY3JpcHRpb246IEVwc2lsb24iCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVl
CisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0
eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwgYi9MYXlvdXRU
ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwLi40MWFhNzcwZTQ0YTlhYjA4NzRjYWY2YjY3YzdmMGFmZTk0Njkw
MmMxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLWxh
YmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKQEAgLTAsMCArMSw1NCBAQAor
PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8
aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNvdXJjZXMv
anMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBm
YWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRl
c3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKworPGJ1dHRv
biBhcmlhLWxhYmVsbGVkYnk9ImdhbW1hIiBhcmlhLWxhYmVsZWRieT0iZGVsdGEiPkFscGhhPC9i
dXR0b24+Cis8YnV0dG9uIGFyaWEtbGFiZWxlZGJ5PSJlcHNpbG9uIj5CZXRhPC9idXR0b24+Cis8
c3BhbiBpZD0iZ2FtbWEiPkdhbW1hPC9zcGFuPgorPHNwYW4gaWQ9ImRlbHRhIj5EZWx0YTwvc3Bh
bj4KKzxzcGFuIGlkPSJlcHNpbG9uIj5FcHNpbG9uPC9zcGFuPgorCis8cCBpZD0iZGVzY3JpcHRp
b24iPjwvcD4KKzx1bCBpZD0iY29uc29sZSI+PC91bD4KKworPHNjcmlwdD4KKyAgICBkZXNjcmlw
dGlvbigiVGhpcyB0ZXN0cyB0aGF0IGlmIGFyaWEtbGFiZWxsZWRieSBpcyB1c2VkLCB0aGVuIG5v
bi1zdGFuZGFyZCBhcmlhLWxhYmVsZWRieSBhdHRyaWJ1dGVzIGFyZSBpZ25vcmVkLiIpOworCisg
ICAgZnVuY3Rpb24gbG9nKHN0cikgeworICAgICAgICB2YXIgY29uc29sZSA9IGRvY3VtZW50Lmdl
dEVsZW1lbnRCeUlkKCJjb25zb2xlIik7CisgICAgICAgIHZhciBsaSA9IGRvY3VtZW50LmNyZWF0
ZUVsZW1lbnQoImxpIik7CisgICAgICAgIGxpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRl
eHROb2RlKHN0cikpOworICAgICAgICBjb25zb2xlLmFwcGVuZENoaWxkKGxpKTsKKyAgICB9CisK
KyAgICBmdW5jdGlvbiBsb2dBWE9iamVjdChvYmopIHsKKyAgICAgICAgICBsb2coImZvciAiICsg
b2JqLmFsbEF0dHJpYnV0ZXMoKSk7CisgICAgICAgICAgbG9nKCJjaGlsZHJlbjpcbiIgKyBvYmou
YXR0cmlidXRlc09mQ2hpbGRyZW4oKSk7CisgICAgICAgICAgbG9nKCJvYmoudGl0bGUgaXMgIiAr
IG9iai50aXRsZSk7CisgICAgICAgICAgbG9nKCJvYmouZGVzY3JpcHRpb24gaXMgIiArIG9iai5k
ZXNjcmlwdGlvbik7CisgICAgfQorICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xs
ZXIpIHsKKyAgICAgICAgICB2YXIgYm9keSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJib2R5
Iik7CisgICAgICAgICAgYm9keS5mb2N1cygpOworICAgICAgICAgIHZhciBncm91cE9iaiA9IGFj
Y2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50LmNoaWxkQXRJbmRleCgwKTsKKyAg
ICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRBdEluZGV4KDApOworICAgICAgICAgIC8v
IERlc2NyaXB0aW9uIGZyb20gYXJpYS1sYWJlbGxlZGJ5IGVsZW1lbnQsIGFyaWEtbGFiZWxlZGJ5
IGlzIGlnbm9yZWQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLmRlc2NyaXB0aW9uIiwgJyJBWERl
c2NyaXB0aW9uOiBHYW1tYSInKTsKKyAgICAgICAgICB2YXIgb2JqID0gZ3JvdXBPYmouY2hpbGRB
dEluZGV4KDEpOworICAgICAgICAgIC8vIGFyaWEtbGFiZWxlZGJ5IGlzIHVzZWQgaWYgbm8gYXJp
YS1sYWJlbGxlZGJ5IHByZXNlbnQKKyAgICAgICAgICBzaG91bGRCZSgib2JqLmRlc2NyaXB0aW9u
IiwgJyJBWERlc2NyaXB0aW9uOiBFcHNpbG9uIicpOworICAgIH0KKworICAgIHN1Y2Nlc3NmdWxs
eVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKworPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVz
b3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==
</data>
<flag name="review"
          id="111795"
          type_id="1"
          status="-"
          setter="cfleizach"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>217249</attachid>
            <date>2013-11-18 16:32:58 -0800</date>
            <delta_ts>2013-11-18 22:07:56 -0800</delta_ts>
            <desc>Patch.</desc>
            <filename>aria-labelledby.patch</filename>
            <type>text/plain</type>
            <size>4271</size>
            <attacher name="Samuel White">samuel_white</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5v
ZGVPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5
Tm9kZU9iamVjdC5jcHAKaW5kZXggOGY0ZjAyZS4uNTA3ZTJkMiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAK
QEAgLTE5MDAsOSArMTkwMCw5IEBAIHZvaWQgQWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmVsZW1l
bnRzRnJvbUF0dHJpYnV0ZShWZWN0b3I8RWxlbWVudCo+JiBlbGVtZW50cywKIAogdm9pZCBBY2Nl
c3NpYmlsaXR5Tm9kZU9iamVjdDo6YXJpYUxhYmVsZWRCeUVsZW1lbnRzKFZlY3RvcjxFbGVtZW50
Kj4mIGVsZW1lbnRzKSBjb25zdAogewotICAgIGVsZW1lbnRzRnJvbUF0dHJpYnV0ZShlbGVtZW50
cywgYXJpYV9sYWJlbGVkYnlBdHRyKTsKKyAgICBlbGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVu
dHMsIGFyaWFfbGFiZWxsZWRieUF0dHIpOwogICAgIGlmICghZWxlbWVudHMuc2l6ZSgpKQotICAg
ICAgICBlbGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxsZWRieUF0dHIp
OworICAgICAgICBlbGVtZW50c0Zyb21BdHRyaWJ1dGUoZWxlbWVudHMsIGFyaWFfbGFiZWxlZGJ5
QXR0cik7CiB9CiAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlh
LWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5LWV4cGVjdGVkLnR4dCBiL0xheW91
dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVs
ZWRieS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjNj
OTRjYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1s
YWJlbGxlZGJ5LW92ZXJyaWRlcy1hcmlhLWxhYmVsZWRieS1leHBlY3RlZC50eHQKQEAgLTAsMCAr
MSwxMCBAQAorVGhpcyB0ZXN0cyB0aGF0IGFyaWEtbGFiZWxsZWRieSBvdmVycmlkZXMgYXJpYS1s
YWJlbGVkYnkgY29ycmVjdGx5LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMg
b2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFT
UyBsaW5rRGVzY3JpcHRpb24gaXMgJ0FYRGVzY3JpcHRpb246IFkgWicKK1BBU1Mgc3VjY2Vzc2Z1
bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVk
YnkuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbGxlZGJ5LW92ZXJy
aWRlcy1hcmlhLWxhYmVsZWRieS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAuLmFkNDdiNzMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5
L2FyaWEtbGFiZWxsZWRieS1vdmVycmlkZXMtYXJpYS1sYWJlbGVkYnkuaHRtbApAQCAtMCwwICsx
LDM3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4v
cmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzx0aXRsZT5hcmlhLWxhYmVsbGVk
YnkgT3ZlcnJpZGVzIGFyaWEtbGFiZWxlZGJ5PC90aXRsZT4KKzwvaGVhZD4KKzxib2R5PgorCis8
ZGl2IGlkPSJ0ZXN0Ij4KKzxhIGFyaWEtbGFiZWxlZGJ5PSJ4MSB4MiIgYXJpYS1sYWJlbGxlZGJ5
PSJ5MSB5MiIgaHJlZj0iIyIgaWQ9ImxpbmsiPlg8L2E+Cis8IS0tIEluY29ycmVjdGx5IHNwZWxs
ZWQgYXJpYS1sYWJlbGxlZGJ5IGF0dHJpYnV0ZSBsYWJlbHMuIC0tPgorPHNwYW4gaWQ9IngxIj5J
PC9zcGFuPgorPHNwYW4gaWQ9IngyIj5KPC9zcGFuPgorPCEtLSBDb3JyZWN0bHkgc3BlbGxlZCBh
cmlhLWxhYmVsbGVkYnkgYXR0cmlidXRlIGxhYmVscy4gLS0+Cis8c3BhbiBpZD0ieTEiPlk8L3Nw
YW4+Cis8c3BhbiBpZD0ieTIiPlo8L3NwYW4+Cis8L2Rpdj4KKworPHAgaWQ9ImRlc2NyaXB0aW9u
Ij48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKworPHNjcmlwdD4KKyAgICBkZXNjcmlw
dGlvbigiVGhpcyB0ZXN0cyB0aGF0IGFyaWEtbGFiZWxsZWRieSBvdmVycmlkZXMgYXJpYS1sYWJl
bGVkYnkgY29ycmVjdGx5LiIpOworICAgIAorICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNv
bnRyb2xsZXIpIHsKKyAgICAgICAgdmFyIGxpbmtEZXNjcmlwdGlvbiA9IGFjY2Vzc2liaWxpdHlD
b250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgibGluayIpLmRlc2NyaXB0aW9uOworICAg
ICAgICAKKyAgICAgICAgc2hvdWxkQmUoImxpbmtEZXNjcmlwdGlvbiIsICInQVhEZXNjcmlwdGlv
bjogWSBaJyIpOworICAgICAgICAKKyAgICAgICAgLy8gSGlkZSBzdXBlcmZsdW91cyB0ZXh0Lgor
ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdCIpLnN0eWxlLmRpc3BsYXkgPSAi
bm9uZSI7CisgICAgfQorPC9zY3JpcHQ+CisKKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMt
dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xh
eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZjNmZDNh
Li5jMGMxMWIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTEtMTggIFNhbXVlbCBXaGl0
ZSAgPHNhbXVlbF93aGl0ZUBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtbGFiZWxsZWRi
eSBzaG91bGQgYmUgdXNlZCBpbiBwcmVmZXJlbmNlIHRvIGFyaWEtbGFiZWxlZGJ5CisgICAgICAg
IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjM1MQorCisgICAgICAg
IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHRlc3QgdG8gbWFr
ZSBzdXJlIGFyaWEtbGFiZWxsZWRieSBvdmVycmlkZXMgYXJpYS1sYWJlbGVkYnkgY29ycmVjdGx5
LgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFy
aWEtbGFiZWxlZGJ5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0
eS9hcmlhLWxhYmVsbGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWw6IEFkZGVkLgor
CiAyMDEzLTExLTE4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAg
ICAgICBVbnJldmlld2VkIEdUSyBnYXJkZW5pbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU2NmQ1MS4uNmI0
NjI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTExLTE4ICBTYW11ZWwgV2hp
dGUgIDxzYW11ZWxfd2hpdGVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBhcmlhLWxhYmVsbGVk
Ynkgc2hvdWxkIGJlIHVzZWQgaW4gcHJlZmVyZW5jZSB0byBhcmlhLWxhYmVsZWRieQorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIzNTEKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtpbmcgc3VyZSBhcmlh
LWxhYmVsbGVkIGJ5IG92ZXJyaWRlcyB0aGUgaW5jb3JyZWN0bHkgc3BlbGxlZCBhcmlhLWxhYmVs
ZWRieSBhdHRyaWJ1dGUuCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVs
bGVkYnktb3ZlcnJpZGVzLWFyaWEtbGFiZWxlZGJ5Lmh0bWwKKworICAgICAgICAqIGFjY2Vzc2li
aWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj
ZXNzaWJpbGl0eU5vZGVPYmplY3Q6OmFyaWFMYWJlbGVkQnlFbGVtZW50cyk6CisKIDIwMTMtMTEt
MTggIHBlYXZvQG91dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dp
bl0gV2ViS2l0IHZlcnNpb24gaW4gdXNlciBhZ2VudCBzdHJpbmcgaXMgaW5jb3JyZWN0Lgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>