<?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>116969</bug_id>
          
          <creation_ts>2013-05-29 09:48:54 -0700</creation_ts>
          <short_desc>[BlackBerry] Handle Host-Only cookies</short_desc>
          <delta_ts>2013-05-29 11:46:32 -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>WebKit BlackBerry</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>0</everconfirmed>
          <reporter>otcheung</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>commit-queue</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>894986</commentid>
    <comment_count>0</comment_count>
    <who name="">otcheung</who>
    <bug_when>2013-05-29 09:48:54 -0700</bug_when>
    <thetext>Patch to support host-only cookies.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>894994</commentid>
    <comment_count>1</comment_count>
      <attachid>203209</attachid>
    <who name="">otcheung</who>
    <bug_when>2013-05-29 09:57:11 -0700</bug_when>
    <thetext>Created attachment 203209
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>894996</commentid>
    <comment_count>2</comment_count>
      <attachid>203211</attachid>
    <who name="">otcheung</who>
    <bug_when>2013-05-29 09:58:16 -0700</bug_when>
    <thetext>Created attachment 203211
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>894999</commentid>
    <comment_count>3</comment_count>
      <attachid>203211</attachid>
    <who name="Rob Buis">rwlbuis</who>
    <bug_when>2013-05-29 10:07:02 -0700</bug_when>
    <thetext>Comment on attachment 203211
Patch

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

Please try StringBuilder.

&gt; Source/WebCore/platform/blackberry/CookieParser.cpp:270
&gt; +                String defaultHost = &quot;.&quot; + m_defaultCookieHost;

Using StringBuilder should be more efficient.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>895030</commentid>
    <comment_count>4</comment_count>
      <attachid>203220</attachid>
    <who name="">otcheung</who>
    <bug_when>2013-05-29 11:17:56 -0700</bug_when>
    <thetext>Created attachment 203220
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>895031</commentid>
    <comment_count>5</comment_count>
      <attachid>203220</attachid>
    <who name="Rob Buis">rwlbuis</who>
    <bug_when>2013-05-29 11:21:10 -0700</bug_when>
    <thetext>Comment on attachment 203220
Patch

Looks good.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>895107</commentid>
    <comment_count>6</comment_count>
      <attachid>203220</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-05-29 11:46:31 -0700</bug_when>
    <thetext>Comment on attachment 203220
Patch

Clearing flags on attachment: 203220

Committed r150916: &lt;http://trac.webkit.org/changeset/150916&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>895108</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2013-05-29 11:46:32 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>203209</attachid>
            <date>2013-05-29 09:57:11 -0700</date>
            <delta_ts>2013-05-29 09:58:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-116969-20130529125549.patch</filename>
            <type>text/plain</type>
            <size>7918</size>
            <attacher>otcheung</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjczNjc0MWIwODRhY2Yx
