<?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>129687</bug_id>
          
          <creation_ts>2014-03-04 10:52:34 -0800</creation_ts>
          <short_desc>[Mac][WK2] Videos do not have access to session cookies</short_desc>
          <delta_ts>2014-04-08 11:27:18 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>528+ (Nightly build)</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jer Noble">jer.noble</reporter>
          <assigned_to name="Jer Noble">jer.noble</assigned_to>
          <cc>commit-queue</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>jer.noble</cc>
    
    <cc>joepeck</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>986872</commentid>
    <comment_count>0</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-03-04 10:52:34 -0800</bug_when>
    <thetext>[Mac][WK2] Videos do not have access to session cookies</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>986874</commentid>
    <comment_count>1</comment_count>
      <attachid>225792</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-03-04 10:55:46 -0800</bug_when>
    <thetext>Created attachment 225792
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>987063</commentid>
    <comment_count>2</comment_count>
      <attachid>225792</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2014-03-04 18:12:55 -0800</bug_when>
    <thetext>Comment on attachment 225792
Patch

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

&gt; Source/WebKit2/Shared/mac/CookieStorageShim.mm:36
&gt; +#include &lt;Foundation/NSURLSession.h&gt;

This needs to be conditionally included.

&gt; Source/WebKit2/Shared/mac/CookieStorageShim.mm:99
&gt; +- (void)_getCookieHeadersForTask:(NSURLSessionTask*)task completionHandler:(void (^)(CFDictionaryRef))completionHandler

Can completionHandler be NULL?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>988933</commentid>
    <comment_count>3</comment_count>
      <attachid>226315</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-03-10 10:14:43 -0700</bug_when>
    <thetext>Created attachment 226315
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996059</commentid>
    <comment_count>4</comment_count>
      <attachid>228221</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-03-31 17:10:58 -0700</bug_when>
    <thetext>Created attachment 228221
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996305</commentid>
    <comment_count>5</comment_count>
      <attachid>228221</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2014-04-01 09:10:48 -0700</bug_when>
    <thetext>Comment on attachment 228221
Patch

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

