<?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>58014</bug_id>
          
          <creation_ts>2011-04-06 23:32:06 -0700</creation_ts>
          <short_desc>Implement CSP&apos;s options directive</short_desc>
          <delta_ts>2011-04-07 15:38:40 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Other</rep_platform>
          <op_sys>OS X 10.5</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>53572</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Adam Barth">abarth</reporter>
          <assigned_to name="Adam Barth">abarth</assigned_to>
          <cc>abarth</cc>
    
    <cc>commit-queue</cc>
    
    <cc>eric</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>381142</commentid>
    <comment_count>0</comment_count>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-04-06 23:32:06 -0700</bug_when>
    <thetext>Implement CSP&apos;s options directive</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381143</commentid>
    <comment_count>1</comment_count>
      <attachid>88578</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-04-06 23:34:07 -0700</bug_when>
    <thetext>Created attachment 88578
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381203</commentid>
    <comment_count>2</comment_count>
      <attachid>88578</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2011-04-07 02:53:31 -0700</bug_when>
    <thetext>Comment on attachment 88578
Patch

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

&gt; Source/WebCore/page/ContentSecurityPolicy.cpp:454
&gt; +        skipWhile&lt;isOptionValueCharacter&gt;(position, end);
&gt; +
&gt; +        String optionsValue(optionsValueBegin, position - optionsValueBegin);

I would almost put a comment here noting that position may be == end, but that we don&apos;t care.

&gt; Source/WebCore/page/ContentSecurityPolicy.cpp:484
&gt; +    return !m_scriptSrc || (m_options &amp;&amp; m_options-&gt;disableXSSProtection());

Perhaps this m_options || m_options-&gt;disableXSSProtection check should be rolled into a single dispableXSSProtection() method then you don&apos;t need to repeat yourself.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381213</commentid>
    <comment_count>3</comment_count>
      <attachid>88601</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-04-07 03:14:51 -0700</bug_when>
    <thetext>Created attachment 88601
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381225</commentid>
    <comment_count>4</comment_count>
      <attachid>88601</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-07 03:54:10 -0700</bug_when>
    <thetext>Comment on attachment 88601
Patch for landing

Rejecting attachment 88601 from commit-queue.