ZTBkY2I2NzBkNjY0NDZkNDAzZjg3ZGIzZC4uODkwNmI4ZWE5MmQyOGZhYTM4NTJhMWEzMGNjOWVh
N2NmYjRiZjdlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTA1LTI5ICBPdHRv
IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld
IEhhbmRsZSBIb3N0LU9ubHkgY29va2llcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2OTY5CisKKyAgICAgICAgUFIgMzM4ODA5CisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBo
b3N0LW9ubHkgY29va2llcyAoY29va2llcyB3aXRoIG5vCisgICAgICAgIHNwZWNpZmllZCBkb21h
aW5zKS4gVGhlc2UgY29va2llcyBzaG91bGQgb25seSBiZSByZXR1cm5lZAorICAgICAgICB3aGVu
IHRoZSBob3N0IG1hdGNoZXMgdGhlIGNvb2tpZSBkb21haW4gZXhhY3RseS4KKworICAgICAgICBU
ZXN0ZWQgdXNpbmcgT3BlcmEgYW5kIEJyb3dzZXIgY29va2llIHRlc3Qgc3VpdGUuIFRlc3RlZAor
ICAgICAgICB0aGF0IGhvc3QgY29va2llcyBhcmUgYmVpbmcgc3RvcmVkIGluIGl0J3Mgb3duIG1h
cCB1c2luZworICAgICAgICBXZWIgSW5zcGVjdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vYmxh
Y2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFn
ZXI6OmdldFJhd0Nvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Y2hl
Y2tBbmRUcmVhdENvb2tpZSk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpmaW5k
T3JDcmVhdGVDb29raWVNYXApOgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2ll
UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZVBhcnNlcjo6Q29va2llUGFyc2Vy
KToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZVBhcnNlcjo6cGFyc2VPbmVDb29raWUpOgorICAg
ICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvUGFyc2VkQ29va2llLmg6CisgICAgICAgIChXZWJD
b3JlOjpQYXJzZWRDb29raWU6OmlzSG9zdE9ubHkpOgorICAgICAgICAoUGFyc2VkQ29va2llKToK
KwogMjAxMy0wNS0yOSAgVsOtY3RvciBNYW51ZWwgSsOhcXVleiBMZWFsICA8dmphcXVlekBpZ2Fs
aWEuY29tPgogCiAgICAgICAgIFt0ZXhtYXBdW0dTdHJlYW1lcl1bR1RLXSBDb21wb3NpdGVkIFZp
ZGVvIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy
cnkvQ29va2llTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5
L0Nvb2tpZU1hbmFnZXIuY3BwCmluZGV4IDg2MGI2NTAwMTgxNWU1ZjlhNjhlODMxOTA2ODJlNDI2
NzA2N2M2M2YuLjE3MjI2NTU0M2QzMGUwMzUzYjFmNzMyMmI2ZWQ2ZTVlZmM3OTlkODUgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5j
cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2Vy
LmNwcApAQCAtMSw2ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkgSnVs
aWVuIENoYWZmcmFpeCA8anVsaWVuLmNoYWZmcmFpeEBnbWFpbC5jb20+Ci0gKiBDb3B5cmlnaHQg
KEMpIDIwMTAsIDIwMTEsIDIwMTIgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdo
dHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEsIDIwMTIsIDIwMTMgUmVz
ZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk
aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3
aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg
Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTI5Niw2ICsyOTYsMTQgQEAgdm9pZCBDb29raWVNYW5h
Z2VyOjpnZXRSYXdDb29raWVzKFZlY3RvcjxSZWZQdHI8UGFyc2VkQ29va2llPiA+ICZzdGFja09m
Q29va2llcywKICAgICAgICAgICAgIC8vIEdldCBjb29raWVzIGZyb20gdGhlIG51bGwgZG9tYWlu
IG1hcAogICAgICAgICAgICAgY3VycmVudE1hcC0+Z2V0QWxsQ29va2llcygmY29va2llQ2FuZGlk
YXRlcyk7CiAKKyAgICAgICAgICAgIC8vIEdldCBjb29raWVzIGZyb20gSG9zdC1vbmx5IGNvb2tp
ZXMKKyAgICAgICAgICAgIGlmIChjYW5vbmljYWxJUC5lbXB0eSgpKSB7CisgICAgICAgICAgICAg
ICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gbG9va2luZyBmb3IgaG9zdC1vbmx5IGNvb2tp
ZXMgZm9yIGhvc3QgLSAlcyIsIHJlcXVlc3RVUkwuaG9zdCgpLnV0ZjgoKS5kYXRhKCkpOworICAg
ICAgICAgICAgICAgIENvb2tpZU1hcCogaG9zdE1hcCA9IGN1cnJlbnRNYXAtPmdldFN1YmRvbWFp
bk1hcChyZXF1ZXN0VVJMLmhvc3QoKSk7CisgICAgICAgICAgICAgICAgaWYgKGhvc3RNYXApCisg
ICAgICAgICAgICAgICAgICAgIGhvc3RNYXAtPmdldEFsbENvb2tpZXMoJmNvb2tpZUNhbmRpZGF0
ZXMpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAvLyBHZXQgY29va2llcyBmcm9tIHRo
ZSB2YWxpZCBkb21haW4gbWFwcwogICAgICAgICAgICAgaW50IGkgPSBkZWxpbWl0ZWRIb3N0LnNp
emUoKSAtIDE7CiAgICAgICAgICAgICB3aGlsZSAoaSA+PSAwKSB7CkBAIC00MjIsNiArNDMwLDcg
QEAgdm9pZCBDb29raWVNYW5hZ2VyOjpjaGVja0FuZFRyZWF0Q29va2llKFBhc3NSZWZQdHI8UGFy
c2VkQ29va2llPiBwcnBDYW5kaWRhdGVDb28KICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAg
ICAgIEFTU0VSVChjdXJNYXApOworICAgICAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBh
ZGRpbmcgY29va2llbWFwIC0gJXNcbiIsIGN1ck1hcC0+Z2V0TmFtZSgpLnV0ZjgoKS5kYXRhKCkp
OwogICAgICAgICBhZGRDb29raWVUb01hcChjdXJNYXAsIGNhbmRpZGF0ZUNvb2tpZSwgcG9zdFRv
QmFja2luZ1N0b3JlLCBmaWx0ZXIpOwogICAgIH0KIH0KQEAgLTU0OCw4ICs1NTcsOCBAQCBDb29r
aWVNYXAqIENvb2tpZU1hbmFnZXI6OmZpbmRPckNyZWF0ZUNvb2tpZU1hcChDb29raWVNYXAqIHBy
b3RvY29sTWFwLCBjb25zdCBQYQogICAgIC8vIEV4cGxvZGUgdGhlIGRvbWFpbiB3aXRoIHRoZSAn
LicgZGVsaW1pdGVyCiAgICAgVmVjdG9yPFN0cmluZz4gZGVsaW1pdGVkSG9zdDsKIAotICAgIC8v
IElmIHRoZSBkb21haW4gaXMgYW4gSVAgYWRkcmVzcywgZG9uJ3Qgc3BsaXQgaXQuCi0gICAgaWYg
KGNhbmRpZGF0ZUNvb2tpZS0+ZG9tYWluSXNJUEFkZHJlc3MoKSkKKyAgICAvLyBJZiB0aGUgZG9t
YWluIGlzIGFuIElQIGFkZHJlc3Mgb3IgaXMgYSBob3N0LW9ubHkgZG9tYWluLCBkb24ndCBzcGxp
dCBpdC4KKyAgICBpZiAoY2FuZGlkYXRlQ29va2llLT5kb21haW5Jc0lQQWRkcmVzcygpIHx8IGNh
bmRpZGF0ZUNvb2tpZS0+aXNIb3N0T25seSgpKQogICAgICAgICBkZWxpbWl0ZWRIb3N0LmFwcGVu
ZChjYW5kaWRhdGVDb29raWUtPmRvbWFpbigpKTsKICAgICBlbHNlCiAgICAgICAgIGNhbmRpZGF0
ZUNvb2tpZS0+ZG9tYWluKCkuc3BsaXQoIi4iLCBkZWxpbWl0ZWRIb3N0KTsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llUGFyc2VyLmNwcCBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llUGFyc2VyLmNwcAppbmRleCBh
NzA5YzEyYmEyZGY1NmIzZTc3ZjZmNmRhODVlYmRmNzMzZTFlMDRkLi42Zjg4ODI2MGFjYTBkMGIw
ZTg5YTEzMzM2NDAxOGZmODc1MWY5YzA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vYmxhY2tiZXJyeS9Db29raWVQYXJzZXIuY3BwCkBAIC02MCw4ICs2MCw3IEBAIENvb2tp
ZVBhcnNlcjo6Q29va2llUGFyc2VyKGNvbnN0IEtVUkwmIGRlZmF1bHRDb29raWVVUkwpCiAgICAg
aWYgKCFob3N0RG9tYWluQ2Fub25pY2FsLmVtcHR5KCkpIHsKICAgICAgICAgbV9kZWZhdWx0Q29v
a2llSG9zdCA9IGhvc3REb21haW5DYW5vbmljYWw7CiAgICAgICAgIG1fZGVmYXVsdERvbWFpbklz
SVBBZGRyZXNzID0gdHJ1ZTsKLSAgICB9IGVsc2UKLSAgICAgICAgbV9kZWZhdWx0Q29va2llSG9z
dCA9IG1fZGVmYXVsdENvb2tpZUhvc3Quc3RhcnRzV2l0aCgiLiIpID8gbV9kZWZhdWx0Q29va2ll
SG9zdCA6ICIuIiArIG1fZGVmYXVsdENvb2tpZUhvc3Q7CisgICAgfQogfQogCiBDb29raWVQYXJz
ZXI6On5Db29raWVQYXJzZXIoKQpAQCAtMjY1LDkgKzI2NCwxMCBAQCBQYXNzUmVmUHRyPFBhcnNl
ZENvb2tpZT4gQ29va2llUGFyc2VyOjpwYXJzZU9uZUNvb2tpZShjb25zdCBTdHJpbmcmIGNvb2tp
ZSwgdW5zaQogICAgICAgICAgICAgICAgIGlmIChkb3RQb3NpdGlvbiA9PSBub3RGb3VuZCB8fCBk
b3RQb3NpdGlvbiA9PSBwYXJzZWRWYWx1ZS5sZW5ndGgoKSkKICAgICAgICAgICAgICAgICAgICAg
TE9HX0VSUk9SX0FORF9SRVRVUk4oIkludmFsaWQgY29va2llIGF0dHJpYnV0ZSAlcyAoZG9tYWlu
KTogaXQgZG9lcyBub3QgY29udGFpbiBhbiBlbWJlZGRlZCBkb3QiLCBjb29raWUuYXNjaWkoKS5k
YXRhKCkpOwogCi0gICAgICAgICAgICAgICAgLy8gSWYgdGhlIGRvbWFpbiBkb2VzIG5vdCBzdGFy
dCB3aXRoIGEgZG90LCBhZGQgb25lIGZvciBzZWN1cml0eSBjaGVja3MsCisgICAgICAgICAgICAg
ICAgLy8gSWYgdGhlIGRvbWFpbiBkb2VzIG5vdCBzdGFydCB3aXRoIGEgZG90LCBhZGQgb25lIGZv
ciBzZWN1cml0eSBjaGVja3MgYW5kIHRvIGRpc3Rpbmd1aXNoIGl0IGZyb20gaG9zdC1vbmx5IGRv
bWFpbnMKICAgICAgICAgICAgICAgICAvLyBGb3IgZXhhbXBsZTogYWIuYy5jb20gZG9zZSBub3Qg
ZG9tYWluIG1hdGNoIGIuYy5jb207CiAgICAgICAgICAgICAgICAgU3RyaW5nIHJlYWxEb21haW4g
PSBwYXJzZWRWYWx1ZVswXSA9PSAnLicgPyBwYXJzZWRWYWx1ZSA6ICIuIiArIHBhcnNlZFZhbHVl
OworICAgICAgICAgICAgICAgIFN0cmluZyBkZWZhdWx0SG9zdCA9ICIuIiArIG1fZGVmYXVsdENv
b2tpZUhvc3Q7CiAKICAgICAgICAgICAgICAgICAvLyBUcnkgdG8gcmV0dXJuIGFuIGNhbm9uaWNh
bCBpcCBhZGRyZXNzIGlmIHRoZSBkb21haW4gaXMgYW4gaXAKIApAQCAtMjc4LDcgKzI3OCw3IEBA
IFBhc3NSZWZQdHI8UGFyc2VkQ29va2llPiBDb29raWVQYXJzZXI6OnBhcnNlT25lQ29va2llKGNv
bnN0IFN0cmluZyYgY29va2llLCB1bnNpCiAgICAgICAgICAgICAgICAgLy8gV2UgZGV0ZXJtaW5l
IHRoZSBjYW5vbmljYWwgSVAgZm9ybWF0IGJlZm9yZSBjb21wYXJpbmcgYmVjYXVzZSBJUHY2IGNv
dWxkIGJlIHJlcHJlc2VudGVkIGluIG11bHRpcGxlIGZvcm1hdHMKICAgICAgICAgICAgICAgICBp
ZiAobV9kZWZhdWx0RG9tYWluSXNJUEFkZHJlc3MpIHsKICAgICAgICAgICAgICAgICAgICAgU3Ry
aW5nIHJlYWxEb21haW5DYW5vbmljYWwgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Z2V0Q2Fub25p
Y2FsSVBGb3JtYXQocmVhbERvbWFpbik7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChyZWFsRG9t
YWluQ2Fub25pY2FsLmlzRW1wdHkoKSB8fCByZWFsRG9tYWluQ2Fub25pY2FsICE9IG1fZGVmYXVs
dENvb2tpZUhvc3QpCisgICAgICAgICAgICAgICAgICAgIGlmIChyZWFsRG9tYWluQ2Fub25pY2Fs
LmlzRW1wdHkoKSB8fCByZWFsRG9tYWluQ2Fub25pY2FsICE9IGRlZmF1bHRIb3N0KQogICAgICAg
ICAgICAgICAgICAgICAgICAgTE9HX0VSUk9SX0FORF9SRVRVUk4oIkludmFsaWQgY29va2llIGF0
dHJpYnV0ZSAlcyAoZG9tYWluKTogZG9tYWluIGlzIElQIGJ1dCBkb2VzIG5vdCBtYXRjaCBob3N0
J3MgSVAiLCBjb29raWUuYXNjaWkoKS5kYXRhKCkpOwogICAgICAgICAgICAgICAgICAgICByZWFs
RG9tYWluID0gcmVhbERvbWFpbkNhbm9uaWNhbDsKICAgICAgICAgICAgICAgICAgICAgaXNJUEFk
ZHJlc3MgPSB0cnVlOwpAQCAtMjg4LDEwICsyODgsOSBAQCBQYXNzUmVmUHRyPFBhcnNlZENvb2tp
ZT4gQ29va2llUGFyc2VyOjpwYXJzZU9uZUNvb2tpZShjb25zdCBTdHJpbmcmIGNvb2tpZSwgdW5z
aQogICAgICAgICAgICAgICAgICAgICAvLyBhZGQgYSAiLiIgYXQgYmVnaW5uaW5nIG9mIGhvc3Qg
bmFtZSwgYmVjYXVzZSBpdCBjYW4gaGFuZGxlIG1hbnkgY2FzZXMgc3VjaCBhcwogICAgICAgICAg
ICAgICAgICAgICAvLyBhLmIuY29tIG1hdGNoZXMgYi5jb20sIGEuYi5jb20gbWF0Y2hlcyAuQi5j
b20gYW5kIGEuYi5jb20gbWF0Y2hlcyAuQS5iLkNvbQogICAgICAgICAgICAgICAgICAgICAvLyBh
bmQgc28gb24uCi0gICAgICAgICAgICAgICAgICAgIC8vIFdlIGFsc28gaGF2ZSB0byBtYWtlIGEg
c3BlY2lhbCBjYXNlIGZvciBJUCBhZGRyZXNzZXMuIElmIGEgd2Vic2l0ZSB0cmllcyB0byBzZXQK
LSAgICAgICAgICAgICAgICAgICAgLy8gYSBjb29raWUgdG8gNjEuOTcsIHRoYXQgZG9tYWluIGlz
IG5vdCBhbiBJUCBhZGRyZXNzIGFuZCB3aWxsIGVuZCB3aXRoIHRoZSBtX2RlZmF1bHRDb29raWVI
b3N0Ci0gICAgICAgICAgICAgICAgICAgIGlmICghbV9kZWZhdWx0Q29va2llSG9zdC5lbmRzV2l0
aChyZWFsRG9tYWluLCBmYWxzZSkpCisgICAgICAgICAgICAgICAgICAgIGlmICghZGVmYXVsdEhv
c3QuZW5kc1dpdGgocmVhbERvbWFpbiwgZmFsc2UpKQogICAgICAgICAgICAgICAgICAgICAgICAg
TE9HX0VSUk9SX0FORF9SRVRVUk4oIkludmFsaWQgY29va2llIGF0dHJpYnV0ZSAlcyAoZG9tYWlu
KTogaXQgZG9lcyBub3QgZG9tYWluIG1hdGNoIHRoZSBob3N0IiwgY29va2llLmFzY2lpKCkuZGF0
YSgpKTsKKwogICAgICAgICAgICAgICAgICAgICAvLyBXZSBzaG91bGQgY2hlY2sgZm9yIGFuIGVt
YmVkZGVkIGRvdCBpbiB0aGUgcG9ydGlvbiBvZiBzdHJpbmcgaW4gdGhlIGhvc3Qgbm90IGluIHRo
ZSBkb21haW4KICAgICAgICAgICAgICAgICAgICAgLy8gYnV0IHRvIG1hdGNoIGZpcmVmb3ggYmVo
YXZpb3VyIHdlIGRvIG5vdC4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
YmxhY2tiZXJyeS9QYXJzZWRDb29raWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNr
YmVycnkvUGFyc2VkQ29va2llLmgKaW5kZXggMWJjY2VjNmE5ZWM5NTVjYzcwYjFmN2RhZGVmOTc5
ZjJjMDkyOTJkYi4uYmNjNzkxNjhiZGZmYmIwY2Y0YzhmYjJhNTQ5NzlkMGJhOTYxODBjZiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9QYXJzZWRDb29raWUu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1BhcnNlZENvb2tpZS5o
CkBAIC04NSw2ICs4NSw4IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNTZXNzaW9uKCkgY29uc3Qg
eyByZXR1cm4gbV9pc1Nlc3Npb247IH0KIAorICAgIGJvb2wgaXNIb3N0T25seSgpIGNvbnN0IHsg
cmV0dXJuICFtX2RvbWFpbi5zdGFydHNXaXRoKCIuIik7IH0KKwogICAgIGJvb2wgaGFzRXhwaXJl
ZCgpIGNvbnN0OwogICAgIGJvb2wgaXNGb3JjZUV4cGlyZWQoKSBjb25zdCB7IHJldHVybiBtX2lz
Rm9yY2VFeHBpcmVkOyB9CiAgICAgYm9vbCBpc1VuZGVyU2l6ZUxpbWl0KCkgY29uc3Q7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>203211</attachid>
            <date>2013-05-29 09:58:16 -0700</date>
            <delta_ts>2013-05-29 11:17:52 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-116969-20130529125654.patch</filename>
            <type>text/plain</type>
            <size>7961</size>
            <attacher>otcheung</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjczNjc0MWIwODRhY2Yx