&gt; Source/WebKit2/Shared/mac/CookieStorageShim.mm:116
&gt; +    dispatch_async(dispatch_get_main_queue(), ^{
&gt; +        completionHandler(WebKit::webKitCookieStorageCopyRequestHeaderFieldsForURL(nullptr, (CFURLRef)[[task currentRequest] URL]));

Can completionHandler be NULL?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>996395</commentid>
    <comment_count>6</comment_count>
      <attachid>228309</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-04-01 12:54:23 -0700</bug_when>
    <thetext>Created attachment 228309
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997679</commentid>
    <comment_count>7</comment_count>
      <attachid>228615</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-04-04 14:03:02 -0700</bug_when>
    <thetext>Created attachment 228615
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997714</commentid>
    <comment_count>8</comment_count>
      <attachid>228221</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2014-04-04 15:41:21 -0700</bug_when>
    <thetext>Comment on attachment 228221
Patch

Obsoleting an old version of the patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997734</commentid>
    <comment_count>9</comment_count>
      <attachid>228615</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-04-04 16:15:37 -0700</bug_when>
    <thetext>Comment on attachment 228615
Patch for landing

Clearing flags on attachment: 228615

Committed r166812: &lt;http://trac.webkit.org/changeset/166812&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997735</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2014-04-04 16:15:40 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997779</commentid>
    <comment_count>11</comment_count>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2014-04-04 18:18:52 -0700</bug_when>
    <thetext>(In reply to comment #10)
&gt; All reviewed patches have been landed.  Closing bug.

Looks like it this broke 32-bit builds on Mavericks.

    CompileC CookieStorageShim.o
    OpenSource/Source/WebKit2/Shared/mac/CookieStorageShim.mm:54:35: error: expected a type
    - (void)_getCookieHeadersForTask:(NSURLSessionTask*)task completionHandler:(void (^)(CFDictionaryRef))completionHandler;
                                      ^
    OpenSource/Source/WebKit2/Shared/mac/CookieStorageShim.mm:117:35: error: expected a type
    - (void)_getCookieHeadersForTask:(NSURLSessionTask*)task completionHandler:(void (^)(CFDictionaryRef))completionHandler
                                      ^
    2 errors generated.

I&apos;m going to roll it out, because if that is the case then this bug probably needs to be addressed differently / tested on 32 bit.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>997781</commentid>
    <comment_count>12</comment_count>
    <who name="Joseph Pecoraro">joepeck</who>
    <bug_when>2014-04-04 18:25:20 -0700</bug_when>
    <thetext>Rolled out in: &lt;http://trac.webkit.org/changeset/166819&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>998183</commentid>
    <comment_count>13</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-04-07 10:50:37 -0700</bug_when>
    <thetext>(In reply to comment #12)
&gt; Rolled out in: &lt;http://trac.webkit.org/changeset/166819&gt;

Just needed a forward declaration of NSURLSessionTask.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>998669</commentid>
    <comment_count>14</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2014-04-08 11:27:18 -0700</bug_when>
    <thetext>Committed r166940: &lt;http://trac.webkit.org/changeset/166940&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>225792</attachid>
            <date>2014-03-04 10:55:46 -0800</date>
            <delta_ts>2014-03-31 17:10:55 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-129687-20140304105545.patch</filename>
            <type>text/plain</type>
            <size>3612</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjFmNTc3NmNmNzY3Yjc2
MzFhYjI0OWI2NDQ3NjViOWNmNzZmYjVhMC4uZWY5NmMxYWNiZGM3OWJjOGNhZjI5MzJkODk2ZTA5
NDIwOWY3NjBmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW1dLMl0gVmlkZW9z
IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBzZXNzaW9uIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTY4NworCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgQ29va2llU3RvcmFnZVNo
aW0gdG8gdHJhY2sgY2hhbmdlcyBpbiB1bmRlcmx5aW5nIG5ldHdvcmtpbmcgc3RhY2suCisKKyAg
ICAgICAgKiBTaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tOgorICAgICAgICAoV2ViS2l0
OjpDb29raWVTdG9yYWdlU2hpbTo6aW5pdGlhbGl6ZSk6CisgICAgICAgICgtW1dLTlNVUkxTZXNz
aW9uTG9jYWwgX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOmNvbXBsZXRpb25IYW5kbGVyOl0pOgor
CiAyMDE0LTAzLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg
ICAgICAgIENyYXNoIHdoZW4gZ29pbmcgaW50byB2aWRlbyBmdWxsc2NyZWVuIG9uIGlPUwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbSBi
L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29va2llU3RvcmFnZVNoaW0ubW0KaW5kZXggZjA5
ZmY0ZmI2NTMzMDIyY2I5Mzk0NmY3ZTI4OWY1OWM5NmRmYjZmMi4uZDhkMzUzN2ZlYmRkYjlhMjAw
NWE1ZTM3NjM5MjIzOGVmNThiYjZmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVk
L21hYy9Db29raWVTdG9yYWdlU2hpbS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFj
L0Nvb2tpZVN0b3JhZ2VTaGltLm1tCkBAIC0zMSwyNSArMzEsMjEgQEAKICNpbmNsdWRlICJDb29r
aWVTdG9yYWdlU2hpbUxpYnJhcnkuaCIKICNpbmNsdWRlICJOZXR3b3JrQ29ubmVjdGlvblRvV2Vi
UHJvY2Vzcy5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbi5oIgotI2luY2x1
ZGUgPFdlYkNvcmUvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJz
LmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzcy5oIgotI2luY2x1ZGUgPFdlYkNvcmUvVVJMLmg+Cisj
aW5jbHVkZSA8Rm91bmRhdGlvbi9OU1VSTFNlc3Npb24uaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1Nl
c3Npb25JRC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU29mdExpbmtpbmcuaD4KKyNpbmNsdWRlIDxX
ZWJDb3JlL1VSTC5oPgogI2luY2x1ZGUgPGRsZmNuLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJl
YWQuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RG
U3RyaW5nLmg+CiAKLXR5cGVkZWYgY29uc3Qgc3RydWN0IF9DRlVSTFJlcXVlc3QqIENGVVJMUmVx
dWVzdFJlZjsKLQotU09GVF9MSU5LX0ZSQU1FV09SSyhDRk5ldHdvcmspCi1TT0ZUX0xJTksoQ0ZO
ZXR3b3JrLCBDRlVSTFJlcXVlc3RHZXRVUkwsIENGVVJMUmVmLCAoQ0ZVUkxSZXF1ZXN0UmVmIHJl
cXVlc3QpLCAocmVxdWVzdCkpCi0KIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBAaW50ZXJm
YWNlIFdLTlNVUkxTZXNzaW9uTG9jYWwgOiBOU09iamVjdAotLSAoQ0ZEaWN0aW9uYXJ5UmVmKSBf
Y29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6
KENGVVJMUmVxdWVzdFJlZikgcmVxdWVzdDsKKy0gKHZvaWQpX2dldENvb2tpZUhlYWRlcnNGb3JU
YXNrOihOU1VSTFNlc3Npb25UYXNrKil0YXNrIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShD
RkRpY3Rpb25hcnlSZWYpKWNvbXBsZXRpb25IYW5kbGVyOwogQGVuZAogCiBuYW1lc3BhY2UgV2Vi
S2l0IHsKQEAgLTg3LDExICs4MywxMSBAQCB2b2lkIENvb2tpZVN0b3JhZ2VTaGltOjppbml0aWFs
aXplKCkKICAgICBpZiAoIV9fTlNVUkxTZXNzaW9uTG9jYWxDbGFzcykKICAgICAgICAgcmV0dXJu
OwogCi0gICAgTWV0aG9kIG9yaWdpbmFsID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2QoX19OU1VS
TFNlc3Npb25Mb2NhbENsYXNzLCBAc2VsZWN0b3IoX2NvcHlDb29raWVzRm9yUmVxdWVzdFVzaW5n
QWxsQXBwcm9wcmlhdGVTdG9yYWdlU2VtYW50aWNzOikpOworICAgIE1ldGhvZCBvcmlnaW5hbCA9
IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKF9fTlNVUkxTZXNzaW9uTG9jYWxDbGFzcywgQHNlbGVj
dG9yKF9nZXRDb29raWVIZWFkZXJzRm9yVGFzazpjb21wbGV0aW9uSGFuZGxlcjopKTsKICAgICBp
ZiAoIW9yaWdpbmFsKQogICAgICAgICByZXR1cm47CiAKLSAgICBNZXRob2QgcmVwbGFjZW1lbnQg
PSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbV0tOU1VSTFNlc3Npb25Mb2NhbCBjbGFzc10sIEBz
ZWxlY3RvcihfY29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VT
ZW1hbnRpY3M6KSk7CisgICAgTWV0aG9kIHJlcGxhY2VtZW50ID0gY2xhc3NfZ2V0SW5zdGFuY2VN
ZXRob2QoW1dLTlNVUkxTZXNzaW9uTG9jYWwgY2xhc3NdLCBAc2VsZWN0b3IoX2dldENvb2tpZUhl
YWRlcnNGb3JUYXNrOmNvbXBsZXRpb25IYW5kbGVyOikpOwogICAgIEFTU0VSVChyZXBsYWNlbWVu
dCk7CiAKICAgICBtZXRob2RfZXhjaGFuZ2VJbXBsZW1lbnRhdGlvbnMob3JpZ2luYWwsIHJlcGxh
Y2VtZW50KTsKQEAgLTEwMCw5ICs5NiwxMSBAQCB2b2lkIENvb2tpZVN0b3JhZ2VTaGltOjppbml0
aWFsaXplKCkKIH0KIAogQGltcGxlbWVudGF0aW9uIFdLTlNVUkxTZXNzaW9uTG9jYWwKLS0gKENG
RGljdGlvbmFyeVJlZilfY29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0
b3JhZ2VTZW1hbnRpY3M6KENGVVJMUmVxdWVzdFJlZikgcmVxdWVzdAorLSAodm9pZClfZ2V0Q29v
a2llSGVhZGVyc0ZvclRhc2s6KE5TVVJMU2Vzc2lvblRhc2sqKXRhc2sgY29tcGxldGlvbkhhbmRs
ZXI6KHZvaWQgKF4pKENGRGljdGlvbmFyeVJlZikpY29tcGxldGlvbkhhbmRsZXIKIHsKLSAgICBy
ZXR1cm4gV2ViS2l0Ojp3ZWJLaXRDb29raWVTdG9yYWdlQ29weVJlcXVlc3RIZWFkZXJGaWVsZHNG
b3JVUkwobnVsbHB0ciwgQ0ZVUkxSZXF1ZXN0R2V0VVJMKHJlcXVlc3QpKTsKKyAgICBkaXNwYXRj
aF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgICAgICBjb21wbGV0aW9u
SGFuZGxlcihXZWJLaXQ6OndlYktpdENvb2tpZVN0b3JhZ2VDb3B5UmVxdWVzdEhlYWRlckZpZWxk
c0ZvclVSTChudWxscHRyLCAoQ0ZVUkxSZWYpW1t0YXNrIGN1cnJlbnRSZXF1ZXN0XSBVUkxdKSk7
CisgICAgfSk7CiB9CiBAZW5kCiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>226315</attachid>
            <date>2014-03-10 10:14:43 -0700</date>
            <delta_ts>2014-03-10 10:59:36 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-129687-20140310101510.patch</filename>
            <type>text/plain</type>
            <size>3638</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDQ3NWUwYTYxMmE3NGYz
NzcwODMzZmEzNDIzZjRkNzYwYTkzMWRjOC4uYzZmZDIzMzU1NjhmNTcwYzMyNWJiMWExMGJmM2Vh
YjUwODhmMTc4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW1dLMl0gVmlkZW9z
IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBzZXNzaW9uIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTY4NworCisgICAgICAgIFJldmlld2Vk
IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBVcGRhdGUgdGhlIENvb2tpZVN0b3JhZ2VTaGlt
IHRvIHRyYWNrIGNoYW5nZXMgaW4gdW5kZXJseWluZyBuZXR3b3JraW5nIHN0YWNrLgorCisgICAg
ICAgICogU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbToKKyAgICAgICAgKFdlYktpdDo6
Q29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUpOgorICAgICAgICAoLVtXS05TVVJMU2Vzc2lv
bkxvY2FsIF9nZXRDb29raWVIZWFkZXJzRm9yVGFzazpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwog
MjAxNC0wMy0wNCAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFwcGxlLmNvbT4KIAogICAg
ICAgICBGaXggdGhlIGJ1aWxkIGFmdGVyIHIxNjUwOTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQyL1NoYXJlZC9tYWMvQ29va2llU3RvcmFnZVNoaW0ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy
ZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tCmluZGV4IGYwOWZmNGZiNjUzMzAyMmNiOTM5NDZm
N2UyODlmNTljOTZkZmI2ZjIuLjdhZmY3YzQ3ZDc4ZWJmMzEwZmEyZWQ5NjYzNjRkODdkNzUwMTUw
M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29va2llU3RvcmFnZVNo
aW0ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5t
bQpAQCAtMzEsMjUgKzMxLDI0IEBACiAjaW5jbHVkZSAiQ29va2llU3RvcmFnZVNoaW1MaWJyYXJ5
LmgiCiAjaW5jbHVkZSAiTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaCIKICNpbmNsdWRl
ICJOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaCIKLSNpbmNsdWRlIDxXZWJDb3JlL1Nlc3Npb25J
RC5oPgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIldlYlBy
b2Nlc3MuaCIKLSNpbmNsdWRlIDxXZWJDb3JlL1VSTC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU2Vz
c2lvbklELmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb2Z0TGlua2luZy5oPgorI2luY2x1ZGUgPFdl
YkNvcmUvVVJMLmg+CiAjaW5jbHVkZSA8ZGxmY24uaD4KICNpbmNsdWRlIDx3dGYvTWFpblRocmVh
ZC5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZT
dHJpbmcuaD4KIAotdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX0NGVVJMUmVxdWVzdCogQ0ZVUkxSZXF1
ZXN0UmVmOwotCi1TT0ZUX0xJTktfRlJBTUVXT1JLKENGTmV0d29yaykKLVNPRlRfTElOSyhDRk5l
dHdvcmssIENGVVJMUmVxdWVzdEdldFVSTCwgQ0ZVUkxSZWYsIChDRlVSTFJlcXVlc3RSZWYgcmVx
dWVzdCksIChyZXF1ZXN0KSkKLQogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIEBpbnRlcmZh
Y2UgV0tOU1VSTFNlc3Npb25Mb2NhbCA6IE5TT2JqZWN0Ci0tIChDRkRpY3Rpb25hcnlSZWYpIF9j
b3B5Q29va2llc0ZvclJlcXVlc3RVc2luZ0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczoo
Q0ZVUkxSZXF1ZXN0UmVmKSByZXF1ZXN0OworLSAodm9pZClfZ2V0Q29va2llSGVhZGVyc0ZvclRh
c2s6KE5TVVJMU2Vzc2lvblRhc2sqKXRhc2sgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKENG
RGljdGlvbmFyeVJlZikpY29tcGxldGlvbkhhbmRsZXI7CitAZW5kCisKK0BpbnRlcmZhY2UgTlNV
UkxTZXNzaW9uKFdlYktpdEludGVybmFscykKKy0gKE5TVVJMUmVxdWVzdCopY3VycmVudFJlcXVl
c3Q7CiBAZW5kCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtODcsMTEgKzg2LDExIEBAIHZvaWQg
Q29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUoKQogICAgIGlmICghX19OU1VSTFNlc3Npb25M
b2NhbENsYXNzKQogICAgICAgICByZXR1cm47CiAKLSAgICBNZXRob2Qgb3JpZ2luYWwgPSBjbGFz
c19nZXRJbnN0YW5jZU1ldGhvZChfX05TVVJMU2Vzc2lvbkxvY2FsQ2xhc3MsIEBzZWxlY3Rvcihf
Y29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6
KSk7CisgICAgTWV0aG9kIG9yaWdpbmFsID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2QoX19OU1VS
TFNlc3Npb25Mb2NhbENsYXNzLCBAc2VsZWN0b3IoX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOmNv
bXBsZXRpb25IYW5kbGVyOikpOwogICAgIGlmICghb3JpZ2luYWwpCiAgICAgICAgIHJldHVybjsK
IAotICAgIE1ldGhvZCByZXBsYWNlbWVudCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKFtXS05T
VVJMU2Vzc2lvbkxvY2FsIGNsYXNzXSwgQHNlbGVjdG9yKF9jb3B5Q29va2llc0ZvclJlcXVlc3RV
c2luZ0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczopKTsKKyAgICBNZXRob2QgcmVwbGFj
ZW1lbnQgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbV0tOU1VSTFNlc3Npb25Mb2NhbCBjbGFz
c10sIEBzZWxlY3RvcihfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6Y29tcGxldGlvbkhhbmRsZXI6
KSk7CiAgICAgQVNTRVJUKHJlcGxhY2VtZW50KTsKIAogICAgIG1ldGhvZF9leGNoYW5nZUltcGxl
bWVudGF0aW9ucyhvcmlnaW5hbCwgcmVwbGFjZW1lbnQpOwpAQCAtMTAwLDkgKzk5LDExIEBAIHZv
aWQgQ29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUoKQogfQogCiBAaW1wbGVtZW50YXRpb24g
V0tOU1VSTFNlc3Npb25Mb2NhbAotLSAoQ0ZEaWN0aW9uYXJ5UmVmKV9jb3B5Q29va2llc0ZvclJl
cXVlc3RVc2luZ0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczooQ0ZVUkxSZXF1ZXN0UmVm
KSByZXF1ZXN0CistICh2b2lkKV9nZXRDb29raWVIZWFkZXJzRm9yVGFzazooTlNVUkxTZXNzaW9u
VGFzayopdGFzayBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQ0ZEaWN0aW9uYXJ5UmVmKSlj
b21wbGV0aW9uSGFuZGxlcgogewotICAgIHJldHVybiBXZWJLaXQ6OndlYktpdENvb2tpZVN0b3Jh
Z2VDb3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTChudWxscHRyLCBDRlVSTFJlcXVlc3RHZXRV
UkwocmVxdWVzdCkpOworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl
KCksIF57CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdlYktpdDo6d2ViS2l0Q29va2llU3Rv
cmFnZUNvcHlSZXF1ZXN0SGVhZGVyRmllbGRzRm9yVVJMKG51bGxwdHIsIChDRlVSTFJlZilbW3Rh
c2sgY3VycmVudFJlcXVlc3RdIFVSTF0pKTsKKyAgICB9KTsKIH0KIEBlbmQKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228221</attachid>
            <date>2014-03-31 17:10:58 -0700</date>
            <delta_ts>2014-04-04 15:41:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-129687-20140331171038.patch</filename>
            <type>text/plain</type>
            <size>3864</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGIwYTMxMWFkOTA5MjMz
ZjNhMzRkZjQwZjIzZWVjOWM2NTZhYmY5OS4uOTE3OTRjYjU1YjZhODI0MDlhMDJiOWZmZjQ5YWU0
ZTI0NjdhODUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW1dLMl0gVmlkZW9z
IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBzZXNzaW9uIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTY4NworCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgQ29va2llU3RvcmFnZVNo
aW0gdG8gdHJhY2sgY2hhbmdlcyBpbiB1bmRlcmx5aW5nIG5ldHdvcmtpbmcgc3RhY2suCisKKyAg
ICAgICAgKiBTaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tOgorICAgICAgICAoV2ViS2l0
OjpDb29raWVTdG9yYWdlU2hpbTo6aW5pdGlhbGl6ZSk6CisgICAgICAgICgtW1dLTlNVUkxTZXNz
aW9uTG9jYWwgX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOmNvbXBsZXRpb25IYW5kbGVyOl0pOgor
CiAyMDE0LTAzLTMxICBQZXRlciBNb2xuYXIgIDxwbW9sbmFyLnUtc3plZ2VkQHBhcnRuZXIuc2Ft
c3VuZy5jb20+CiAKICAgICAgICAgQnVpbGRmaXggYWZ0ZXIgcjE2NjQ5Ny4KZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29va2llU3RvcmFnZVNoaW0ubW0gYi9Tb3VyY2Uv
V2ViS2l0Mi9TaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tCmluZGV4IGYwOWZmNGZiNjUz
MzAyMmNiOTM5NDZmN2UyODlmNTljOTZkZmI2ZjIuLmVhMWY4YjI3ZjllNmQzN2ExYWU1MTRlMWJi
OGVmZWMzMjA1NGYzMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29v
a2llU3RvcmFnZVNoaW0ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9Db29raWVT
dG9yYWdlU2hpbS5tbQpAQCAtMzEsMTEgKzMxLDExIEBACiAjaW5jbHVkZSAiQ29va2llU3RvcmFn
ZVNoaW1MaWJyYXJ5LmgiCiAjaW5jbHVkZSAiTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu
aCIKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24uaCIKLSNpbmNsdWRlIDxXZWJD
b3JlL1Nlc3Npb25JRC5oPgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2lu
Y2x1ZGUgIldlYlByb2Nlc3MuaCIKLSNpbmNsdWRlIDxXZWJDb3JlL1VSTC5oPgorI2luY2x1ZGUg
PFdlYkNvcmUvU2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Tb2Z0TGlua2luZy5oPgor
I2luY2x1ZGUgPFdlYkNvcmUvVVJMLmg+CiAjaW5jbHVkZSA8ZGxmY24uaD4KICNpbmNsdWRlIDx3
dGYvTWFpblRocmVhZC5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTUwLDYgKzUw
LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIEBpbnRlcmZhY2UgV0tOU1VSTFNlc3Np
b25Mb2NhbCA6IE5TT2JqZWN0CiAtIChDRkRpY3Rpb25hcnlSZWYpIF9jb3B5Q29va2llc0ZvclJl
cXVlc3RVc2luZ0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczooQ0ZVUkxSZXF1ZXN0UmVm
KSByZXF1ZXN0OworLSAodm9pZClfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6KE5TVVJMU2Vzc2lv
blRhc2sqKXRhc2sgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKENGRGljdGlvbmFyeVJlZikp
Y29tcGxldGlvbkhhbmRsZXI7CiBAZW5kCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtODcsMTQg
Kzg4LDE3IEBAIHZvaWQgQ29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUoKQogICAgIGlmICgh
X19OU1VSTFNlc3Npb25Mb2NhbENsYXNzKQogICAgICAgICByZXR1cm47CiAKLSAgICBNZXRob2Qg
b3JpZ2luYWwgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChfX05TVVJMU2Vzc2lvbkxvY2FsQ2xh
c3MsIEBzZWxlY3RvcihfY29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0
b3JhZ2VTZW1hbnRpY3M6KSk7Ci0gICAgaWYgKCFvcmlnaW5hbCkKLSAgICAgICAgcmV0dXJuOwot
Ci0gICAgTWV0aG9kIHJlcGxhY2VtZW50ID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2QoW1dLTlNV
UkxTZXNzaW9uTG9jYWwgY2xhc3NdLCBAc2VsZWN0b3IoX2NvcHlDb29raWVzRm9yUmVxdWVzdFVz
aW5nQWxsQXBwcm9wcmlhdGVTdG9yYWdlU2VtYW50aWNzOikpOwotICAgIEFTU0VSVChyZXBsYWNl
bWVudCk7Ci0KLSAgICBtZXRob2RfZXhjaGFuZ2VJbXBsZW1lbnRhdGlvbnMob3JpZ2luYWwsIHJl
cGxhY2VtZW50KTsKKyAgICBpZiAoTWV0aG9kIG9yaWdpbmFsID0gY2xhc3NfZ2V0SW5zdGFuY2VN
ZXRob2QoX19OU1VSTFNlc3Npb25Mb2NhbENsYXNzLCBAc2VsZWN0b3IoX2NvcHlDb29raWVzRm9y
UmVxdWVzdFVzaW5nQWxsQXBwcm9wcmlhdGVTdG9yYWdlU2VtYW50aWNzOikpKSB7CisgICAgICAg
IE1ldGhvZCByZXBsYWNlbWVudCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKFtXS05TVVJMU2Vz
c2lvbkxvY2FsIGNsYXNzXSwgQHNlbGVjdG9yKF9jb3B5Q29va2llc0ZvclJlcXVlc3RVc2luZ0Fs
bEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczopKTsKKyAgICAgICAgQVNTRVJUKHJlcGxhY2Vt
ZW50KTsKKyAgICAgICAgbWV0aG9kX2V4Y2hhbmdlSW1wbGVtZW50YXRpb25zKG9yaWdpbmFsLCBy
ZXBsYWNlbWVudCk7CisgICAgfQorCisgICAgaWYgKE1ldGhvZCBvcmlnaW5hbCA9IGNsYXNzX2dl
dEluc3RhbmNlTWV0aG9kKF9fTlNVUkxTZXNzaW9uTG9jYWxDbGFzcywgQHNlbGVjdG9yKF9nZXRD
b29raWVIZWFkZXJzRm9yVGFzazpjb21wbGV0aW9uSGFuZGxlcjopKSkgeworICAgICAgICBNZXRo
b2QgcmVwbGFjZW1lbnQgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbV0tOU1VSTFNlc3Npb25M
b2NhbCBjbGFzc10sIEBzZWxlY3RvcihfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6Y29tcGxldGlv
bkhhbmRsZXI6KSk7CisgICAgICAgIEFTU0VSVChyZXBsYWNlbWVudCk7CisgICAgICAgIG1ldGhv
ZF9leGNoYW5nZUltcGxlbWVudGF0aW9ucyhvcmlnaW5hbCwgcmVwbGFjZW1lbnQpOworICAgIH0K
IH0KIAogfQpAQCAtMTA0LDYgKzEwOCwxNSBAQCB2b2lkIENvb2tpZVN0b3JhZ2VTaGltOjppbml0
aWFsaXplKCkKIHsKICAgICByZXR1cm4gV2ViS2l0Ojp3ZWJLaXRDb29raWVTdG9yYWdlQ29weVJl
cXVlc3RIZWFkZXJGaWVsZHNGb3JVUkwobnVsbHB0ciwgQ0ZVUkxSZXF1ZXN0R2V0VVJMKHJlcXVl
c3QpKTsKIH0KKworLSAodm9pZClfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6KE5TVVJMU2Vzc2lv
blRhc2sqKXRhc2sgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKENGRGljdGlvbmFyeVJlZikp
Y29tcGxldGlvbkhhbmRsZXIKK3sKKyNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVS
U0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dl
dF9tYWluX3F1ZXVlKCksIF57CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdlYktpdDo6d2Vi
S2l0Q29va2llU3RvcmFnZUNvcHlSZXF1ZXN0SGVhZGVyRmllbGRzRm9yVVJMKG51bGxwdHIsIChD
RlVSTFJlZilbW3Rhc2sgY3VycmVudFJlcXVlc3RdIFVSTF0pKTsKKyAgICB9KTsKKyNlbmRpZgor
fQogQGVuZAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykK
</data>
<flag name="review"
          id="252510"
          type_id="1"
          status="+"
          setter="eric.carlson"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228309</attachid>
            <date>2014-04-01 12:54:23 -0700</date>
            <delta_ts>2014-04-04 14:55:12 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-129687-20140401125403.patch</filename>
            <type>text/plain</type>
            <size>3910</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGIwYTMxMWFkOTA5MjMz
ZjNhMzRkZjQwZjIzZWVjOWM2NTZhYmY5OS4uYmUxNTlkNzI3NjU4NmZlNTViMzcxOGQ4MzA4OWY4
ZDc3MmNkMmZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW1dLMl0gVmlkZW9z
IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBzZXNzaW9uIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTY4NworCisgICAgICAgIFJldmlld2Vk
IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBVcGRhdGUgdGhlIENvb2tpZVN0b3JhZ2VTaGlt
IHRvIHRyYWNrIGNoYW5nZXMgaW4gdW5kZXJseWluZyBuZXR3b3JraW5nIHN0YWNrLgorCisgICAg
ICAgICogU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbToKKyAgICAgICAgKFdlYktpdDo6
Q29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUpOgorICAgICAgICAoLVtXS05TVVJMU2Vzc2lv
bkxvY2FsIF9nZXRDb29raWVIZWFkZXJzRm9yVGFzazpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwog
MjAxNC0wMy0zMSAgUGV0ZXIgTW9sbmFyICA8cG1vbG5hci51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1
bmcuY29tPgogCiAgICAgICAgIEJ1aWxkZml4IGFmdGVyIHIxNjY0OTcuCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tIGIvU291cmNlL1dl
YktpdDIvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbQppbmRleCBmMDlmZjRmYjY1MzMw
MjJjYjkzOTQ2ZjdlMjg5ZjU5Yzk2ZGZiNmYyLi4xYWU2M2ExMDFkM2NhOTY3ZWY1MjE4MzEyNDY2
YjljOGQzODJmODA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0Nvb2tp
ZVN0b3JhZ2VTaGltLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29va2llU3Rv
cmFnZVNoaW0ubW0KQEAgLTMxLDExICszMSwxMSBAQAogI2luY2x1ZGUgIkNvb2tpZVN0b3JhZ2VT
aGltTGlicmFyeS5oIgogI2luY2x1ZGUgIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgi
CiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmgiCi0jaW5jbHVkZSA8V2ViQ29y
ZS9TZXNzaW9uSUQuaD4KICNpbmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKICNpbmNs
dWRlICJXZWJQcm9jZXNzLmgiCi0jaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KKyNpbmNsdWRlIDxX
ZWJDb3JlL1Nlc3Npb25JRC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU29mdExpbmtpbmcuaD4KKyNp
bmNsdWRlIDxXZWJDb3JlL1VSTC5oPgogI2luY2x1ZGUgPGRsZmNuLmg+CiAjaW5jbHVkZSA8d3Rm
L01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CkBAIC01MCw2ICs1MCw3
IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBAaW50ZXJmYWNlIFdLTlNVUkxTZXNzaW9u
TG9jYWwgOiBOU09iamVjdAogLSAoQ0ZEaWN0aW9uYXJ5UmVmKSBfY29weUNvb2tpZXNGb3JSZXF1
ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6KENGVVJMUmVxdWVzdFJlZikg
cmVxdWVzdDsKKy0gKHZvaWQpX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOihOU1VSTFNlc3Npb25U
YXNrKil0YXNrIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShDRkRpY3Rpb25hcnlSZWYpKWNv
bXBsZXRpb25IYW5kbGVyOwogQGVuZAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTg3LDE0ICs4
OCwxNyBAQCB2b2lkIENvb2tpZVN0b3JhZ2VTaGltOjppbml0aWFsaXplKCkKICAgICBpZiAoIV9f
TlNVUkxTZXNzaW9uTG9jYWxDbGFzcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgTWV0aG9kIG9y
aWdpbmFsID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2QoX19OU1VSTFNlc3Npb25Mb2NhbENsYXNz
LCBAc2VsZWN0b3IoX2NvcHlDb29raWVzRm9yUmVxdWVzdFVzaW5nQWxsQXBwcm9wcmlhdGVTdG9y
YWdlU2VtYW50aWNzOikpOwotICAgIGlmICghb3JpZ2luYWwpCi0gICAgICAgIHJldHVybjsKLQot
ICAgIE1ldGhvZCByZXBsYWNlbWVudCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKFtXS05TVVJM
U2Vzc2lvbkxvY2FsIGNsYXNzXSwgQHNlbGVjdG9yKF9jb3B5Q29va2llc0ZvclJlcXVlc3RVc2lu
Z0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczopKTsKLSAgICBBU1NFUlQocmVwbGFjZW1l
bnQpOwotCi0gICAgbWV0aG9kX2V4Y2hhbmdlSW1wbGVtZW50YXRpb25zKG9yaWdpbmFsLCByZXBs
YWNlbWVudCk7CisgICAgaWYgKE1ldGhvZCBvcmlnaW5hbCA9IGNsYXNzX2dldEluc3RhbmNlTWV0
aG9kKF9fTlNVUkxTZXNzaW9uTG9jYWxDbGFzcywgQHNlbGVjdG9yKF9jb3B5Q29va2llc0ZvclJl
cXVlc3RVc2luZ0FsbEFwcHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczopKSkgeworICAgICAgICBN
ZXRob2QgcmVwbGFjZW1lbnQgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChbV0tOU1VSTFNlc3Np
b25Mb2NhbCBjbGFzc10sIEBzZWxlY3RvcihfY29weUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxB
cHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6KSk7CisgICAgICAgIEFTU0VSVChyZXBsYWNlbWVu
dCk7CisgICAgICAgIG1ldGhvZF9leGNoYW5nZUltcGxlbWVudGF0aW9ucyhvcmlnaW5hbCwgcmVw
bGFjZW1lbnQpOworICAgIH0KKworICAgIGlmIChNZXRob2Qgb3JpZ2luYWwgPSBjbGFzc19nZXRJ
bnN0YW5jZU1ldGhvZChfX05TVVJMU2Vzc2lvbkxvY2FsQ2xhc3MsIEBzZWxlY3RvcihfZ2V0Q29v
a2llSGVhZGVyc0ZvclRhc2s6Y29tcGxldGlvbkhhbmRsZXI6KSkpIHsKKyAgICAgICAgTWV0aG9k
IHJlcGxhY2VtZW50ID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2QoW1dLTlNVUkxTZXNzaW9uTG9j
YWwgY2xhc3NdLCBAc2VsZWN0b3IoX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOmNvbXBsZXRpb25I
YW5kbGVyOikpOworICAgICAgICBBU1NFUlQocmVwbGFjZW1lbnQpOworICAgICAgICBtZXRob2Rf
ZXhjaGFuZ2VJbXBsZW1lbnRhdGlvbnMob3JpZ2luYWwsIHJlcGxhY2VtZW50KTsKKyAgICB9CiB9
CiAKIH0KQEAgLTEwNCw2ICsxMDgsMTggQEAgdm9pZCBDb29raWVTdG9yYWdlU2hpbTo6aW5pdGlh
bGl6ZSgpCiB7CiAgICAgcmV0dXJuIFdlYktpdDo6d2ViS2l0Q29va2llU3RvcmFnZUNvcHlSZXF1
ZXN0SGVhZGVyRmllbGRzRm9yVVJMKG51bGxwdHIsIENGVVJMUmVxdWVzdEdldFVSTChyZXF1ZXN0
KSk7CiB9CisKKy0gKHZvaWQpX2dldENvb2tpZUhlYWRlcnNGb3JUYXNrOihOU1VSTFNlc3Npb25U
YXNrKil0YXNrIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShDRkRpY3Rpb25hcnlSZWYpKWNv
bXBsZXRpb25IYW5kbGVyCit7CisjaWYgUExBVEZPUk0oSU9TKSB8fCBfX01BQ19PU19YX1ZFUlNJ
T05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyAgICBpZiAoIWNvbXBsZXRpb25IYW5kbGVyKQorICAg
ICAgICByZXR1cm47CisKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1
ZSgpLCBeeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXZWJLaXQ6OndlYktpdENvb2tpZVN0
b3JhZ2VDb3B5UmVxdWVzdEhlYWRlckZpZWxkc0ZvclVSTChudWxscHRyLCAoQ0ZVUkxSZWYpW1t0
YXNrIGN1cnJlbnRSZXF1ZXN0XSBVUkxdKSk7CisgICAgfSk7CisjZW5kaWYKK30KIEBlbmQKIAog
I2VuZGlmIC8vIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>228615</attachid>
            <date>2014-04-04 14:03:02 -0700</date>
            <delta_ts>2014-04-04 16:15:37 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-129687-20140404140241.patch</filename>
            <type>text/plain</type>
            <size>4050</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGIwYTMxMWFkOTA5MjMz
ZjNhMzRkZjQwZjIzZWVjOWM2NTZhYmY5OS4uYmUxNTlkNzI3NjU4NmZlNTViMzcxOGQ4MzA4OWY4
ZDc3MmNkMmZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAzLTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdW1dLMl0gVmlkZW9z
IGRvIG5vdCBoYXZlIGFjY2VzcyB0byBzZXNzaW9uIGNvb2tpZXMKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTY4NworCisgICAgICAgIFJldmlld2Vk
IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBVcGRhdGUgdGhlIENvb2tpZVN0b3JhZ2VTaGlt
IHRvIHRyYWNrIGNoYW5nZXMgaW4gdW5kZXJseWluZyBuZXR3b3JraW5nIHN0YWNrLgorCisgICAg
ICAgICogU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbToKKyAgICAgICAgKFdlYktpdDo6
Q29va2llU3RvcmFnZVNoaW06OmluaXRpYWxpemUpOgorICAgICAgICAoLVtXS05TVVJMU2Vzc2lv
bkxvY2FsIF9nZXRDb29raWVIZWFkZXJzRm9yVGFzazpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwog
MjAxNC0wMy0zMSAgUGV0ZXIgTW9sbmFyICA8cG1vbG5hci51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1
bmcuY29tPgogCiAgICAgICAgIEJ1aWxkZml4IGFmdGVyIHIxNjY0OTcuCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0Nvb2tpZVN0b3JhZ2VTaGltLm1tIGIvU291cmNlL1dl
YktpdDIvU2hhcmVkL21hYy9Db29raWVTdG9yYWdlU2hpbS5tbQppbmRleCBmMDlmZjRmYjY1MzMw
MjJjYjkzOTQ2ZjdlMjg5ZjU5Yzk2ZGZiNmYyLi40MmJlMTY3M2JlNzQxMGI3NDA3MWQ2MzFjYzAx
MDc2MmMwOWFhYTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0Nvb2tp
ZVN0b3JhZ2VTaGltLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvQ29va2llU3Rv
cmFnZVNoaW0ubW0KQEAgLTMxLDExICszMSwxMSBAQAogI2luY2x1ZGUgIkNvb2tpZVN0b3JhZ2VT
aGltTGlicmFyeS5oIgogI2luY2x1ZGUgIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmgi
CiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmgiCi0jaW5jbHVkZSA8V2ViQ29y
ZS9TZXNzaW9uSUQuaD4KICNpbmNsdWRlICJXZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKICNpbmNs
dWRlICJXZWJQcm9jZXNzLmgiCi0jaW5jbHVkZSA8V2ViQ29yZS9VUkwuaD4KKyNpbmNsdWRlIDxX
ZWJDb3JlL1Nlc3Npb25JRC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU29mdExpbmtpbmcuaD4KKyNp
bmNsdWRlIDxXZWJDb3JlL1VSTC5oPgogI2luY2x1ZGUgPGRsZmNuLmg+CiAjaW5jbHVkZSA8d3Rm
L01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CkBAIC01MCw2ICs1MCw5
IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBAaW50ZXJmYWNlIFdLTlNVUkxTZXNzaW9u
TG9jYWwgOiBOU09iamVjdAogLSAoQ0ZEaWN0aW9uYXJ5UmVmKSBfY29weUNvb2tpZXNGb3JSZXF1
ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6KENGVVJMUmVxdWVzdFJlZikg
cmVxdWVzdDsKKyNpZiBQTEFURk9STShJT1MpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVR
VUlSRUQgPj0gMTA5MAorLSAodm9pZClfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6KE5TVVJMU2Vz
c2lvblRhc2sqKXRhc2sgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKENGRGljdGlvbmFyeVJl
ZikpY29tcGxldGlvbkhhbmRsZXI7CisjZW5kaWYKIEBlbmQKIAogbmFtZXNwYWNlIFdlYktpdCB7
CkBAIC04NywxNCArOTAsMTkgQEAgdm9pZCBDb29raWVTdG9yYWdlU2hpbTo6aW5pdGlhbGl6ZSgp
CiAgICAgaWYgKCFfX05TVVJMU2Vzc2lvbkxvY2FsQ2xhc3MpCiAgICAgICAgIHJldHVybjsKIAot
ICAgIE1ldGhvZCBvcmlnaW5hbCA9IGNsYXNzX2dldEluc3RhbmNlTWV0aG9kKF9fTlNVUkxTZXNz
aW9uTG9jYWxDbGFzcywgQHNlbGVjdG9yKF9jb3B5Q29va2llc0ZvclJlcXVlc3RVc2luZ0FsbEFw
cHJvcHJpYXRlU3RvcmFnZVNlbWFudGljczopKTsKLSAgICBpZiAoIW9yaWdpbmFsKQotICAgICAg
ICByZXR1cm47Ci0KLSAgICBNZXRob2QgcmVwbGFjZW1lbnQgPSBjbGFzc19nZXRJbnN0YW5jZU1l
dGhvZChbV0tOU1VSTFNlc3Npb25Mb2NhbCBjbGFzc10sIEBzZWxlY3RvcihfY29weUNvb2tpZXNG
b3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6KSk7Ci0gICAgQVNT
RVJUKHJlcGxhY2VtZW50KTsKLQotICAgIG1ldGhvZF9leGNoYW5nZUltcGxlbWVudGF0aW9ucyhv
cmlnaW5hbCwgcmVwbGFjZW1lbnQpOworICAgIGlmIChNZXRob2Qgb3JpZ2luYWwgPSBjbGFzc19n
ZXRJbnN0YW5jZU1ldGhvZChfX05TVVJMU2Vzc2lvbkxvY2FsQ2xhc3MsIEBzZWxlY3RvcihfY29w
eUNvb2tpZXNGb3JSZXF1ZXN0VXNpbmdBbGxBcHByb3ByaWF0ZVN0b3JhZ2VTZW1hbnRpY3M6KSkp
IHsKKyAgICAgICAgTWV0aG9kIHJlcGxhY2VtZW50ID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2Qo
W1dLTlNVUkxTZXNzaW9uTG9jYWwgY2xhc3NdLCBAc2VsZWN0b3IoX2NvcHlDb29raWVzRm9yUmVx
dWVzdFVzaW5nQWxsQXBwcm9wcmlhdGVTdG9yYWdlU2VtYW50aWNzOikpOworICAgICAgICBBU1NF
UlQocmVwbGFjZW1lbnQpOworICAgICAgICBtZXRob2RfZXhjaGFuZ2VJbXBsZW1lbnRhdGlvbnMo
b3JpZ2luYWwsIHJlcGxhY2VtZW50KTsKKyAgICB9CisKKyNpZiBQTEFURk9STShJT1MpIHx8IF9f
TUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA5MAorICAgIGlmIChNZXRob2Qgb3Jp
Z2luYWwgPSBjbGFzc19nZXRJbnN0YW5jZU1ldGhvZChfX05TVVJMU2Vzc2lvbkxvY2FsQ2xhc3Ms
IEBzZWxlY3RvcihfZ2V0Q29va2llSGVhZGVyc0ZvclRhc2s6Y29tcGxldGlvbkhhbmRsZXI6KSkp
IHsKKyAgICAgICAgTWV0aG9kIHJlcGxhY2VtZW50ID0gY2xhc3NfZ2V0SW5zdGFuY2VNZXRob2Qo
W1dLTlNVUkxTZXNzaW9uTG9jYWwgY2xhc3NdLCBAc2VsZWN0b3IoX2dldENvb2tpZUhlYWRlcnNG
b3JUYXNrOmNvbXBsZXRpb25IYW5kbGVyOikpOworICAgICAgICBBU1NFUlQocmVwbGFjZW1lbnQp
OworICAgICAgICBtZXRob2RfZXhjaGFuZ2VJbXBsZW1lbnRhdGlvbnMob3JpZ2luYWwsIHJlcGxh
Y2VtZW50KTsKKyAgICB9CisjZW5kaWYKIH0KIAogfQpAQCAtMTA0LDYgKzExMiwxOCBAQCB2b2lk
IENvb2tpZVN0b3JhZ2VTaGltOjppbml0aWFsaXplKCkKIHsKICAgICByZXR1cm4gV2ViS2l0Ojp3
ZWJLaXRDb29raWVTdG9yYWdlQ29weVJlcXVlc3RIZWFkZXJGaWVsZHNGb3JVUkwobnVsbHB0ciwg
Q0ZVUkxSZXF1ZXN0R2V0VVJMKHJlcXVlc3QpKTsKIH0KKworI2lmIFBMQVRGT1JNKElPUykgfHwg
X19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCistICh2b2lkKV9nZXRDb29r
aWVIZWFkZXJzRm9yVGFzazooTlNVUkxTZXNzaW9uVGFzayopdGFzayBjb21wbGV0aW9uSGFuZGxl
cjoodm9pZCAoXikoQ0ZEaWN0aW9uYXJ5UmVmKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIGlm
ICghY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgIHJldHVybjsKKworICAgIGRpc3BhdGNoX2Fz
eW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CisgICAgICAgIGNvbXBsZXRpb25IYW5k
bGVyKFdlYktpdDo6d2ViS2l0Q29va2llU3RvcmFnZUNvcHlSZXF1ZXN0SGVhZGVyRmllbGRzRm9y
VVJMKG51bGxwdHIsIChDRlVSTFJlZilbW3Rhc2sgY3VycmVudFJlcXVlc3RdIFVSTF0pKTsKKyAg
ICB9KTsKK30KKyNlbmRpZgogQGVuZAogCiAjZW5kaWYgLy8gRU5BQkxFKE5FVFdPUktfUFJPQ0VT
UykK
</data>

          </attachment>
      

    </bug>

</bugzilla>