Failed to run &quot;[&apos;./Tools/Scripts/webkit-patch&apos;, &apos;--status-host=queues.webkit.org&apos;, &apos;--bot-id=cr-jail-7&apos;, &apos;build&apos;...&quot; exit_code: 2

Last 500 characters of output:
0
    setenv YACC /Developer/usr/bin/yacc
    /bin/sh -c /mnt/git/webkit-commit-queue/WebKitBuild/WebCore.build/Debug/WebCore.build/Script-5DF50887116F3077005202AB.sh

** BUILD FAILED **


The following build commands failed:
WebCore:
	CompileC /mnt/git/webkit-commit-queue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/x86_64/ContentSecurityPolicy.o /mnt/git/webkit-commit-queue/Source/WebCore/page/ContentSecurityPolicy.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2
(1 failure)


Full output: http://queues.webkit.org/results/8347540</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381487</commentid>
    <comment_count>5</comment_count>
      <attachid>88662</attachid>
    <who name="Adam Barth">abarth</who>
    <bug_when>2011-04-07 10:53:16 -0700</bug_when>
    <thetext>Created attachment 88662
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381665</commentid>
    <comment_count>6</comment_count>
      <attachid>88662</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-07 13:51:42 -0700</bug_when>
    <thetext>Comment on attachment 88662
Patch for landing

Clearing flags on attachment: 88662

Committed r83205: &lt;http://trac.webkit.org/changeset/83205&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381666</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-04-07 13:51:45 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>381791</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-04-07 15:38:40 -0700</bug_when>
    <thetext>http://trac.webkit.org/changeset/83205 might have broken GTK Linux 32-bit Release and GTK Linux 64-bit Debug
The following tests are not passing:
media/context-menu-actions.html
media/media-fullscreen-inline.html
media/media-fullscreen-not-in-document.html</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88578</attachid>
            <date>2011-04-06 23:34:07 -0700</date>
            <delta_ts>2011-04-07 03:14:45 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-58014-20110406233405.patch</filename>
            <type>text/plain</type>
            <size>9294</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODMxNDEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3NTI0ZjI0OWU1OTJiNTc3N2VhZmMy
YWM5YzAwYWY2NmE0NjNmODZlLi4wYTczOWY0YTBkNGRmN2Q0MDNiOTkwMTliM2Y0NzA3YmNkYTg3
MzY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0yLDYgKzIsMTggQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KIAorICAgICAgICBJbXBsZW1lbnQgQ1NQJ3Mgb3B0aW9ucyBkaXJlY3RpdmUKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MDE0CisKKyAg
ICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUt
c2NyaXB0LWFsbG93ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz
L3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUtc2NyaXB0LWFsbG93ZWQuaHRt
bDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ
b2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisg
ICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5l
LXNjcmlwdC1ibG9ja2VkLWdvb2Z5Lmh0bWw6IEFkZGVkLgorCisyMDExLTA0LTA2ICBBZGFtIEJh
cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKICAgICAgICAgc2NyaXB0LXNyYyBzaG91bGQgYmxvY2sgaW5saW5lIHNjcmlwdAog
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgwMTIKIApk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJp
dHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YWxsb3dlZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjc2MDk5Y2ZmNjUzZWUwYmUzZWMxMTI4
ZjdlZTlhZWFkNjljMzY1YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVz
dHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYWxsb3dlZC1l
eHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACitBTEVSVDogUEFTUyAxIG9mIDMKK0FMRVJUOiBQ
QVNTIDIgb2YgMworQUxFUlQ6IFBBU1MgMyBvZiAzCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YWxsb3dlZC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj
dXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2
NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjA3NDMx
ZTI2NTNmMzdkZmQxY2M2ZTIzN2E2MTM1MWJkM2Y1Mzk4OAotLS0gL2Rldi9udWxsCisrKyBiL0xh
eW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGlu
ZS1zY3JpcHQtYWxsb3dlZC5odG1sCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBodG1sPgor
PGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0i
c2NyaXB0LXNyYyBodHRwOi8vMTI3LjAuMC4xOio7IG9wdGlvbnMgZGlzYWJsZS14c3MtcHJvdGVj
dGlvbiI+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2R1bXAtYXMtdGV4dC5qcyI+PC9zY3JpcHQ+
Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9ImFsZXJ0KCdQQVNTIDMgb2YgMycpIj4KKzxzY3JpcHQ+
CithbGVydCgnUEFTUyAxIG9mIDMnKTsKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9ImphdmFzY3Jp
cHQ6YWxlcnQoJ1BBU1MgMiBvZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ
b2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl
c3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3Jp
cHQtYmxvY2tlZC1nb29meS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDA0YTNmYjI5ODRhNTRm
YTk2ODBjYTMxZGU4MWRiZmJkZjI4YTA1NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YmxvY2tlZC1nb29meS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorVGhpcyB0ZXN0IHBhc3Nl
cyBpZiBpdCBkb2Vzbid0IGFsZXJ0IGZhaWwuICAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0
dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxv
Y2tlZC1nb29meS5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50
U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5Lmh0bWwKbmV3IGZpbGUg
bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MC4uYTY3ZDU2ZmUyMTliMWE2YTRmZmNlMmRhYTJmMThkMjgyM2YwYmY1ZAotLS0gL2Rldi9udWxs
CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s
aWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS5odG1sCkBAIC0wLDAgKzEsMTQgQEAKKzwh
RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0
LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyBodHRwOi8vMTI3LjAuMC4xOio7IG9wdGlvbnMgZ29v
ZnkiPgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9kdW1wLWFzLXRleHQuanMiPjwvc2NyaXB0Pgor
PC9oZWFkPgorPGJvZHkgb25sb2FkPSJhbGVydCgnRkFJTCAzIG9mIDMnKSI+CitUaGlzIHRlc3Qg
cGFzc2VzIGlmIGl0IGRvZXNuJ3QgYWxlcnQgZmFpbC4KKzxzY3JpcHQ+CithbGVydCgnRkFJTCAx
IG9mIDMnKTsKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9ImphdmFzY3JpcHQ6YWxlcnQoJ0ZBSUwg
MiBvZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDVlNmVh
ZDkyMzk5ZDdkMWU5ZTY1ZGYwM2QwMDQ5YzlkMGU1N2M1NmMuLjY3ZGM3MzUyNTU0MGM0ZWMxNDI1
MDIzYWE4MTMxMmMyMGZlZTNmMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzMSBAQAogCiAgICAg
ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIEltcGxlbWVudCBDU1An
cyBvcHRpb25zIGRpcmVjdGl2ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9NTgwMTQKKworICAgICAgICBUaGlzIHBhdGNoIGNvbnRhaW5zIHRoZSBmdWxs
IG9wdGlvbnMgcGFyc2VyLCBidXQgd2Ugb25seSBoYXZlIGVub3VnaCBvZgorICAgICAgICBDU1Ag
aW1wbGVtZW50ZWQgdG8gc2VlIHRoZSBlZmZlY3RzIG9mIGRpc2FibGUteHNzLXByb3RlY3Rpb24u
ICBXaWxsCisgICAgICAgIG5lZWQgdG8gZG8gc29tZSBtb3JlIHdvcmsgYmVmb3JlIHdlIGNhbiBz
ZWUgZXZhbC1zY3JpcHQgaW4gYWN0aW9uLgorCisgICAgICAgIFRlc3RzOiBodHRwL3Rlc3RzL3Nl
Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUtc2NyaXB0LWFsbG93ZWQuaHRtbAor
ICAgICAgICAgICAgICAgaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv
aW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5Lmh0bWwKKworICAgICAgICAqIHBhZ2UvQ29udGVu
dFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTUE9wdGlvbnM6OkNTUE9w
dGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NQT3B0aW9uczo6ZGlzYWJsZVhTU1Byb3RlY3Rp
b24pOgorICAgICAgICAoV2ViQ29yZTo6Q1NQT3B0aW9uczo6ZXZhbFNjcmlwdCk6CisgICAgICAg
IChXZWJDb3JlOjpDU1BPcHRpb25zOjpwYXJzZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50
U2VjdXJpdHlQb2xpY3k6OmFsbG93SmF2YVNjcmlwdFVSTHMpOgorICAgICAgICAoV2ViQ29yZTo6
Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZUV2ZW50SGFuZGxlcnMpOgorICAgICAg
ICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZVNjcmlwdCk6Cisg
ICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFkZERpcmVjdGl2ZSk6Cisg
ICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaDoKKworMjAxMS0wNC0wNiAgQWRh
bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCiAgICAgICAgIHNjcmlwdC1zcmMgc2hvdWxkIGJsb2NrIGlubGluZSBzY3Jp
cHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MDEy
CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5
LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAppbmRl
eCBiODk4OWFmYTM2ZmIxNWE5OWQ1MTFkMThhNGEzMGZhMjE3MDk5NTA3Li4zNWZhZGFhZDAyMzE5
ODMwZTY2YTQ2MDA0OGIwOWViZTRhZDZlZmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w
YWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9D
b250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC01Nyw2ICs1NywxMSBAQCBib29sIGlzSG9zdENo
YXJhY3RlcihVQ2hhciBjKQogICAgIHJldHVybiBpc0FTQ0lJQWxwaGFudW1lcmljKGMpIHx8IGMg
PT0gJy0nOwogfQogCitib29sIGlzT3B0aW9uVmFsdWVDaGFyYWN0ZXIoVUNoYXIgYykKK3sKKyAg
ICByZXR1cm4gaXNBU0NJSUFscGhhbnVtZXJpYyhjKSB8fCBjID09ICctJzsKK30KKwogYm9vbCBp
c1NjaGVtZUNvbnRpbnVhdGlvbkNoYXJhY3RlcihVQ2hhciBjKQogewogICAgIHJldHVybiBpc0FT
Q0lJQWxwaGFudW1lcmljKGMpIHx8IGMgPT0gJysnIHx8IGMgPT0gJy0nIHx8IGMgPT0gJy4nOwpA
QCAtNDA2LDYgKzQxMSw1NSBAQCBwcml2YXRlOgogICAgIENTUFNvdXJjZUxpc3QgbV9zb3VyY2VM
aXN0OwogfTsKIAorY2xhc3MgQ1NQT3B0aW9ucyB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgQ1NQ
T3B0aW9ucyhjb25zdCBTdHJpbmcmIHZhbHVlKQorICAgICAgICA6IG1fZGlzYWJsZVhTU1Byb3Rl
Y3Rpb24oZmFsc2UpCisgICAgICAgICwgbV9ldmFsU2NyaXB0KGZhbHNlKQorICAgIHsKKyAgICAg
ICAgcGFyc2UodmFsdWUpOworICAgIH0KKworICAgIGJvb2wgZGlzYWJsZVhTU1Byb3RlY3Rpb24o
KSBjb25zdCB7IHJldHVybiBtX2Rpc2FibGVYU1NQcm90ZWN0aW9uOyB9CisgICAgYm9vbCBldmFs
U2NyaXB0KCkgY29uc3QgeyByZXR1cm4gbV9ldmFsU2NyaXB0OyB9CisKK3ByaXZhdGU6CisgICAg
dm9pZCBwYXJzZShjb25zdCBTdHJpbmcmKTsKKworICAgIGJvb2wgbV9kaXNhYmxlWFNTUHJvdGVj
dGlvbjsKKyAgICBib29sIG1fZXZhbFNjcmlwdDsKK307CisKKy8vIG9wdGlvbnMgICAgICAgICAg
ID0gIm9wdGlvbnMiICooIDEqV1NQIG9wdGlvbi12YWx1ZSApICpXU1AKKy8vIG9wdGlvbi12YWx1
ZSAgICAgID0gMSooIEFMUEhBIC8gRElHSVQgLyAiLSIgKQorLy8KK3ZvaWQgQ1NQT3B0aW9uczo6
cGFyc2UoY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0
cmluZywgZGlzYWJsZVhTU1Byb3RlY3Rpb24sICgiZGlzYWJsZS14c3MtcHJvdGVjdGlvbiIpKTsK
KyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgZXZhbFNjcmlwdCwgKCJldmFsLXNjcmlw
dCIpKTsKKworICAgIGNvbnN0IFVDaGFyKiBwb3NpdGlvbiA9IHZhbHVlLmNoYXJhY3RlcnMoKTsK
KyAgICBjb25zdCBVQ2hhciogZW5kID0gcG9zaXRpb24gKyB2YWx1ZS5sZW5ndGgoKTsKKworICAg
IHdoaWxlIChwb3NpdGlvbiA8IGVuZCkgeworICAgICAgICBza2lwV2hpbGU8aXNBU0NJSVNwYWNl
Pihwb3NpdGlvbiwgZW5kKTsKKworICAgICAgICBjb25zdCBVQ2hhciogb3B0aW9uc1ZhbHVlQmVn
aW4gPSBwb3NpdGlvbjsKKworICAgICAgICBpZiAoIXNraXBFeGFjdGx5PGlzT3B0aW9uVmFsdWVD
aGFyYWN0ZXI+KHBvc2l0aW9uLCBlbmQpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg
IHNraXBXaGlsZTxpc09wdGlvblZhbHVlQ2hhcmFjdGVyPihwb3NpdGlvbiwgZW5kKTsKKworICAg
ICAgICBTdHJpbmcgb3B0aW9uc1ZhbHVlKG9wdGlvbnNWYWx1ZUJlZ2luLCBwb3NpdGlvbiAtIG9w
dGlvbnNWYWx1ZUJlZ2luKTsKKworICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0aW9u
c1ZhbHVlLCBkaXNhYmxlWFNTUHJvdGVjdGlvbikpCisgICAgICAgICAgICBtX2Rpc2FibGVYU1NQ
cm90ZWN0aW9uID0gdHJ1ZTsKKyAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0
aW9uc1ZhbHVlLCBldmFsU2NyaXB0KSkKKyAgICAgICAgICAgIG1fZXZhbFNjcmlwdCA9IHRydWU7
CisgICAgfQorfQorCiBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGlj
eShTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAgIDogbV9oYXZlUG9saWN5KGZhbHNlKQogICAg
ICwgbV9vcmlnaW4ob3JpZ2luKQpAQCAtNDI3LDE3ICs0ODEsMTcgQEAgdm9pZCBDb250ZW50U2Vj
dXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJiBoZWFkZXIpCiAKIGJv
b2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0phdmFTY3JpcHRVUkxzKCkgY29uc3QKIHsK
LSAgICByZXR1cm4gIW1fc2NyaXB0U3JjOworICAgIHJldHVybiAhbV9zY3JpcHRTcmMgfHwgKG1f
b3B0aW9ucyAmJiBtX29wdGlvbnMtPmRpc2FibGVYU1NQcm90ZWN0aW9uKCkpOwogfQogCiBib29s
IENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVFdmVudEhhbmRsZXJzKCkgY29uc3QK
IHsKLSAgICByZXR1cm4gIW1fc2NyaXB0U3JjOworICAgIHJldHVybiAhbV9zY3JpcHRTcmMgfHwg
KG1fb3B0aW9ucyAmJiBtX29wdGlvbnMtPmRpc2FibGVYU1NQcm90ZWN0aW9uKCkpOwogfQogCiBi
b29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoKSBjb25zdAogewot
ICAgIHJldHVybiAhbV9zY3JpcHRTcmM7CisgICAgcmV0dXJuICFtX3NjcmlwdFNyYyB8fCAobV9v
cHRpb25zICYmIG1fb3B0aW9ucy0+ZGlzYWJsZVhTU1Byb3RlY3Rpb24oKSk7CiB9CiAKIGJvb2wg
Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd1NjcmlwdEZyb21Tb3VyY2UoY29uc3QgS1VSTCYg
dXJsKSBjb25zdApAQCAtNTI1LDYgKzU3OSw3IEBAIHZvaWQgQ29udGVudFNlY3VyaXR5UG9saWN5
OjphZGREaXJlY3RpdmUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlCiB7
CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHNjcmlwdFNyYywgKCJzY3JpcHQtc3Jj
IikpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBvYmplY3RTcmMsICgib2JqZWN0
LXNyYyIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgb3B0aW9ucywgKCJvcHRp
b25zIikpOwogCiAgICAgQVNTRVJUKCFuYW1lLmlzRW1wdHkoKSk7CiAKQEAgLTUzMiw2ICs1ODcs
OCBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZlKGNvbnN0IFN0cmlu
ZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZQogICAgICAgICBtX3NjcmlwdFNyYyA9IGFkb3B0
UHRyKG5ldyBDU1BEaXJlY3RpdmUodmFsdWUsIG1fb3JpZ2luLmdldCgpKSk7CiAgICAgZWxzZSBp
ZiAoIW1fb2JqZWN0U3JjICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIG9iamVjdFNyYykpCiAg
ICAgICAgIG1fb2JqZWN0U3JjID0gYWRvcHRQdHIobmV3IENTUERpcmVjdGl2ZSh2YWx1ZSwgbV9v
cmlnaW4uZ2V0KCkpKTsKKyAgICBlbHNlIGlmICghbV9vcHRpb25zICYmIGVxdWFsSWdub3JpbmdD
YXNlKG5hbWUsIG9wdGlvbnMpKQorICAgICAgICBtX29wdGlvbnMgPSBhZG9wdFB0cihuZXcgQ1NQ
T3B0aW9ucyh2YWx1ZSkpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl
L0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2Vj
dXJpdHlQb2xpY3kuaAppbmRleCA3NTBhNDQzZDJmYzFkNjgxMzZiN2I5M2M4ZDdjOWIxMzBlY2Fk
MjQ1Li5lNzVlMTViMjUxM2ZiY2Y2Y2MyYWU5YThiMjQ3ZGVkNGFkMDc1Y2YwIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKQEAgLTMyLDYgKzMyLDcgQEAK
IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgQ1NQRGlyZWN0aXZlOworY2xhc3MgQ1NQT3B0
aW9uczsKIGNsYXNzIEtVUkw7CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIApAQCAtNjIsNiArNjMs
NyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9vcmlnaW47CiAgICAg
T3duUHRyPENTUERpcmVjdGl2ZT4gbV9zY3JpcHRTcmM7CiAgICAgT3duUHRyPENTUERpcmVjdGl2
ZT4gbV9vYmplY3RTcmM7CisgICAgT3duUHRyPENTUE9wdGlvbnM+IG1fb3B0aW9uczsKIH07CiAK
IH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88601</attachid>
            <date>2011-04-07 03:14:51 -0700</date>
            <delta_ts>2011-04-07 10:53:14 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-58014-20110407031450.patch</filename>
            <type>text/plain</type>
            <size>9068</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMTU5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDQtMDcgIEFkYW0gQmFy
dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl
bC4KKworICAgICAgICBJbXBsZW1lbnQgQ1NQJ3Mgb3B0aW9ucyBkaXJlY3RpdmUKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MDE0CisKKyAgICAgICAg
VGhpcyBwYXRjaCBjb250YWlucyB0aGUgZnVsbCBvcHRpb25zIHBhcnNlciwgYnV0IHdlIG9ubHkg
aGF2ZSBlbm91Z2ggb2YKKyAgICAgICAgQ1NQIGltcGxlbWVudGVkIHRvIHNlZSB0aGUgZWZmZWN0
cyBvZiBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uLiAgV2lsbAorICAgICAgICBuZWVkIHRvIGRvIHNv
bWUgbW9yZSB3b3JrIGJlZm9yZSB3ZSBjYW4gc2VlIGV2YWwtc2NyaXB0IGluIGFjdGlvbi4KKwor
ICAgICAgICBUZXN0czogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv
aW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvc2Vj
dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS5o
dG1sCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAg
IChXZWJDb3JlOjpDU1BPcHRpb25zOjpDU1BPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkNT
UE9wdGlvbnM6OmRpc2FibGVYU1NQcm90ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUE9w
dGlvbnM6OmV2YWxTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NQT3B0aW9uczo6cGFyc2Up
OgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0phdmFTY3Jp
cHRVUkxzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJ
bmxpbmVFdmVudEhhbmRsZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBv
bGljeTo6YWxsb3dJbmxpbmVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3Vy
aXR5UG9saWN5OjphZGREaXJlY3RpdmUpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5
UG9saWN5Lmg6CisKIDIwMTEtMDQtMDcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K
IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAJKHJldmlzaW9uIDgzMTU5KQorKysg
U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC01Nyw2ICs1NywxMSBAQCBib29sIGlzSG9zdENoYXJhY3RlcihVQ2hhciBjKQogICAg
IHJldHVybiBpc0FTQ0lJQWxwaGFudW1lcmljKGMpIHx8IGMgPT0gJy0nOwogfQogCitib29sIGlz
T3B0aW9uVmFsdWVDaGFyYWN0ZXIoVUNoYXIgYykKK3sKKyAgICByZXR1cm4gaXNBU0NJSUFscGhh
bnVtZXJpYyhjKSB8fCBjID09ICctJzsKK30KKwogYm9vbCBpc1NjaGVtZUNvbnRpbnVhdGlvbkNo
YXJhY3RlcihVQ2hhciBjKQogewogICAgIHJldHVybiBpc0FTQ0lJQWxwaGFudW1lcmljKGMpIHx8
IGMgPT0gJysnIHx8IGMgPT0gJy0nIHx8IGMgPT0gJy4nOwpAQCAtNDA2LDYgKzQxMSw1NSBAQCBw
cml2YXRlOgogICAgIENTUFNvdXJjZUxpc3QgbV9zb3VyY2VMaXN0OwogfTsKIAorY2xhc3MgQ1NQ
T3B0aW9ucyB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgQ1NQT3B0aW9ucyhjb25zdCBTdHJpbmcm
IHZhbHVlKQorICAgICAgICA6IG1fZGlzYWJsZVhTU1Byb3RlY3Rpb24oZmFsc2UpCisgICAgICAg
ICwgbV9ldmFsU2NyaXB0KGZhbHNlKQorICAgIHsKKyAgICAgICAgcGFyc2UodmFsdWUpOworICAg
IH0KKworICAgIGJvb2wgZGlzYWJsZVhTU1Byb3RlY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2Rp
c2FibGVYU1NQcm90ZWN0aW9uOyB9CisgICAgYm9vbCBldmFsU2NyaXB0KCkgY29uc3QgeyByZXR1
cm4gbV9ldmFsU2NyaXB0OyB9CisKK3ByaXZhdGU6CisgICAgdm9pZCBwYXJzZShjb25zdCBTdHJp
bmcmKTsKKworICAgIGJvb2wgbV9kaXNhYmxlWFNTUHJvdGVjdGlvbjsKKyAgICBib29sIG1fZXZh
bFNjcmlwdDsKK307CisKKy8vIG9wdGlvbnMgICAgICAgICAgID0gIm9wdGlvbnMiICooIDEqV1NQ
IG9wdGlvbi12YWx1ZSApICpXU1AKKy8vIG9wdGlvbi12YWx1ZSAgICAgID0gMSooIEFMUEhBIC8g
RElHSVQgLyAiLSIgKQorLy8KK3ZvaWQgQ1NQT3B0aW9uczo6cGFyc2UoY29uc3QgU3RyaW5nJiB2
YWx1ZSkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgZGlzYWJsZVhTU1Byb3Rl
Y3Rpb24sICgiZGlzYWJsZS14c3MtcHJvdGVjdGlvbiIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xP
Q0FMKFN0cmluZywgZXZhbFNjcmlwdCwgKCJldmFsLXNjcmlwdCIpKTsKKworICAgIGNvbnN0IFVD
aGFyKiBwb3NpdGlvbiA9IHZhbHVlLmNoYXJhY3RlcnMoKTsKKyAgICBjb25zdCBVQ2hhciogZW5k
ID0gcG9zaXRpb24gKyB2YWx1ZS5sZW5ndGgoKTsKKworICAgIHdoaWxlIChwb3NpdGlvbiA8IGVu
ZCkgeworICAgICAgICBza2lwV2hpbGU8aXNBU0NJSVNwYWNlPihwb3NpdGlvbiwgZW5kKTsKKwor
ICAgICAgICBjb25zdCBVQ2hhciogb3B0aW9uc1ZhbHVlQmVnaW4gPSBwb3NpdGlvbjsKKworICAg
ICAgICBpZiAoIXNraXBFeGFjdGx5PGlzT3B0aW9uVmFsdWVDaGFyYWN0ZXI+KHBvc2l0aW9uLCBl
bmQpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHNraXBXaGlsZTxpc09wdGlvblZh
bHVlQ2hhcmFjdGVyPihwb3NpdGlvbiwgZW5kKTsKKworICAgICAgICBTdHJpbmcgb3B0aW9uc1Zh
bHVlKG9wdGlvbnNWYWx1ZUJlZ2luLCBwb3NpdGlvbiAtIG9wdGlvbnNWYWx1ZUJlZ2luKTsKKwor
ICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0aW9uc1ZhbHVlLCBkaXNhYmxlWFNTUHJv
dGVjdGlvbikpCisgICAgICAgICAgICBtX2Rpc2FibGVYU1NQcm90ZWN0aW9uID0gdHJ1ZTsKKyAg
ICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0aW9uc1ZhbHVlLCBldmFsU2NyaXB0
KSkKKyAgICAgICAgICAgIG1fZXZhbFNjcmlwdCA9IHRydWU7CisgICAgfQorfQorCiBDb250ZW50
U2VjdXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeShTZWN1cml0eU9yaWdpbiogb3Jp
Z2luKQogICAgIDogbV9oYXZlUG9saWN5KGZhbHNlKQogICAgICwgbV9vcmlnaW4ob3JpZ2luKQpA
QCAtNDI1LDE5ICs0NzksMjQgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2Vp
dmVIZQogICAgIG1faGF2ZVBvbGljeSA9IHRydWU7CiB9CiAKK2Jvb2wgQ29udGVudFNlY3VyaXR5
UG9saWN5Ojpwcm90ZWN0QWdhaW5zdFhTUygpCit7CisgICAgcmV0dXJuIG1fc2NyaXB0U3JjICYm
ICghbV9vcHRpb25zIHx8ICFtX29wdGlvbnMtPmRpc2FibGVYU1NQcm90ZWN0aW9uKCkpOworfQor
CiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dKYXZhU2NyaXB0VVJMcygpIGNvbnN0
CiB7Ci0gICAgcmV0dXJuICFtX3NjcmlwdFNyYzsKKyAgICByZXR1cm4gIXByb3RlY3RBZ2FpbnN0
WFNTKCk7CiB9CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZUV2ZW50
SGFuZGxlcnMoKSBjb25zdAogewotICAgIHJldHVybiAhbV9zY3JpcHRTcmM7CisgICAgcmV0dXJu
ICFwcm90ZWN0QWdhaW5zdFhTUygpOwogfQogCiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6
YWxsb3dJbmxpbmVTY3JpcHQoKSBjb25zdAogewotICAgIHJldHVybiAhbV9zY3JpcHRTcmM7Cisg
ICAgcmV0dXJuICFwcm90ZWN0QWdhaW5zdFhTUygpOwogfQogCiBib29sIENvbnRlbnRTZWN1cml0
eVBvbGljeTo6YWxsb3dTY3JpcHRGcm9tU291cmNlKGNvbnN0IEtVUkwmIHVybCkgY29uc3QKQEAg
LTUyNSw2ICs1ODQsNyBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZl
CiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHNjcmlwdFNyYywgKCJzY3JpcHQt
c3JjIikpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBvYmplY3RTcmMsICgib2Jq
ZWN0LXNyYyIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgb3B0aW9ucywgKCJv
cHRpb25zIikpOwogCiAgICAgQVNTRVJUKCFuYW1lLmlzRW1wdHkoKSk7CiAKQEAgLTUzMiw2ICs1
OTIsOCBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZlCiAgICAgICAg
IG1fc2NyaXB0U3JjID0gYWRvcHRQdHIobmV3IENTUERpcmVjdGl2ZSh2YWx1ZSwgbV9vcmlnaW4u
Z2V0KCkpKTsKICAgICBlbHNlIGlmICghbV9vYmplY3RTcmMgJiYgZXF1YWxJZ25vcmluZ0Nhc2Uo
bmFtZSwgb2JqZWN0U3JjKSkKICAgICAgICAgbV9vYmplY3RTcmMgPSBhZG9wdFB0cihuZXcgQ1NQ
RGlyZWN0aXZlKHZhbHVlLCBtX29yaWdpbi5nZXQoKSkpOworICAgIGVsc2UgaWYgKCFtX29wdGlv
bnMgJiYgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgb3B0aW9ucykpCisgICAgICAgIG1fb3B0aW9u
cyA9IGFkb3B0UHRyKG5ldyBDU1BPcHRpb25zKHZhbHVlKSk7CiB9CiAKIH0KSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291
cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAkocmV2aXNpb24gODMxNTkp
CisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCSh3b3JraW5n
IGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIENT
UERpcmVjdGl2ZTsKK2NsYXNzIENTUE9wdGlvbnM7CiBjbGFzcyBLVVJMOwogY2xhc3MgU2VjdXJp
dHlPcmlnaW47CiAKQEAgLTU0LDYgKzU1LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBs
aWNpdCBDb250ZW50U2VjdXJpdHlQb2xpY3koU2VjdXJpdHlPcmlnaW4qKTsKIAorICAgIGJvb2wg
cHJvdGVjdEFnYWluc3RYU1MoKSBjb25zdDsKKwogICAgIHZvaWQgcGFyc2UoY29uc3QgU3RyaW5n
Jik7CiAgICAgYm9vbCBwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciogYmVnaW4sIGNvbnN0IFVD
aGFyKiBlbmQsIFN0cmluZyYgbmFtZSwgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBhZGREaXJl
Y3RpdmUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKQEAgLTYyLDYg
KzY1LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG1fb3JpZ2luOwog
ICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fc2NyaXB0U3JjOwogICAgIE93blB0cjxDU1BEaXJl
Y3RpdmU+IG1fb2JqZWN0U3JjOworICAgIE93blB0cjxDU1BPcHRpb25zPiBtX29wdGlvbnM7CiB9
OwogCiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzE1OSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTA0LTA3ICBBZGFtIEJhcnRo
ICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu
CisKKyAgICAgICAgSW1wbGVtZW50IENTUCdzIG9wdGlvbnMgZGlyZWN0aXZlCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODAxNAorCisgICAgICAgICog
aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1h
bGxvd2VkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0
eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWw6IEFkZGVk
LgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lu
bGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq
IGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YmxvY2tlZC1nb29meS5odG1sOiBBZGRlZC4KKwogMjAxMS0wNC0wNyAgQWRhbSBCYXJ0aCAgPGFi
YXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRl
eDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv
aW5saW5lLXNjcmlwdC1hbGxvd2VkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU
ZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUtc2Ny
aXB0LWFsbG93ZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxv
d2VkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0IEBACitBTEVSVDogUEFT
UyAxIG9mIDMKK0FMRVJUOiBQQVNTIDIgb2YgMworQUxFUlQ6IFBBU1MgMyBvZiAzCisKSW5kZXg6
IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lu
bGluZS1zY3JpcHQtYWxsb3dlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAv
dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYWxsb3dl
ZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j
b250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwJKHJldmlzaW9u
IDApCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxt
ZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyBodHRwOi8v
MTI3LjAuMC4xOio7IG9wdGlvbnMgZGlzYWJsZS14c3MtcHJvdGVjdGlvbiI+Cis8c2NyaXB0IHNy
Yz0icmVzb3VyY2VzL2R1bXAtYXMtdGV4dC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBv
bmxvYWQ9ImFsZXJ0KCdQQVNTIDMgb2YgMycpIj4KKzxzY3JpcHQ+CithbGVydCgnUEFTUyAxIG9m
IDMnKTsKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9ImphdmFzY3JpcHQ6YWxlcnQoJ1BBU1MgMiBv
ZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9j
a2VkLWdvb2Z5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rl
c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUtc2NyaXB0LWJsb2NrZWQt
Z29vZnktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdv
b2Z5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorVGhpcyB0ZXN0IHBh
c3NlcyBpZiBpdCBkb2Vzbid0IGFsZXJ0IGZhaWwuICAKSW5kZXg6IExheW91dFRlc3RzL2h0dHAv
dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxvY2tl
ZC1nb29meS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp
dHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS5odG1s
CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50
U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5Lmh0bWwJKHJldmlzaW9u
IDApCkBAIC0wLDAgKzEsMTQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxt
ZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyBodHRwOi8v
MTI3LjAuMC4xOio7IG9wdGlvbnMgZ29vZnkiPgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9kdW1w
LWFzLXRleHQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJhbGVydCgnRkFJ
TCAzIG9mIDMnKSI+CitUaGlzIHRlc3QgcGFzc2VzIGlmIGl0IGRvZXNuJ3QgYWxlcnQgZmFpbC4K
KzxzY3JpcHQ+CithbGVydCgnRkFJTCAxIG9mIDMnKTsKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9
ImphdmFzY3JpcHQ6YWxlcnQoJ0ZBSUwgMiBvZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9o
dG1sPgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88662</attachid>
            <date>2011-04-07 10:53:16 -0700</date>
            <delta_ts>2011-04-07 13:51:42 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-58014-20110407105315.patch</filename>
            <type>text/plain</type>
            <size>9074</size>
            <attacher name="Adam Barth">abarth</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMTU5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl
TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDQtMDcgIEFkYW0gQmFy
dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl
bC4KKworICAgICAgICBJbXBsZW1lbnQgQ1NQJ3Mgb3B0aW9ucyBkaXJlY3RpdmUKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MDE0CisKKyAgICAgICAg
VGhpcyBwYXRjaCBjb250YWlucyB0aGUgZnVsbCBvcHRpb25zIHBhcnNlciwgYnV0IHdlIG9ubHkg
aGF2ZSBlbm91Z2ggb2YKKyAgICAgICAgQ1NQIGltcGxlbWVudGVkIHRvIHNlZSB0aGUgZWZmZWN0
cyBvZiBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uLiAgV2lsbAorICAgICAgICBuZWVkIHRvIGRvIHNv
bWUgbW9yZSB3b3JrIGJlZm9yZSB3ZSBjYW4gc2VlIGV2YWwtc2NyaXB0IGluIGFjdGlvbi4KKwor
ICAgICAgICBUZXN0czogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kv
aW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwKKyAgICAgICAgICAgICAgIGh0dHAvdGVzdHMvc2Vj
dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS5o
dG1sCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAg
IChXZWJDb3JlOjpDU1BPcHRpb25zOjpDU1BPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkNT
UE9wdGlvbnM6OmRpc2FibGVYU1NQcm90ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUE9w
dGlvbnM6OmV2YWxTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NQT3B0aW9uczo6cGFyc2Up
OgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0phdmFTY3Jp
cHRVUkxzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJ
bmxpbmVFdmVudEhhbmRsZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBv
bGljeTo6YWxsb3dJbmxpbmVTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3Vy
aXR5UG9saWN5OjphZGREaXJlY3RpdmUpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5
UG9saWN5Lmg6CisKIDIwMTEtMDQtMDcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4K
IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAJKHJldmlzaW9uIDgzMTU5KQorKysg
U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC01Nyw2ICs1NywxMSBAQCBib29sIGlzSG9zdENoYXJhY3RlcihVQ2hhciBjKQogICAg
IHJldHVybiBpc0FTQ0lJQWxwaGFudW1lcmljKGMpIHx8IGMgPT0gJy0nOwogfQogCitib29sIGlz
T3B0aW9uVmFsdWVDaGFyYWN0ZXIoVUNoYXIgYykKK3sKKyAgICByZXR1cm4gaXNBU0NJSUFscGhh
bnVtZXJpYyhjKSB8fCBjID09ICctJzsKK30KKwogYm9vbCBpc1NjaGVtZUNvbnRpbnVhdGlvbkNo
YXJhY3RlcihVQ2hhciBjKQogewogICAgIHJldHVybiBpc0FTQ0lJQWxwaGFudW1lcmljKGMpIHx8
IGMgPT0gJysnIHx8IGMgPT0gJy0nIHx8IGMgPT0gJy4nOwpAQCAtNDA2LDYgKzQxMSw1NSBAQCBw
cml2YXRlOgogICAgIENTUFNvdXJjZUxpc3QgbV9zb3VyY2VMaXN0OwogfTsKIAorY2xhc3MgQ1NQ
T3B0aW9ucyB7CitwdWJsaWM6CisgICAgZXhwbGljaXQgQ1NQT3B0aW9ucyhjb25zdCBTdHJpbmcm
IHZhbHVlKQorICAgICAgICA6IG1fZGlzYWJsZVhTU1Byb3RlY3Rpb24oZmFsc2UpCisgICAgICAg
ICwgbV9ldmFsU2NyaXB0KGZhbHNlKQorICAgIHsKKyAgICAgICAgcGFyc2UodmFsdWUpOworICAg
IH0KKworICAgIGJvb2wgZGlzYWJsZVhTU1Byb3RlY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2Rp
c2FibGVYU1NQcm90ZWN0aW9uOyB9CisgICAgYm9vbCBldmFsU2NyaXB0KCkgY29uc3QgeyByZXR1
cm4gbV9ldmFsU2NyaXB0OyB9CisKK3ByaXZhdGU6CisgICAgdm9pZCBwYXJzZShjb25zdCBTdHJp
bmcmKTsKKworICAgIGJvb2wgbV9kaXNhYmxlWFNTUHJvdGVjdGlvbjsKKyAgICBib29sIG1fZXZh
bFNjcmlwdDsKK307CisKKy8vIG9wdGlvbnMgICAgICAgICAgID0gIm9wdGlvbnMiICooIDEqV1NQ
IG9wdGlvbi12YWx1ZSApICpXU1AKKy8vIG9wdGlvbi12YWx1ZSAgICAgID0gMSooIEFMUEhBIC8g
RElHSVQgLyAiLSIgKQorLy8KK3ZvaWQgQ1NQT3B0aW9uczo6cGFyc2UoY29uc3QgU3RyaW5nJiB2
YWx1ZSkKK3sKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgZGlzYWJsZVhTU1Byb3Rl
Y3Rpb24sICgiZGlzYWJsZS14c3MtcHJvdGVjdGlvbiIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xP
Q0FMKFN0cmluZywgZXZhbFNjcmlwdCwgKCJldmFsLXNjcmlwdCIpKTsKKworICAgIGNvbnN0IFVD
aGFyKiBwb3NpdGlvbiA9IHZhbHVlLmNoYXJhY3RlcnMoKTsKKyAgICBjb25zdCBVQ2hhciogZW5k
ID0gcG9zaXRpb24gKyB2YWx1ZS5sZW5ndGgoKTsKKworICAgIHdoaWxlIChwb3NpdGlvbiA8IGVu
ZCkgeworICAgICAgICBza2lwV2hpbGU8aXNBU0NJSVNwYWNlPihwb3NpdGlvbiwgZW5kKTsKKwor
ICAgICAgICBjb25zdCBVQ2hhciogb3B0aW9uc1ZhbHVlQmVnaW4gPSBwb3NpdGlvbjsKKworICAg
ICAgICBpZiAoIXNraXBFeGFjdGx5PGlzT3B0aW9uVmFsdWVDaGFyYWN0ZXI+KHBvc2l0aW9uLCBl
bmQpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHNraXBXaGlsZTxpc09wdGlvblZh
bHVlQ2hhcmFjdGVyPihwb3NpdGlvbiwgZW5kKTsKKworICAgICAgICBTdHJpbmcgb3B0aW9uc1Zh
bHVlKG9wdGlvbnNWYWx1ZUJlZ2luLCBwb3NpdGlvbiAtIG9wdGlvbnNWYWx1ZUJlZ2luKTsKKwor
ICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0aW9uc1ZhbHVlLCBkaXNhYmxlWFNTUHJv
dGVjdGlvbikpCisgICAgICAgICAgICBtX2Rpc2FibGVYU1NQcm90ZWN0aW9uID0gdHJ1ZTsKKyAg
ICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uob3B0aW9uc1ZhbHVlLCBldmFsU2NyaXB0
KSkKKyAgICAgICAgICAgIG1fZXZhbFNjcmlwdCA9IHRydWU7CisgICAgfQorfQorCiBDb250ZW50
U2VjdXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeShTZWN1cml0eU9yaWdpbiogb3Jp
Z2luKQogICAgIDogbV9oYXZlUG9saWN5KGZhbHNlKQogICAgICwgbV9vcmlnaW4ob3JpZ2luKQpA
QCAtNDI1LDE5ICs0NzksMjQgQEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2Vp
dmVIZQogICAgIG1faGF2ZVBvbGljeSA9IHRydWU7CiB9CiAKK2Jvb2wgQ29udGVudFNlY3VyaXR5
UG9saWN5Ojpwcm90ZWN0QWdhaW5zdFhTUygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc2NyaXB0
U3JjICYmICghbV9vcHRpb25zIHx8ICFtX29wdGlvbnMtPmRpc2FibGVYU1NQcm90ZWN0aW9uKCkp
OworfQorCiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dKYXZhU2NyaXB0VVJMcygp
IGNvbnN0CiB7Ci0gICAgcmV0dXJuICFtX3NjcmlwdFNyYzsKKyAgICByZXR1cm4gIXByb3RlY3RB
Z2FpbnN0WFNTKCk7CiB9CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGlu
ZUV2ZW50SGFuZGxlcnMoKSBjb25zdAogewotICAgIHJldHVybiAhbV9zY3JpcHRTcmM7CisgICAg
cmV0dXJuICFwcm90ZWN0QWdhaW5zdFhTUygpOwogfQogCiBib29sIENvbnRlbnRTZWN1cml0eVBv
bGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoKSBjb25zdAogewotICAgIHJldHVybiAhbV9zY3JpcHRT
cmM7CisgICAgcmV0dXJuICFwcm90ZWN0QWdhaW5zdFhTUygpOwogfQogCiBib29sIENvbnRlbnRT
ZWN1cml0eVBvbGljeTo6YWxsb3dTY3JpcHRGcm9tU291cmNlKGNvbnN0IEtVUkwmIHVybCkgY29u
c3QKQEAgLTUyNSw2ICs1ODQsNyBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGly
ZWN0aXZlCiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHNjcmlwdFNyYywgKCJz
Y3JpcHQtc3JjIikpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBvYmplY3RTcmMs
ICgib2JqZWN0LXNyYyIpKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgb3B0aW9u
cywgKCJvcHRpb25zIikpOwogCiAgICAgQVNTRVJUKCFuYW1lLmlzRW1wdHkoKSk7CiAKQEAgLTUz
Miw2ICs1OTIsOCBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRkRGlyZWN0aXZlCiAg
ICAgICAgIG1fc2NyaXB0U3JjID0gYWRvcHRQdHIobmV3IENTUERpcmVjdGl2ZSh2YWx1ZSwgbV9v
cmlnaW4uZ2V0KCkpKTsKICAgICBlbHNlIGlmICghbV9vYmplY3RTcmMgJiYgZXF1YWxJZ25vcmlu
Z0Nhc2UobmFtZSwgb2JqZWN0U3JjKSkKICAgICAgICAgbV9vYmplY3RTcmMgPSBhZG9wdFB0cihu
ZXcgQ1NQRGlyZWN0aXZlKHZhbHVlLCBtX29yaWdpbi5nZXQoKSkpOworICAgIGVsc2UgaWYgKCFt
X29wdGlvbnMgJiYgZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgb3B0aW9ucykpCisgICAgICAgIG1f
b3B0aW9ucyA9IGFkb3B0UHRyKG5ldyBDU1BPcHRpb25zKHZhbHVlKSk7CiB9CiAKIH0KSW5kZXg6
IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAkocmV2aXNpb24g
ODMxNTkpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCSh3
b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNs
YXNzIENTUERpcmVjdGl2ZTsKK2NsYXNzIENTUE9wdGlvbnM7CiBjbGFzcyBLVVJMOwogY2xhc3Mg
U2VjdXJpdHlPcmlnaW47CiAKQEAgLTU0LDYgKzU1LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAg
ICBleHBsaWNpdCBDb250ZW50U2VjdXJpdHlQb2xpY3koU2VjdXJpdHlPcmlnaW4qKTsKIAorICAg
IGJvb2wgcHJvdGVjdEFnYWluc3RYU1MoKSBjb25zdDsKKwogICAgIHZvaWQgcGFyc2UoY29uc3Qg
U3RyaW5nJik7CiAgICAgYm9vbCBwYXJzZURpcmVjdGl2ZShjb25zdCBVQ2hhciogYmVnaW4sIGNv
bnN0IFVDaGFyKiBlbmQsIFN0cmluZyYgbmFtZSwgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBh
ZGREaXJlY3RpdmUoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZhbHVlKTsKQEAg
LTYyLDYgKzY1LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG1fb3Jp
Z2luOwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fc2NyaXB0U3JjOwogICAgIE93blB0cjxD
U1BEaXJlY3RpdmU+IG1fb2JqZWN0U3JjOworICAgIE93blB0cjxDU1BPcHRpb25zPiBtX29wdGlv
bnM7CiB9OwogCiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MzE1OSkKKysrIExheW91dFRlc3RzL0No
YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTA0LTA3ICBBZGFt
IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT
ZWlkZWwuCisKKyAgICAgICAgSW1wbGVtZW50IENTUCdzIG9wdGlvbnMgZGlyZWN0aXZlCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODAxNAorCisgICAg
ICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNj
cmlwdC1hbGxvd2VkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9z
ZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWw6
IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s
aWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29meS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg
ICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1z
Y3JpcHQtYmxvY2tlZC1nb29meS5odG1sOiBBZGRlZC4KKwogMjAxMS0wNC0wNyAgQWRhbSBCYXJ0
aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs
LgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ
b2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM
YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxp
bmUtc2NyaXB0LWFsbG93ZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlw
dC1hbGxvd2VkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0IEBACitBTEVS
VDogUEFTUyAxIG9mIDMKK0FMRVJUOiBQQVNTIDIgb2YgMworQUxFUlQ6IFBBU1MgMyBvZiAzCisK
SW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s
aWN5L2lubGluZS1zY3JpcHQtYWxsb3dlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YWxsb3dlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1
cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwJKHJl
dmlzaW9uIDApCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh
ZD4KKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyBo
dHRwOi8vMTI3LjAuMC4xOio7IG9wdGlvbnMgZGlzYWJsZS14c3MtcHJvdGVjdGlvbiI+Cis8c2Ny
aXB0IHNyYz0icmVzb3VyY2VzL2R1bXAtYXMtdGV4dC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8
Ym9keSBvbmxvYWQ9ImFsZXJ0KCdQQVNTIDMgb2YgMycpIj4KKzxzY3JpcHQ+CithbGVydCgnUEFT
UyAxIG9mIDMnKTsKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9ImphdmFzY3JpcHQ6YWxlcnQoJ1BB
U1MgMiBvZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlw
dC1ibG9ja2VkLWdvb2Z5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbmxpbmUtc2NyaXB0LWJs
b2NrZWQtZ29vZnktZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0
cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9j
a2VkLWdvb2Z5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorVGhpcyB0
ZXN0IHBhc3NlcyBpZiBpdCBkb2Vzbid0IGFsZXJ0IGZhaWwuICAKSW5kZXg6IExheW91dFRlc3Rz
L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQt
YmxvY2tlZC1nb29meS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv
c2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYmxvY2tlZC1nb29m
eS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j
b250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1ibG9ja2VkLWdvb2Z5Lmh0bWwJKHJl
dmlzaW9uIDApCkBAIC0wLDAgKzEsMTQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh
ZD4KKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyBo
dHRwOi8vMTI3LjAuMC4xOio7IG9wdGlvbnMgZ29vZnkiPgorPHNjcmlwdCBzcmM9InJlc291cmNl
cy9kdW1wLWFzLXRleHQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJhbGVy
dCgnRkFJTCAzIG9mIDMnKSI+CitUaGlzIHRlc3QgcGFzc2VzIGlmIGl0IGRvZXNuJ3QgYWxlcnQg
ZmFpbC4KKzxzY3JpcHQ+CithbGVydCgnRkFJTCAxIG9mIDMnKTsKKzwvc2NyaXB0PgorPGlmcmFt
ZSBzcmM9ImphdmFzY3JpcHQ6YWxlcnQoJ0ZBSUwgMiBvZiAzJykiPjwvaWZyYW1lPgorPC9ib2R5
PgorPC9odG1sPgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>