ZTBkY2I2NzBkNjY0NDZkNDAzZjg3ZGIzZC4uMWU3ZTkzNmYwYjJlMDIxYjM2NWU0YzdmZmI2NzFj
NTgwOGIwYWJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA1LTI5ICBPdHRv
IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld
IEhhbmRsZSBIb3N0LU9ubHkgY29va2llcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2OTY5CisKKyAgICAgICAgUFIgMzM4ODA5CisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IFJldmlld2VkIGJ5
IEpvZSBNYXNvbi4KKworICAgICAgICBBZGRpbmcgc3VwcG9ydCBmb3IgaG9zdC1vbmx5IGNvb2tp
ZXMgKGNvb2tpZXMgd2l0aCBubworICAgICAgICBzcGVjaWZpZWQgZG9tYWlucykuIFRoZXNlIGNv
b2tpZXMgc2hvdWxkIG9ubHkgYmUgcmV0dXJuZWQKKyAgICAgICAgd2hlbiB0aGUgaG9zdCBtYXRj
aGVzIHRoZSBjb29raWUgZG9tYWluIGV4YWN0bHkuCisKKyAgICAgICAgVGVzdGVkIHVzaW5nIE9w
ZXJhIGFuZCBCcm93c2VyIGNvb2tpZSB0ZXN0IHN1aXRlLiBUZXN0ZWQKKyAgICAgICAgdGhhdCBo
b3N0IGNvb2tpZXMgYXJlIGJlaW5nIHN0b3JlZCBpbiBpdCdzIG93biBtYXAgdXNpbmcKKyAgICAg
ICAgV2ViIEluc3BlY3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2ll
TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpnZXRSYXdDb29r
aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OmNoZWNrQW5kVHJlYXRDb29r
aWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6ZmluZE9yQ3JlYXRlQ29va2ll
TWFwKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpDb29raWVQYXJzZXI6OkNvb2tpZVBhcnNlcik6CisgICAgICAgIChX
ZWJDb3JlOjpDb29raWVQYXJzZXI6OnBhcnNlT25lQ29va2llKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9ibGFja2JlcnJ5L1BhcnNlZENvb2tpZS5oOgorICAgICAgICAoV2ViQ29yZTo6UGFyc2VkQ29v
a2llOjppc0hvc3RPbmx5KToKKyAgICAgICAgKFBhcnNlZENvb2tpZSk6CisKIDIwMTMtMDUtMjkg
IFbDrWN0b3IgTWFudWVsIErDoXF1ZXogTGVhbCAgPHZqYXF1ZXpAaWdhbGlhLmNvbT4KIAogICAg
ICAgICBbdGV4bWFwXVtHU3RyZWFtZXJdW0dUS10gQ29tcG9zaXRlZCBWaWRlbyBzdXBwb3J0CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFn
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2Vy
LmNwcAppbmRleCA4NjBiNjUwMDE4MTVlNWY5YTY4ZTgzMTkwNjgyZTQyNjcwNjdjNjNmLi4xNzIy
NjU1NDNkMzBlMDM1M2IxZjczMjJiNmVkNmU1ZWZjNzk5ZDg1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTEsNiAr
MSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IEp1bGllbiBDaGFmZnJhaXgg
PGp1bGllbi5jaGFmZnJhaXhAZ21haWwuY29tPgotICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDEx
LCAyMDEyIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDEyLCAyMDEzIFJlc2VhcmNoIEluIE1vdGlv
biBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu
ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zCkBAIC0yOTYsNiArMjk2LDE0IEBAIHZvaWQgQ29va2llTWFuYWdlcjo6Z2V0UmF3Q29v
a2llcyhWZWN0b3I8UmVmUHRyPFBhcnNlZENvb2tpZT4gPiAmc3RhY2tPZkNvb2tpZXMsCiAgICAg
ICAgICAgICAvLyBHZXQgY29va2llcyBmcm9tIHRoZSBudWxsIGRvbWFpbiBtYXAKICAgICAgICAg
ICAgIGN1cnJlbnRNYXAtPmdldEFsbENvb2tpZXMoJmNvb2tpZUNhbmRpZGF0ZXMpOwogCisgICAg
ICAgICAgICAvLyBHZXQgY29va2llcyBmcm9tIEhvc3Qtb25seSBjb29raWVzCisgICAgICAgICAg
ICBpZiAoY2Fub25pY2FsSVAuZW1wdHkoKSkgeworICAgICAgICAgICAgICAgIENvb2tpZUxvZygi
Q29va2llTWFuYWdlciAtIGxvb2tpbmcgZm9yIGhvc3Qtb25seSBjb29raWVzIGZvciBob3N0IC0g
JXMiLCByZXF1ZXN0VVJMLmhvc3QoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICBD
b29raWVNYXAqIGhvc3RNYXAgPSBjdXJyZW50TWFwLT5nZXRTdWJkb21haW5NYXAocmVxdWVzdFVS
TC5ob3N0KCkpOworICAgICAgICAgICAgICAgIGlmIChob3N0TWFwKQorICAgICAgICAgICAgICAg
ICAgICBob3N0TWFwLT5nZXRBbGxDb29raWVzKCZjb29raWVDYW5kaWRhdGVzKTsKKyAgICAgICAg
ICAgIH0KKwogICAgICAgICAgICAgLy8gR2V0IGNvb2tpZXMgZnJvbSB0aGUgdmFsaWQgZG9tYWlu
IG1hcHMKICAgICAgICAgICAgIGludCBpID0gZGVsaW1pdGVkSG9zdC5zaXplKCkgLSAxOwogICAg
ICAgICAgICAgd2hpbGUgKGkgPj0gMCkgewpAQCAtNDIyLDYgKzQzMCw3IEBAIHZvaWQgQ29va2ll
TWFuYWdlcjo6Y2hlY2tBbmRUcmVhdENvb2tpZShQYXNzUmVmUHRyPFBhcnNlZENvb2tpZT4gcHJw
Q2FuZGlkYXRlQ29vCiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Vy
TWFwKTsKKyAgICAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gYWRkaW5nIGNvb2tpZW1h
cCAtICVzXG4iLCBjdXJNYXAtPmdldE5hbWUoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgYWRk
Q29va2llVG9NYXAoY3VyTWFwLCBjYW5kaWRhdGVDb29raWUsIHBvc3RUb0JhY2tpbmdTdG9yZSwg
ZmlsdGVyKTsKICAgICB9CiB9CkBAIC01NDgsOCArNTU3LDggQEAgQ29va2llTWFwKiBDb29raWVN
YW5hZ2VyOjpmaW5kT3JDcmVhdGVDb29raWVNYXAoQ29va2llTWFwKiBwcm90b2NvbE1hcCwgY29u
c3QgUGEKICAgICAvLyBFeHBsb2RlIHRoZSBkb21haW4gd2l0aCB0aGUgJy4nIGRlbGltaXRlcgog
ICAgIFZlY3RvcjxTdHJpbmc+IGRlbGltaXRlZEhvc3Q7CiAKLSAgICAvLyBJZiB0aGUgZG9tYWlu
IGlzIGFuIElQIGFkZHJlc3MsIGRvbid0IHNwbGl0IGl0LgotICAgIGlmIChjYW5kaWRhdGVDb29r
aWUtPmRvbWFpbklzSVBBZGRyZXNzKCkpCisgICAgLy8gSWYgdGhlIGRvbWFpbiBpcyBhbiBJUCBh
ZGRyZXNzIG9yIGlzIGEgaG9zdC1vbmx5IGRvbWFpbiwgZG9uJ3Qgc3BsaXQgaXQuCisgICAgaWYg
KGNhbmRpZGF0ZUNvb2tpZS0+ZG9tYWluSXNJUEFkZHJlc3MoKSB8fCBjYW5kaWRhdGVDb29raWUt
PmlzSG9zdE9ubHkoKSkKICAgICAgICAgZGVsaW1pdGVkSG9zdC5hcHBlbmQoY2FuZGlkYXRlQ29v
a2llLT5kb21haW4oKSk7CiAgICAgZWxzZQogICAgICAgICBjYW5kaWRhdGVDb29raWUtPmRvbWFp
bigpLnNwbGl0KCIuIiwgZGVsaW1pdGVkSG9zdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHAKaW5kZXggYTcwOWMxMmJhMmRmNTZi
M2U3N2Y2ZjZkYTg1ZWJkZjczM2UxZTA0ZC4uNmY4ODgyNjBhY2EwZDBiMGU4OWExMzMzNjQwMThm
Zjg3NTFmOWMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJy
eS9Db29raWVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy
cnkvQ29va2llUGFyc2VyLmNwcApAQCAtNjAsOCArNjAsNyBAQCBDb29raWVQYXJzZXI6OkNvb2tp
ZVBhcnNlcihjb25zdCBLVVJMJiBkZWZhdWx0Q29va2llVVJMKQogICAgIGlmICghaG9zdERvbWFp
bkNhbm9uaWNhbC5lbXB0eSgpKSB7CiAgICAgICAgIG1fZGVmYXVsdENvb2tpZUhvc3QgPSBob3N0
RG9tYWluQ2Fub25pY2FsOwogICAgICAgICBtX2RlZmF1bHREb21haW5Jc0lQQWRkcmVzcyA9IHRy
dWU7Ci0gICAgfSBlbHNlCi0gICAgICAgIG1fZGVmYXVsdENvb2tpZUhvc3QgPSBtX2RlZmF1bHRD
b29raWVIb3N0LnN0YXJ0c1dpdGgoIi4iKSA/IG1fZGVmYXVsdENvb2tpZUhvc3QgOiAiLiIgKyBt
X2RlZmF1bHRDb29raWVIb3N0OworICAgIH0KIH0KIAogQ29va2llUGFyc2VyOjp+Q29va2llUGFy
c2VyKCkKQEAgLTI2NSw5ICsyNjQsMTAgQEAgUGFzc1JlZlB0cjxQYXJzZWRDb29raWU+IENvb2tp
ZVBhcnNlcjo6cGFyc2VPbmVDb29raWUoY29uc3QgU3RyaW5nJiBjb29raWUsIHVuc2kKICAgICAg
ICAgICAgICAgICBpZiAoZG90UG9zaXRpb24gPT0gbm90Rm91bmQgfHwgZG90UG9zaXRpb24gPT0g
cGFyc2VkVmFsdWUubGVuZ3RoKCkpCiAgICAgICAgICAgICAgICAgICAgIExPR19FUlJPUl9BTkRf
UkVUVVJOKCJJbnZhbGlkIGNvb2tpZSBhdHRyaWJ1dGUgJXMgKGRvbWFpbik6IGl0IGRvZXMgbm90
IGNvbnRhaW4gYW4gZW1iZWRkZWQgZG90IiwgY29va2llLmFzY2lpKCkuZGF0YSgpKTsKIAotICAg
ICAgICAgICAgICAgIC8vIElmIHRoZSBkb21haW4gZG9lcyBub3Qgc3RhcnQgd2l0aCBhIGRvdCwg
YWRkIG9uZSBmb3Igc2VjdXJpdHkgY2hlY2tzLAorICAgICAgICAgICAgICAgIC8vIElmIHRoZSBk
b21haW4gZG9lcyBub3Qgc3RhcnQgd2l0aCBhIGRvdCwgYWRkIG9uZSBmb3Igc2VjdXJpdHkgY2hl
Y2tzIGFuZCB0byBkaXN0aW5ndWlzaCBpdCBmcm9tIGhvc3Qtb25seSBkb21haW5zCiAgICAgICAg
ICAgICAgICAgLy8gRm9yIGV4YW1wbGU6IGFiLmMuY29tIGRvc2Ugbm90IGRvbWFpbiBtYXRjaCBi
LmMuY29tOwogICAgICAgICAgICAgICAgIFN0cmluZyByZWFsRG9tYWluID0gcGFyc2VkVmFsdWVb
MF0gPT0gJy4nID8gcGFyc2VkVmFsdWUgOiAiLiIgKyBwYXJzZWRWYWx1ZTsKKyAgICAgICAgICAg
ICAgICBTdHJpbmcgZGVmYXVsdEhvc3QgPSAiLiIgKyBtX2RlZmF1bHRDb29raWVIb3N0OwogCiAg
ICAgICAgICAgICAgICAgLy8gVHJ5IHRvIHJldHVybiBhbiBjYW5vbmljYWwgaXAgYWRkcmVzcyBp
ZiB0aGUgZG9tYWluIGlzIGFuIGlwCiAKQEAgLTI3OCw3ICsyNzgsNyBAQCBQYXNzUmVmUHRyPFBh
cnNlZENvb2tpZT4gQ29va2llUGFyc2VyOjpwYXJzZU9uZUNvb2tpZShjb25zdCBTdHJpbmcmIGNv
b2tpZSwgdW5zaQogICAgICAgICAgICAgICAgIC8vIFdlIGRldGVybWluZSB0aGUgY2Fub25pY2Fs
IElQIGZvcm1hdCBiZWZvcmUgY29tcGFyaW5nIGJlY2F1c2UgSVB2NiBjb3VsZCBiZSByZXByZXNl
bnRlZCBpbiBtdWx0aXBsZSBmb3JtYXRzCiAgICAgICAgICAgICAgICAgaWYgKG1fZGVmYXVsdERv
bWFpbklzSVBBZGRyZXNzKSB7CiAgICAgICAgICAgICAgICAgICAgIFN0cmluZyByZWFsRG9tYWlu
Q2Fub25pY2FsID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OmdldENhbm9uaWNhbElQRm9ybWF0KHJl
YWxEb21haW4pOwotICAgICAgICAgICAgICAgICAgICBpZiAocmVhbERvbWFpbkNhbm9uaWNhbC5p
c0VtcHR5KCkgfHwgcmVhbERvbWFpbkNhbm9uaWNhbCAhPSBtX2RlZmF1bHRDb29raWVIb3N0KQor
ICAgICAgICAgICAgICAgICAgICBpZiAocmVhbERvbWFpbkNhbm9uaWNhbC5pc0VtcHR5KCkgfHwg
cmVhbERvbWFpbkNhbm9uaWNhbCAhPSBkZWZhdWx0SG9zdCkKICAgICAgICAgICAgICAgICAgICAg
ICAgIExPR19FUlJPUl9BTkRfUkVUVVJOKCJJbnZhbGlkIGNvb2tpZSBhdHRyaWJ1dGUgJXMgKGRv
bWFpbik6IGRvbWFpbiBpcyBJUCBidXQgZG9lcyBub3QgbWF0Y2ggaG9zdCdzIElQIiwgY29va2ll
LmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAgICAgICAgICAgICAgcmVhbERvbWFpbiA9IHJlYWxE
b21haW5DYW5vbmljYWw7CiAgICAgICAgICAgICAgICAgICAgIGlzSVBBZGRyZXNzID0gdHJ1ZTsK
QEAgLTI4OCwxMCArMjg4LDkgQEAgUGFzc1JlZlB0cjxQYXJzZWRDb29raWU+IENvb2tpZVBhcnNl
cjo6cGFyc2VPbmVDb29raWUoY29uc3QgU3RyaW5nJiBjb29raWUsIHVuc2kKICAgICAgICAgICAg
ICAgICAgICAgLy8gYWRkIGEgIi4iIGF0IGJlZ2lubmluZyBvZiBob3N0IG5hbWUsIGJlY2F1c2Ug
aXQgY2FuIGhhbmRsZSBtYW55IGNhc2VzIHN1Y2ggYXMKICAgICAgICAgICAgICAgICAgICAgLy8g
YS5iLmNvbSBtYXRjaGVzIGIuY29tLCBhLmIuY29tIG1hdGNoZXMgLkIuY29tIGFuZCBhLmIuY29t
IG1hdGNoZXMgLkEuYi5Db20KICAgICAgICAgICAgICAgICAgICAgLy8gYW5kIHNvIG9uLgotICAg
ICAgICAgICAgICAgICAgICAvLyBXZSBhbHNvIGhhdmUgdG8gbWFrZSBhIHNwZWNpYWwgY2FzZSBm
b3IgSVAgYWRkcmVzc2VzLiBJZiBhIHdlYnNpdGUgdHJpZXMgdG8gc2V0Ci0gICAgICAgICAgICAg
ICAgICAgIC8vIGEgY29va2llIHRvIDYxLjk3LCB0aGF0IGRvbWFpbiBpcyBub3QgYW4gSVAgYWRk
cmVzcyBhbmQgd2lsbCBlbmQgd2l0aCB0aGUgbV9kZWZhdWx0Q29va2llSG9zdAotICAgICAgICAg
ICAgICAgICAgICBpZiAoIW1fZGVmYXVsdENvb2tpZUhvc3QuZW5kc1dpdGgocmVhbERvbWFpbiwg
ZmFsc2UpKQorICAgICAgICAgICAgICAgICAgICBpZiAoIWRlZmF1bHRIb3N0LmVuZHNXaXRoKHJl
YWxEb21haW4sIGZhbHNlKSkKICAgICAgICAgICAgICAgICAgICAgICAgIExPR19FUlJPUl9BTkRf
UkVUVVJOKCJJbnZhbGlkIGNvb2tpZSBhdHRyaWJ1dGUgJXMgKGRvbWFpbik6IGl0IGRvZXMgbm90
IGRvbWFpbiBtYXRjaCB0aGUgaG9zdCIsIGNvb2tpZS5hc2NpaSgpLmRhdGEoKSk7CisKICAgICAg
ICAgICAgICAgICAgICAgLy8gV2Ugc2hvdWxkIGNoZWNrIGZvciBhbiBlbWJlZGRlZCBkb3QgaW4g
dGhlIHBvcnRpb24gb2Ygc3RyaW5nIGluIHRoZSBob3N0IG5vdCBpbiB0aGUgZG9tYWluCiAgICAg
ICAgICAgICAgICAgICAgIC8vIGJ1dCB0byBtYXRjaCBmaXJlZm94IGJlaGF2aW91ciB3ZSBkbyBu
b3QuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUGFy
c2VkQ29va2llLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1BhcnNlZENv
b2tpZS5oCmluZGV4IDFiY2NlYzZhOWVjOTU1Y2M3MGIxZjdkYWRlZjk3OWYyYzA5MjkyZGIuLmJj
Yzc5MTY4YmRmZmJiMGNmNGM4ZmIyYTU0OTc5ZDBiYTk2MTgwY2YgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUGFyc2VkQ29va2llLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9QYXJzZWRDb29raWUuaApAQCAtODUsNiArODUs
OCBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzU2Vzc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1faXNT
ZXNzaW9uOyB9CiAKKyAgICBib29sIGlzSG9zdE9ubHkoKSBjb25zdCB7IHJldHVybiAhbV9kb21h
aW4uc3RhcnRzV2l0aCgiLiIpOyB9CisKICAgICBib29sIGhhc0V4cGlyZWQoKSBjb25zdDsKICAg
ICBib29sIGlzRm9yY2VFeHBpcmVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0ZvcmNlRXhwaXJlZDsg
fQogICAgIGJvb2wgaXNVbmRlclNpemVMaW1pdCgpIGNvbnN0Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>203220</attachid>
            <date>2013-05-29 11:17:56 -0700</date>
            <delta_ts>2013-05-29 11:46:30 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-116969-20130529141634.patch</filename>
            <type>text/plain</type>
            <size>8594</size>
            <attacher>otcheung</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwODkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjczNjc0MWIwODRhY2Yx
ZTBkY2I2NzBkNjY0NDZkNDAzZjg3ZGIzZC4uMWU3ZTkzNmYwYjJlMDIxYjM2NWU0YzdmZmI2NzFj
NTgwOGIwYWJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA1LTI5ICBPdHRv
IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld
IEhhbmRsZSBIb3N0LU9ubHkgY29va2llcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MTE2OTY5CisKKyAgICAgICAgUFIgMzM4ODA5CisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBJbnRlcm5hbGx5IFJldmlld2VkIGJ5
IEpvZSBNYXNvbi4KKworICAgICAgICBBZGRpbmcgc3VwcG9ydCBmb3IgaG9zdC1vbmx5IGNvb2tp
ZXMgKGNvb2tpZXMgd2l0aCBubworICAgICAgICBzcGVjaWZpZWQgZG9tYWlucykuIFRoZXNlIGNv
b2tpZXMgc2hvdWxkIG9ubHkgYmUgcmV0dXJuZWQKKyAgICAgICAgd2hlbiB0aGUgaG9zdCBtYXRj
aGVzIHRoZSBjb29raWUgZG9tYWluIGV4YWN0bHkuCisKKyAgICAgICAgVGVzdGVkIHVzaW5nIE9w
ZXJhIGFuZCBCcm93c2VyIGNvb2tpZSB0ZXN0IHN1aXRlLiBUZXN0ZWQKKyAgICAgICAgdGhhdCBo
b3N0IGNvb2tpZXMgYXJlIGJlaW5nIHN0b3JlZCBpbiBpdCdzIG93biBtYXAgdXNpbmcKKyAgICAg
ICAgV2ViIEluc3BlY3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2ll
TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpnZXRSYXdDb29r
aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OmNoZWNrQW5kVHJlYXRDb29r
aWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6ZmluZE9yQ3JlYXRlQ29va2ll
TWFwKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHA6Cisg
ICAgICAgIChXZWJDb3JlOjpDb29raWVQYXJzZXI6OkNvb2tpZVBhcnNlcik6CisgICAgICAgIChX
ZWJDb3JlOjpDb29raWVQYXJzZXI6OnBhcnNlT25lQ29va2llKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9ibGFja2JlcnJ5L1BhcnNlZENvb2tpZS5oOgorICAgICAgICAoV2ViQ29yZTo6UGFyc2VkQ29v
a2llOjppc0hvc3RPbmx5KToKKyAgICAgICAgKFBhcnNlZENvb2tpZSk6CisKIDIwMTMtMDUtMjkg
IFbDrWN0b3IgTWFudWVsIErDoXF1ZXogTGVhbCAgPHZqYXF1ZXpAaWdhbGlhLmNvbT4KIAogICAg
ICAgICBbdGV4bWFwXVtHU3RyZWFtZXJdW0dUS10gQ29tcG9zaXRlZCBWaWRlbyBzdXBwb3J0CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFn
ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2Vy
LmNwcAppbmRleCA4NjBiNjUwMDE4MTVlNWY5YTY4ZTgzMTkwNjgyZTQyNjcwNjdjNjNmLi4xNzIy
NjU1NDNkMzBlMDM1M2IxZjczMjJiNmVkNmU1ZWZjNzk5ZDg1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTEsNiAr
MSw2IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IEp1bGllbiBDaGFmZnJhaXgg
PGp1bGllbi5jaGFmZnJhaXhAZ21haWwuY29tPgotICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDEx
LCAyMDEyIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExLCAyMDEyLCAyMDEzIFJlc2VhcmNoIEluIE1vdGlv
biBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu
ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zCkBAIC0yOTYsNiArMjk2LDE0IEBAIHZvaWQgQ29va2llTWFuYWdlcjo6Z2V0UmF3Q29v
a2llcyhWZWN0b3I8UmVmUHRyPFBhcnNlZENvb2tpZT4gPiAmc3RhY2tPZkNvb2tpZXMsCiAgICAg
ICAgICAgICAvLyBHZXQgY29va2llcyBmcm9tIHRoZSBudWxsIGRvbWFpbiBtYXAKICAgICAgICAg
ICAgIGN1cnJlbnRNYXAtPmdldEFsbENvb2tpZXMoJmNvb2tpZUNhbmRpZGF0ZXMpOwogCisgICAg
ICAgICAgICAvLyBHZXQgY29va2llcyBmcm9tIEhvc3Qtb25seSBjb29raWVzCisgICAgICAgICAg
ICBpZiAoY2Fub25pY2FsSVAuZW1wdHkoKSkgeworICAgICAgICAgICAgICAgIENvb2tpZUxvZygi
Q29va2llTWFuYWdlciAtIGxvb2tpbmcgZm9yIGhvc3Qtb25seSBjb29raWVzIGZvciBob3N0IC0g
JXMiLCByZXF1ZXN0VVJMLmhvc3QoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAgICAgICBD
b29raWVNYXAqIGhvc3RNYXAgPSBjdXJyZW50TWFwLT5nZXRTdWJkb21haW5NYXAocmVxdWVzdFVS
TC5ob3N0KCkpOworICAgICAgICAgICAgICAgIGlmIChob3N0TWFwKQorICAgICAgICAgICAgICAg
ICAgICBob3N0TWFwLT5nZXRBbGxDb29raWVzKCZjb29raWVDYW5kaWRhdGVzKTsKKyAgICAgICAg
ICAgIH0KKwogICAgICAgICAgICAgLy8gR2V0IGNvb2tpZXMgZnJvbSB0aGUgdmFsaWQgZG9tYWlu
IG1hcHMKICAgICAgICAgICAgIGludCBpID0gZGVsaW1pdGVkSG9zdC5zaXplKCkgLSAxOwogICAg
ICAgICAgICAgd2hpbGUgKGkgPj0gMCkgewpAQCAtNDIyLDYgKzQzMCw3IEBAIHZvaWQgQ29va2ll
TWFuYWdlcjo6Y2hlY2tBbmRUcmVhdENvb2tpZShQYXNzUmVmUHRyPFBhcnNlZENvb2tpZT4gcHJw
Q2FuZGlkYXRlQ29vCiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBBU1NFUlQoY3Vy
TWFwKTsKKyAgICAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gYWRkaW5nIGNvb2tpZW1h
cCAtICVzXG4iLCBjdXJNYXAtPmdldE5hbWUoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgYWRk
Q29va2llVG9NYXAoY3VyTWFwLCBjYW5kaWRhdGVDb29raWUsIHBvc3RUb0JhY2tpbmdTdG9yZSwg
ZmlsdGVyKTsKICAgICB9CiB9CkBAIC01NDgsOCArNTU3LDggQEAgQ29va2llTWFwKiBDb29raWVN
YW5hZ2VyOjpmaW5kT3JDcmVhdGVDb29raWVNYXAoQ29va2llTWFwKiBwcm90b2NvbE1hcCwgY29u
c3QgUGEKICAgICAvLyBFeHBsb2RlIHRoZSBkb21haW4gd2l0aCB0aGUgJy4nIGRlbGltaXRlcgog
ICAgIFZlY3RvcjxTdHJpbmc+IGRlbGltaXRlZEhvc3Q7CiAKLSAgICAvLyBJZiB0aGUgZG9tYWlu
IGlzIGFuIElQIGFkZHJlc3MsIGRvbid0IHNwbGl0IGl0LgotICAgIGlmIChjYW5kaWRhdGVDb29r
aWUtPmRvbWFpbklzSVBBZGRyZXNzKCkpCisgICAgLy8gSWYgdGhlIGRvbWFpbiBpcyBhbiBJUCBh
ZGRyZXNzIG9yIGlzIGEgaG9zdC1vbmx5IGRvbWFpbiwgZG9uJ3Qgc3BsaXQgaXQuCisgICAgaWYg
KGNhbmRpZGF0ZUNvb2tpZS0+ZG9tYWluSXNJUEFkZHJlc3MoKSB8fCBjYW5kaWRhdGVDb29raWUt
PmlzSG9zdE9ubHkoKSkKICAgICAgICAgZGVsaW1pdGVkSG9zdC5hcHBlbmQoY2FuZGlkYXRlQ29v
a2llLT5kb21haW4oKSk7CiAgICAgZWxzZQogICAgICAgICBjYW5kaWRhdGVDb29raWUtPmRvbWFp
bigpLnNwbGl0KCIuIiwgZGVsaW1pdGVkSG9zdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZVBhcnNlci5jcHAKaW5kZXggYTcwOWMxMmJhMmRmNTZi
M2U3N2Y2ZjZkYTg1ZWJkZjczM2UxZTA0ZC4uZWE5MGNhOGVmMmJhYmJmYWE0ZTRiMzE3NDljMzNm
MmVjYTgyMjdjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJy
eS9Db29raWVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy
cnkvQ29va2llUGFyc2VyLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPG5ldHdvcmsv
RG9tYWluVG9vbHMuaD4KICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3
dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgog
CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTYwLDggKzYxLDcgQEAgQ29va2llUGFyc2VyOjpD
b29raWVQYXJzZXIoY29uc3QgS1VSTCYgZGVmYXVsdENvb2tpZVVSTCkKICAgICBpZiAoIWhvc3RE
b21haW5DYW5vbmljYWwuZW1wdHkoKSkgewogICAgICAgICBtX2RlZmF1bHRDb29raWVIb3N0ID0g
aG9zdERvbWFpbkNhbm9uaWNhbDsKICAgICAgICAgbV9kZWZhdWx0RG9tYWluSXNJUEFkZHJlc3Mg
PSB0cnVlOwotICAgIH0gZWxzZQotICAgICAgICBtX2RlZmF1bHRDb29raWVIb3N0ID0gbV9kZWZh
dWx0Q29va2llSG9zdC5zdGFydHNXaXRoKCIuIikgPyBtX2RlZmF1bHRDb29raWVIb3N0IDogIi4i
ICsgbV9kZWZhdWx0Q29va2llSG9zdDsKKyAgICB9CiB9CiAKIENvb2tpZVBhcnNlcjo6fkNvb2tp
ZVBhcnNlcigpCkBAIC0yNjUsOSArMjY1LDE4IEBAIFBhc3NSZWZQdHI8UGFyc2VkQ29va2llPiBD
b29raWVQYXJzZXI6OnBhcnNlT25lQ29va2llKGNvbnN0IFN0cmluZyYgY29va2llLCB1bnNpCiAg
ICAgICAgICAgICAgICAgaWYgKGRvdFBvc2l0aW9uID09IG5vdEZvdW5kIHx8IGRvdFBvc2l0aW9u
ID09IHBhcnNlZFZhbHVlLmxlbmd0aCgpKQogICAgICAgICAgICAgICAgICAgICBMT0dfRVJST1Jf
QU5EX1JFVFVSTigiSW52YWxpZCBjb29raWUgYXR0cmlidXRlICVzIChkb21haW4pOiBpdCBkb2Vz
IG5vdCBjb250YWluIGFuIGVtYmVkZGVkIGRvdCIsIGNvb2tpZS5hc2NpaSgpLmRhdGEoKSk7CiAK
LSAgICAgICAgICAgICAgICAvLyBJZiB0aGUgZG9tYWluIGRvZXMgbm90IHN0YXJ0IHdpdGggYSBk
b3QsIGFkZCBvbmUgZm9yIHNlY3VyaXR5IGNoZWNrcywKKyAgICAgICAgICAgICAgICAvLyBJZiB0
aGUgZG9tYWluIGRvZXMgbm90IHN0YXJ0IHdpdGggYSBkb3QsIGFkZCBvbmUgZm9yIHNlY3VyaXR5
IGNoZWNrcyBhbmQgdG8gZGlzdGluZ3Vpc2ggaXQgZnJvbSBob3N0LW9ubHkgZG9tYWlucwogICAg
ICAgICAgICAgICAgIC8vIEZvciBleGFtcGxlOiBhYi5jLmNvbSBkb3NlIG5vdCBkb21haW4gbWF0
Y2ggYi5jLmNvbTsKLSAgICAgICAgICAgICAgICBTdHJpbmcgcmVhbERvbWFpbiA9IHBhcnNlZFZh
bHVlWzBdID09ICcuJyA/IHBhcnNlZFZhbHVlIDogIi4iICsgcGFyc2VkVmFsdWU7CisgICAgICAg
ICAgICAgICAgU3RyaW5nQnVpbGRlciBwYXJzZWRWYWx1ZUJ1aWxkZXI7CisgICAgICAgICAgICAg
ICAgaWYgKHBhcnNlZFZhbHVlWzBdICE9ICcuJykKKyAgICAgICAgICAgICAgICAgICAgcGFyc2Vk
VmFsdWVCdWlsZGVyLmFwcGVuZExpdGVyYWwoIi4iKTsKKyAgICAgICAgICAgICAgICBwYXJzZWRW
YWx1ZUJ1aWxkZXIuYXBwZW5kKHBhcnNlZFZhbHVlKTsKKyAgICAgICAgICAgICAgICBTdHJpbmcg
cmVhbERvbWFpbiA9IHBhcnNlZFZhbHVlQnVpbGRlci50b1N0cmluZygpOworCisgICAgICAgICAg
ICAgICAgU3RyaW5nQnVpbGRlciBkZWZhdWx0SG9zdEJ1aWxkZXI7CisgICAgICAgICAgICAgICAg
ZGVmYXVsdEhvc3RCdWlsZGVyLmFwcGVuZExpdGVyYWwoIi4iKTsKKyAgICAgICAgICAgICAgICBk
ZWZhdWx0SG9zdEJ1aWxkZXIuYXBwZW5kKG1fZGVmYXVsdENvb2tpZUhvc3QpOworICAgICAgICAg
ICAgICAgIFN0cmluZyBkZWZhdWx0SG9zdCA9IGRlZmF1bHRIb3N0QnVpbGRlci50b1N0cmluZygp
OwogCiAgICAgICAgICAgICAgICAgLy8gVHJ5IHRvIHJldHVybiBhbiBjYW5vbmljYWwgaXAgYWRk
cmVzcyBpZiB0aGUgZG9tYWluIGlzIGFuIGlwCiAKQEAgLTI3OCw3ICsyODcsNyBAQCBQYXNzUmVm
UHRyPFBhcnNlZENvb2tpZT4gQ29va2llUGFyc2VyOjpwYXJzZU9uZUNvb2tpZShjb25zdCBTdHJp
bmcmIGNvb2tpZSwgdW5zaQogICAgICAgICAgICAgICAgIC8vIFdlIGRldGVybWluZSB0aGUgY2Fu
b25pY2FsIElQIGZvcm1hdCBiZWZvcmUgY29tcGFyaW5nIGJlY2F1c2UgSVB2NiBjb3VsZCBiZSBy
ZXByZXNlbnRlZCBpbiBtdWx0aXBsZSBmb3JtYXRzCiAgICAgICAgICAgICAgICAgaWYgKG1fZGVm
YXVsdERvbWFpbklzSVBBZGRyZXNzKSB7CiAgICAgICAgICAgICAgICAgICAgIFN0cmluZyByZWFs
RG9tYWluQ2Fub25pY2FsID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06OmdldENhbm9uaWNhbElQRm9y
bWF0KHJlYWxEb21haW4pOwotICAgICAgICAgICAgICAgICAgICBpZiAocmVhbERvbWFpbkNhbm9u
aWNhbC5pc0VtcHR5KCkgfHwgcmVhbERvbWFpbkNhbm9uaWNhbCAhPSBtX2RlZmF1bHRDb29raWVI
b3N0KQorICAgICAgICAgICAgICAgICAgICBpZiAocmVhbERvbWFpbkNhbm9uaWNhbC5pc0VtcHR5
KCkgfHwgcmVhbERvbWFpbkNhbm9uaWNhbCAhPSBkZWZhdWx0SG9zdCkKICAgICAgICAgICAgICAg
ICAgICAgICAgIExPR19FUlJPUl9BTkRfUkVUVVJOKCJJbnZhbGlkIGNvb2tpZSBhdHRyaWJ1dGUg
JXMgKGRvbWFpbik6IGRvbWFpbiBpcyBJUCBidXQgZG9lcyBub3QgbWF0Y2ggaG9zdCdzIElQIiwg
Y29va2llLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAgICAgICAgICAgICAgcmVhbERvbWFpbiA9
IHJlYWxEb21haW5DYW5vbmljYWw7CiAgICAgICAgICAgICAgICAgICAgIGlzSVBBZGRyZXNzID0g
dHJ1ZTsKQEAgLTI4OCwxMCArMjk3LDkgQEAgUGFzc1JlZlB0cjxQYXJzZWRDb29raWU+IENvb2tp
ZVBhcnNlcjo6cGFyc2VPbmVDb29raWUoY29uc3QgU3RyaW5nJiBjb29raWUsIHVuc2kKICAgICAg
ICAgICAgICAgICAgICAgLy8gYWRkIGEgIi4iIGF0IGJlZ2lubmluZyBvZiBob3N0IG5hbWUsIGJl
Y2F1c2UgaXQgY2FuIGhhbmRsZSBtYW55IGNhc2VzIHN1Y2ggYXMKICAgICAgICAgICAgICAgICAg
ICAgLy8gYS5iLmNvbSBtYXRjaGVzIGIuY29tLCBhLmIuY29tIG1hdGNoZXMgLkIuY29tIGFuZCBh
LmIuY29tIG1hdGNoZXMgLkEuYi5Db20KICAgICAgICAgICAgICAgICAgICAgLy8gYW5kIHNvIG9u
LgotICAgICAgICAgICAgICAgICAgICAvLyBXZSBhbHNvIGhhdmUgdG8gbWFrZSBhIHNwZWNpYWwg
Y2FzZSBmb3IgSVAgYWRkcmVzc2VzLiBJZiBhIHdlYnNpdGUgdHJpZXMgdG8gc2V0Ci0gICAgICAg
ICAgICAgICAgICAgIC8vIGEgY29va2llIHRvIDYxLjk3LCB0aGF0IGRvbWFpbiBpcyBub3QgYW4g
SVAgYWRkcmVzcyBhbmQgd2lsbCBlbmQgd2l0aCB0aGUgbV9kZWZhdWx0Q29va2llSG9zdAotICAg
ICAgICAgICAgICAgICAgICBpZiAoIW1fZGVmYXVsdENvb2tpZUhvc3QuZW5kc1dpdGgocmVhbERv
bWFpbiwgZmFsc2UpKQorICAgICAgICAgICAgICAgICAgICBpZiAoIWRlZmF1bHRIb3N0LmVuZHNX
aXRoKHJlYWxEb21haW4sIGZhbHNlKSkKICAgICAgICAgICAgICAgICAgICAgICAgIExPR19FUlJP
Ul9BTkRfUkVUVVJOKCJJbnZhbGlkIGNvb2tpZSBhdHRyaWJ1dGUgJXMgKGRvbWFpbik6IGl0IGRv
ZXMgbm90IGRvbWFpbiBtYXRjaCB0aGUgaG9zdCIsIGNvb2tpZS5hc2NpaSgpLmRhdGEoKSk7CisK
ICAgICAgICAgICAgICAgICAgICAgLy8gV2Ugc2hvdWxkIGNoZWNrIGZvciBhbiBlbWJlZGRlZCBk
b3QgaW4gdGhlIHBvcnRpb24gb2Ygc3RyaW5nIGluIHRoZSBob3N0IG5vdCBpbiB0aGUgZG9tYWlu
CiAgICAgICAgICAgICAgICAgICAgIC8vIGJ1dCB0byBtYXRjaCBmaXJlZm94IGJlaGF2aW91ciB3
ZSBkbyBub3QuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy
cnkvUGFyc2VkQ29va2llLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1Bh
cnNlZENvb2tpZS5oCmluZGV4IDFiY2NlYzZhOWVjOTU1Y2M3MGIxZjdkYWRlZjk3OWYyYzA5Mjky
ZGIuLmJjYzc5MTY4YmRmZmJiMGNmNGM4ZmIyYTU0OTc5ZDBiYTk2MTgwY2YgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUGFyc2VkQ29va2llLmgKKysrIGIv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9QYXJzZWRDb29raWUuaApAQCAtODUs
NiArODUsOCBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzU2Vzc2lvbigpIGNvbnN0IHsgcmV0dXJu
IG1faXNTZXNzaW9uOyB9CiAKKyAgICBib29sIGlzSG9zdE9ubHkoKSBjb25zdCB7IHJldHVybiAh
bV9kb21haW4uc3RhcnRzV2l0aCgiLiIpOyB9CisKICAgICBib29sIGhhc0V4cGlyZWQoKSBjb25z
dDsKICAgICBib29sIGlzRm9yY2VFeHBpcmVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0ZvcmNlRXhw
aXJlZDsgfQogICAgIGJvb2wgaXNVbmRlclNpemVMaW1pdCgpIGNvbnN0Owo=
</data>

          </attachment>
      

    </bug>

</bugzilla>