<?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>194872</bug_id>
          
          <creation_ts>2019-02-20 14:24:54 -0800</creation_ts>
          <short_desc>Regression(PSON) &quot;Reload without content extensions&quot; does not work when the main resource is blocked</short_desc>
          <delta_ts>2019-02-20 15:30:11 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Chris Dumez">cdumez</reporter>
          <assigned_to name="Chris Dumez">cdumez</assigned_to>
          <cc>achristensen</cc>
    
    <cc>beidson</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>ggaren</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1508250</commentid>
    <comment_count>0</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-02-20 14:24:54 -0800</bug_when>
    <thetext>&quot;Reload without content extensions&quot; does not work when the main resource is blocked, it keeps blocking the load when PSON is enabled.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508251</commentid>
    <comment_count>1</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-02-20 14:25:12 -0800</bug_when>
    <thetext>&lt;rdar://problem/47924500&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508259</commentid>
    <comment_count>2</comment_count>
      <attachid>362541</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-02-20 14:30:37 -0800</bug_when>
    <thetext>Created attachment 362541
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508264</commentid>
    <comment_count>3</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2019-02-20 14:33:46 -0800</bug_when>
    <thetext>Attachment 362541 did not pass style-queue:


ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4916:  Multi-line string (&quot;...&quot;) found.  This lint script doesn&apos;t do well with such strings, and may give bogus warnings.  They&apos;re ugly and unnecessary, and you should use concatenation instead&quot;.  [readability/multiline_string] [5]
ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4920:  Multi-line string (&quot;...&quot;) found.  This lint script doesn&apos;t do well with such strings, and may give bogus warnings.  They&apos;re ugly and unnecessary, and you should use concatenation instead&quot;.  [readability/multiline_string] [5]
Total errors found: 2 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508267</commentid>
    <comment_count>4</comment_count>
      <attachid>362541</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2019-02-20 14:36:52 -0800</bug_when>
    <thetext>Comment on attachment 362541
Patch

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

&gt; Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4875
&gt; +    [[WKContentRuleListStore defaultStore] removeContentRuleListForIdentifier:@&quot;ContentBlockingAfterProcessSwapExtension&quot; completionHandler:^(NSError *error) {

Can we do this at the end of the test to prevent the state from leaking into other tests?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508277</commentid>
    <comment_count>5</comment_count>
      <attachid>362546</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2019-02-20 14:51:53 -0800</bug_when>
    <thetext>Created attachment 362546
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508280</commentid>
    <comment_count>6</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2019-02-20 14:55:35 -0800</bug_when>
    <thetext>Attachment 362546 did not pass style-queue:


ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4916:  Multi-line string (&quot;...&quot;) found.  This lint script doesn&apos;t do well with such strings, and may give bogus warnings.  They&apos;re ugly and unnecessary, and you should use concatenation instead&quot;.  [readability/multiline_string] [5]
ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:4920:  Multi-line string (&quot;...&quot;) found.  This lint script doesn&apos;t do well with such strings, and may give bogus warnings.  They&apos;re ugly and unnecessary, and you should use concatenation instead&quot;.  [readability/multiline_string] [5]
Total errors found: 2 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508301</commentid>
    <comment_count>7</comment_count>
      <attachid>362546</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-02-20 15:30:09 -0800</bug_when>
    <thetext>Comment on attachment 362546
Patch

Clearing flags on attachment: 362546

Committed r241845: &lt;https://trac.webkit.org/changeset/241845&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508302</commentid>
    <comment_count>8</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-02-20 15:30:11 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362541</attachid>
            <date>2019-02-20 14:30:37 -0800</date>
            <delta_ts>2019-02-20 14:51:51 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194872-20190220143036.patch</filename>
            <type>text/plain</type>
            <size>9063</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI0MmNlYTE2OTg0MzQwZTNi
NjE2ODU2ZDdlNTY2YTNjOGZhNGViNTMuLjU4MTNjYWU5N2U2ZTU4OWFkNDg5MmEzYWFmOTI0ZjNk
MTJiZWI3YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDItMjAgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pICJSZWxv
YWQgd2l0aG91dCBjb250ZW50IGV4dGVuc2lvbnMiIGRvZXMgbm90IHdvcmsgd2hlbiB0aGUgbWFp
biByZXNvdXJjZSBpcyBibG9ja2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xOTQ4NzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3OTI0NTAwPgor
CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtXS1dlYlZp
ZXcgX3JlbG9hZFdpdGhvdXRDb250ZW50QmxvY2tlcnNdIHJlbGllcyBvbiBhIFJlbG9hZE9wdGlv
biBmbGFnIHRoYXQgaXMgcGFzc2VkIHRvIFdlYkNvcmUKKyAgICAgICAgaW5zdGVhZCBvZiB1c2lu
ZyBXZWJzaXRlUG9saWNpZXMuY29udGVudEJsb2NrZXJzRW5hYmxlZCBmbGFnLiBJZiB0aGUgcmVs
b2FkIGNhdXNlcyBhIHByb2Nlc3Mgc3dhcAorICAgICAgICBkdWUgdG8gUFNPTiwgdGhlbiB0aGUg
bmV3IHByb2Nlc3MgZG9lcyBub3Qga25vdyBhYm91dCB0aGlzIFJlbG9hZE9wdGlvbiBhbmQgZmFp
bHMgdG8gaG9ub3IgaXQuCisKKyAgICAgICAgU2luY2UgdGhlIG1vZGVybiB3YXkgdG8gZG8gdGhp
cyBpcyBXZWJzaXRlUG9saWNpZXMsIGFuZCBzaW5jZSBXZWJzaXRlUG9saWNpZXMgYXJlIHByb3Bl
cmx5CisgICAgICAgIHByb3BhZ2F0ZWQgY3Jvc3MtcHJvY2VzcyBpbiBjYXNlIG9mIHByb2Nlc3Mg
c3dhcCwgdGhpcyBwYXRjaCB1cGRhdGVzIF9yZWxvYWRXaXRob3V0Q29udGVudEJsb2NrZXJzCisg
ICAgICAgIHRvIHNldCBhIGZsYWcgb24gdGhlIE5hdmlnYXRpb24gd2hpY2ggd2UgdXNlIHRvIGxh
dGVyIHNldCB0aGUgV2Vic2l0ZVBvbGljaWVzLmNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQKKyAgICAg
ICAgZmxhZyBpbiBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9u
KCkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24uaDoKKyAgICAgICAg
KEFQSTo6TmF2aWdhdGlvbjo6c2V0VXNlckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCk6CisgICAg
ICAgIChBUEk6Ok5hdmlnYXRpb246OnVzZXJDb250ZW50RXh0ZW5zaW9uc0VuYWJsZWQgY29uc3Qp
OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0
OjpXZWJQYWdlUHJveHk6OnJlbG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6
cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24pOgorCiAyMDE5LTAyLTIwICBDYXJsb3Mg
R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBTZW5k
IGNsaWVudCBob3N0IGZkIGFuZCBsaWJyYXJ5IG5hbWUgYXMgd2ViIHByb2Nlc3MgY3JlYXRpb24g
cGFyYW1ldGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5h
dmlnYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uLmgK
aW5kZXggYzk5NmMzNjAzOTc0NjIxZWY0ZjkyYzA5ODgyZGVkNzY4OTYxYmQ5ZC4uMWFjM2M0Mzc0
MTczYmI0YzBmODIzZjI1ZTVlOWQwMDZlNzlkOGFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oCkBAIC0xMjQsNiArMTI0LDkgQEAgcHVibGljOgogICAg
IGJvb2wgb3BlbmVkQnlET01XaXRoT3BlbmVyKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0TmF2aWdh
dGlvbkFjdGlvbi5vcGVuZWRCeURPTVdpdGhPcGVuZXI7IH0KICAgICBjb25zdCBXZWJDb3JlOjpT
ZWN1cml0eU9yaWdpbkRhdGEmIHJlcXVlc3Rlck9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fbGFz
dE5hdmlnYXRpb25BY3Rpb24ucmVxdWVzdGVyT3JpZ2luOyB9CiAKKyAgICB2b2lkIHNldFVzZXJD
b250ZW50RXh0ZW5zaW9uc0VuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1fdXNlckNvbnRlbnRFeHRl
bnNpb25zRW5hYmxlZCA9IGVuYWJsZWQ7IH0KKyAgICBib29sIHVzZXJDb250ZW50RXh0ZW5zaW9u
c0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3VzZXJDb250ZW50RXh0ZW5zaW9uc0VuYWJsZWQ7
IH0KKwogICAgIFdlYkNvcmU6OkxvY2tIaXN0b3J5IGxvY2tIaXN0b3J5KCkgY29uc3QgeyByZXR1
cm4gbV9sYXN0TmF2aWdhdGlvbkFjdGlvbi5sb2NrSGlzdG9yeTsgfQogICAgIFdlYkNvcmU6Okxv
Y2tCYWNrRm9yd2FyZExpc3QgbG9ja0JhY2tGb3J3YXJkTGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1f
bGFzdE5hdmlnYXRpb25BY3Rpb24ubG9ja0JhY2tGb3J3YXJkTGlzdDsgfQogCkBAIC0xNjUsNiAr
MTY4LDcgQEAgcHJpdmF0ZToKICAgICBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhIG1fbGFz
dE5hdmlnYXRpb25BY3Rpb247CiAgICAgV2ViS2l0OjpGcmFtZUluZm9EYXRhIG1fb3JpZ2luYXRp
bmdGcmFtZUluZm87CiAgICAgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhIG1fZGVzdGluYXRp
b25GcmFtZVNlY3VyaXR5T3JpZ2luOworICAgIGJvb2wgbV91c2VyQ29udGVudEV4dGVuc2lvbnNF
bmFibGVkIHsgdHJ1ZSB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgQVBJCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1MmI0YzhlMjI3YTNiZDNkN2U0NTdiZjZj
NWRjZDBlMzZiMTg3YmRhLi4yNTc4MmI0MTZjNzgzOTMzYmI5YjVjOGI2OTBkMzMwOWQ3YjczYTcz
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr
KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTEzNDYsNiAr
MTM0NiwxMSBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlbG9hZChP
cHRpb25TZXQ8V2ViQ29yZTo6UmVsb2FkT3B0aW9uPiBvcAogICAgIAogICAgIGF1dG8gbmF2aWdh
dGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5jcmVhdGVSZWxvYWROYXZpZ2F0aW9uKCk7CiAKKyAg
ICAvLyBTdG9yZSBkZWNpc2lvbiB0byByZWxvYWQgd2l0aG91dCBjb250ZW50IGJsb2NrZXJzIG9u
IHRoZSBuYXZpZ2F0aW9uIHNvIHRoYXQgd2UgY2FuIGxhdGVyIHNldCB0aGUgY29ycmVzcG9uZGlu
ZworICAgIC8vIFdlYnNpdGVQb2xpY2llcyBmbGFnIGluIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWRO
YXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oKS4KKyAgICBpZiAob3B0aW9ucy5jb250YWlucyhXZWJD
b3JlOjpSZWxvYWRPcHRpb246OkRpc2FibGVDb250ZW50QmxvY2tlcnMpKQorICAgICAgICBuYXZp
Z2F0aW9uLT5zZXRVc2VyQ29udGVudEV4dGVuc2lvbnNFbmFibGVkKGZhbHNlKTsKKwogICAgIG1f
cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UmVsb2FkKG5hdmlnYXRpb24tPm5hdmln
YXRpb25JRCgpLCBvcHRpb25zLnRvUmF3KCksIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3Bh
Z2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIApA
QCAtMjc0MCw2ICsyNzQ1LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRp
b25Qb2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBCiAgICAgICAgICAg
ICBjaGFuZ2VXZWJzaXRlRGF0YVN0b3JlKHBvbGljaWVzLT53ZWJzaXRlRGF0YVN0b3JlKCktPndl
YnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgfQogCisgICAgaWYgKG5hdmlnYXRpb24gJiYgIW5hdmln
YXRpb24tPnVzZXJDb250ZW50RXh0ZW5zaW9uc0VuYWJsZWQoKSkgeworICAgICAgICBpZiAoIWRh
dGEpCisgICAgICAgICAgICBkYXRhID0gV2Vic2l0ZVBvbGljaWVzRGF0YSB7IH07CisgICAgICAg
IGRhdGEtPmNvbnRlbnRCbG9ja2Vyc0VuYWJsZWQgPSBmYWxzZTsKKyAgICB9CisKICAgICBpZiAo
cG9saWN5QWN0aW9uID09IFBvbGljeUFjdGlvbjo6VXNlICYmIG5hdmlnYXRpb24gJiYgKG5hdmln
YXRpb24tPmlzU3lzdGVtUHJldmlldygpIHx8IG5hdmlnYXRpb24tPnNob3VsZEZvcmNlRG93bmxv
YWQoKSkpCiAgICAgICAgIHBvbGljeUFjdGlvbiA9IFBvbGljeUFjdGlvbjo6RG93bmxvYWQ7CiAK
ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5Njcw
OGU3OWJhZDZhMDM1YThlZjcyMGRiYTlhOGU2M2QyOTViOWIxLi45NzFlMGI4NjhiOTk1OWYxOTFk
MTUxYWM5YTIxYmNjZTk2NmNmMDhlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv
VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDItMjAgIENocmlzIER1bWV6
ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pICJSZWxvYWQg
d2l0aG91dCBjb250ZW50IGV4dGVuc2lvbnMiIGRvZXMgbm90IHdvcmsgd2hlbiB0aGUgbWFpbiBy
ZXNvdXJjZSBpcyBibG9ja2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0xOTQ4NzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3OTI0NTAwPgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBBUEkgdGVz
dCBjb3ZlcmFnZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev
UHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisKIDIwMTktMDItMjAgIEFkcmlhbiBQZXJleiBk
ZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIEVuYWJs
ZSBzdXBwb3J0IGZvciBDT05URU5UX0VYVEVOU0lPTlMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RX
ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0gYi9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0
aW9uLm1tCmluZGV4IDhjOTZiZWMwM2IzZTcwZmZkZGFhMzQ5YTU2MmQ3MmM1NWE0MWQ1ZWYuLjBm
MjNiZThmNTc4M2ZhNTlhYmRkZGI0NDQ5Y2UyZTA0NjhjYWU1NzUgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24u
bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh
cE9uTmF2aWdhdGlvbi5tbQpAQCAtNDg2NCw2ICs0ODY0LDc1IEBAIFRFU1QoUHJvY2Vzc1N3YXAs
IENvbnRlbnRCbG9ja2luZ0FmdGVyUHJvY2Vzc1N3YXApCiAgICAgZG9uZSA9IGZhbHNlOwogfQog
CitzdGF0aWMgY29uc3QgY2hhciogbm90aWZ5TG9hZGVkQnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgK
KzxzY3JpcHQ+CisgICAgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMucHNvbi5wb3N0TWVz
c2FnZSgiTG9hZGVkIik7Cis8L3NjcmlwdD4KKylQU09OUkVTT1VSQ0UiOworCitURVNUKFByb2Nl
c3NTd2FwLCBDb250ZW50RXh0ZW5zaW9uQmxvY2tzTWFpbkxvYWRUaGVuUmVsb2FkV2l0aG91dEV4
dGVuc2lvbnMpCit7CisgICAgW1tXS0NvbnRlbnRSdWxlTGlzdFN0b3JlIGRlZmF1bHRTdG9yZV0g
cmVtb3ZlQ29udGVudFJ1bGVMaXN0Rm9ySWRlbnRpZmllcjpAIkNvbnRlbnRCbG9ja2luZ0FmdGVy
UHJvY2Vzc1N3YXBFeHRlbnNpb24iIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNFcnJvciAqZXJyb3Ip
IHsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRp
bDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBhdXRvIHByb2Nlc3NQb29s
Q29uZmlndXJhdGlvbiA9IHBzb25Qcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24oKTsKKyAgICBhdXRv
IHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENv
bmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRv
IHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g
YWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6
cHJvY2Vzc1Bvb2wuZ2V0KCldOworCisgICAgUmV0YWluUHRyPFBTT05NZXNzYWdlSGFuZGxlcj4g
bWVzc2FnZUhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTk1lc3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0
XSk7CisgICAgW1t3ZWJWaWV3Q29uZmlndXJhdGlvbiB1c2VyQ29udGVudENvbnRyb2xsZXJdIGFk
ZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOm1lc3NhZ2VIYW5kbGVyLmdldCgpIG5hbWU6QCJwc29uIl07
CisKKyAgICBfX2Jsb2NrIGJvb2wgZG9uZUNvbXBpbGluZyA9IGZhbHNlOworICAgIFtbV0tDb250
ZW50UnVsZUxpc3RTdG9yZSBkZWZhdWx0U3RvcmVdIGNvbXBpbGVDb250ZW50UnVsZUxpc3RGb3JJ
ZGVudGlmaWVyOkAiQ29udGVudEJsb2NraW5nQWZ0ZXJQcm9jZXNzU3dhcEV4dGVuc2lvbiIgZW5j
b2RlZENvbnRlbnRSdWxlTGlzdDpibG9ja21lRmlsdGVyIGNvbXBsZXRpb25IYW5kbGVyOl4oV0tD
b250ZW50UnVsZUxpc3QgKnJ1bGVMaXN0LCBOU0Vycm9yICplcnJvcikgeworCisgICAgICAgIEVY
UEVDVF9OT1RfTlVMTChydWxlTGlzdCk7CisgICAgICAgIEVYUEVDVF9OVUxMKGVycm9yKTsKKwor
ICAgICAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkudXNlckNvbnRlbnRDb250cm9sbGVy
IGFkZENvbnRlbnRSdWxlTGlzdDpydWxlTGlzdF07CisKKyAgICAgICAgZG9uZUNvbXBpbGluZyA9
IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lQ29tcGls
aW5nKTsKKworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBp
bml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3
LmFwcGxlLmNvbS9ibG9ja21lLmh0bWwiIHRvRGF0YTpub3RpZnlMb2FkZWRCeXRlc107CisgICAg
W3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBm
b3JVUkxTY2hlbWU6QCJQU09OIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tX
ZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNv
bmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIGRlbGVn
YXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAg
ICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAg
TlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNV
UkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXV07Cisg
ICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRp
bDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICByZWNlaXZlZE1lc3NhZ2Ug
PSBmYWxzZTsKKyAgICBmYWlsZWQgPSBmYWxzZTsKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVz
dCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cuYXBwbGUu
Y29tL2Jsb2NrbWUuaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsK
KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFs
c2U7CisgICAgRVhQRUNUX0ZBTFNFKHJlY2VpdmVkTWVzc2FnZSk7CisKKyAgICBbd2ViVmlldyBf
bG9hZEFsdGVybmF0ZUhUTUxTdHJpbmc6QCJCbG9ja2VkIiBiYXNlVVJMOltOU1VSTCBVUkxXaXRo
U3RyaW5nOkAiZGF0YTp0ZXh0L2h0bWwsIl0gZm9yVW5yZWFjaGFibGVVUkw6W05TVVJMIFVSTFdp
dGhTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9ibG9ja21lLmh0bWwiXV07CisgICAgVGVz
dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBb
d2ViVmlldyBfcmVsb2FkV2l0aG91dENvbnRlbnRCbG9ja2Vyc107CisgICAgVGVzdFdlYktpdEFQ
STo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7CisKKyAgICBFWFBFQ1RfRkFM
U0UoZmFpbGVkKTsKKyAgICBFWFBFQ1RfVFJVRShyZWNlaXZlZE1lc3NhZ2UpOworICAgIEVYUEVD
VF9XS19TVFJFUShAInBzb246Ly93d3cuYXBwbGUuY29tL2Jsb2NrbWUuaHRtbCIsIFtbd2ViVmll
dyBVUkxdIGFic29sdXRlU3RyaW5nXSk7Cit9CisKIHN0YXRpYyBib29sIGlzQ2FwdHVyaW5nID0g
ZmFsc2U7CiBAaW50ZXJmYWNlIEdldFVzZXJNZWRpYVVJRGVsZWdhdGUgOiBOU09iamVjdDxXS1VJ
RGVsZWdhdGU+CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHJlcXVlc3RV
c2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRGV2aWNlczooX1dLQ2FwdHVyZURldmljZXMpZGV2aWNl
cyB1cmw6KE5TVVJMICopdXJsIG1haW5GcmFtZVVSTDooTlNVUkwgKiltYWluRnJhbWVVUkwgZGVj
aXNpb25IYW5kbGVyOih2b2lkICheKShCT09MIGF1dGhvcml6ZWQpKWRlY2lzaW9uSGFuZGxlcjsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362546</attachid>
            <date>2019-02-20 14:51:53 -0800</date>
            <delta_ts>2019-02-20 15:30:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194872-20190220145152.patch</filename>
            <type>text/plain</type>
            <size>9318</size>
            <attacher name="Chris Dumez">cdumez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI0MmNlYTE2OTg0MzQwZTNi
NjE2ODU2ZDdlNTY2YTNjOGZhNGViNTMuLjc1NThkZDJiOTI3MGZmODMxMTBlM2YxODY3MWU5ZjVk
NTUwMmI1ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDItMjAgIENocmlzIER1
bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pICJSZWxv
YWQgd2l0aG91dCBjb250ZW50IGV4dGVuc2lvbnMiIGRvZXMgbm90IHdvcmsgd2hlbiB0aGUgbWFp
biByZXNvdXJjZSBpcyBibG9ja2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0xOTQ4NzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ3OTI0NTAwPgor
CisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgW1dLV2Vi
VmlldyBfcmVsb2FkV2l0aG91dENvbnRlbnRCbG9ja2Vyc10gcmVsaWVzIG9uIGEgUmVsb2FkT3B0
aW9uIGZsYWcgdGhhdCBpcyBwYXNzZWQgdG8gV2ViQ29yZQorICAgICAgICBpbnN0ZWFkIG9mIHVz
aW5nIFdlYnNpdGVQb2xpY2llcy5jb250ZW50QmxvY2tlcnNFbmFibGVkIGZsYWcuIElmIHRoZSBy
ZWxvYWQgY2F1c2VzIGEgcHJvY2VzcyBzd2FwCisgICAgICAgIGR1ZSB0byBQU09OLCB0aGVuIHRo
ZSBuZXcgcHJvY2VzcyBkb2VzIG5vdCBrbm93IGFib3V0IHRoaXMgUmVsb2FkT3B0aW9uIGFuZCBm
YWlscyB0byBob25vciBpdC4KKworICAgICAgICBTaW5jZSB0aGUgbW9kZXJuIHdheSB0byBkbyB0
aGlzIGlzIFdlYnNpdGVQb2xpY2llcywgYW5kIHNpbmNlIFdlYnNpdGVQb2xpY2llcyBhcmUgcHJv
cGVybHkKKyAgICAgICAgcHJvcGFnYXRlZCBjcm9zcy1wcm9jZXNzIGluIGNhc2Ugb2YgcHJvY2Vz
cyBzd2FwLCB0aGlzIHBhdGNoIHVwZGF0ZXMgX3JlbG9hZFdpdGhvdXRDb250ZW50QmxvY2tlcnMK
KyAgICAgICAgdG8gc2V0IGEgZmxhZyBvbiB0aGUgTmF2aWdhdGlvbiB3aGljaCB3ZSB1c2UgdG8g
bGF0ZXIgc2V0IHRoZSBXZWJzaXRlUG9saWNpZXMuY29udGVudEJsb2NrZXJzRW5hYmxlZAorICAg
ICAgICBmbGFnIGluIFdlYlBhZ2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNp
b24oKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oOgorICAgICAg
ICAoQVBJOjpOYXZpZ2F0aW9uOjpzZXRVc2VyQ29udGVudEV4dGVuc2lvbnNFbmFibGVkKToKKyAg
ICAgICAgKEFQSTo6TmF2aWdhdGlvbjo6dXNlckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCBjb25z
dCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJL
aXQ6OldlYlBhZ2VQcm94eTo6cmVsb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5
OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbik6CisKIDIwMTktMDItMjAgIENhcmxv
cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIFNl
bmQgY2xpZW50IGhvc3QgZmQgYW5kIGxpYnJhcnkgbmFtZSBhcyB3ZWIgcHJvY2VzcyBjcmVhdGlv
biBwYXJhbWV0ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJ
TmF2aWdhdGlvbi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24u
aAppbmRleCBjOTk2YzM2MDM5NzQ2MjFlZjRmOTJjMDk4ODJkZWQ3Njg5NjFiZDlkLi4xYWMzYzQz
NzQxNzNiYjRjMGY4MjNmMjVlNWU5ZDAwNmU3OWQ4YWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uLmgKQEAgLTEyNCw2ICsxMjQsOSBAQCBwdWJsaWM6CiAg
ICAgYm9vbCBvcGVuZWRCeURPTVdpdGhPcGVuZXIoKSBjb25zdCB7IHJldHVybiBtX2xhc3ROYXZp
Z2F0aW9uQWN0aW9uLm9wZW5lZEJ5RE9NV2l0aE9wZW5lcjsgfQogICAgIGNvbnN0IFdlYkNvcmU6
OlNlY3VyaXR5T3JpZ2luRGF0YSYgcmVxdWVzdGVyT3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9s
YXN0TmF2aWdhdGlvbkFjdGlvbi5yZXF1ZXN0ZXJPcmlnaW47IH0KIAorICAgIHZvaWQgc2V0VXNl
ckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV91c2VyQ29udGVudEV4
dGVuc2lvbnNFbmFibGVkID0gZW5hYmxlZDsgfQorICAgIGJvb2wgdXNlckNvbnRlbnRFeHRlbnNp
b25zRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlckNvbnRlbnRFeHRlbnNpb25zRW5hYmxl
ZDsgfQorCiAgICAgV2ViQ29yZTo6TG9ja0hpc3RvcnkgbG9ja0hpc3RvcnkoKSBjb25zdCB7IHJl
dHVybiBtX2xhc3ROYXZpZ2F0aW9uQWN0aW9uLmxvY2tIaXN0b3J5OyB9CiAgICAgV2ViQ29yZTo6
TG9ja0JhY2tGb3J3YXJkTGlzdCBsb2NrQmFja0ZvcndhcmRMaXN0KCkgY29uc3QgeyByZXR1cm4g
bV9sYXN0TmF2aWdhdGlvbkFjdGlvbi5sb2NrQmFja0ZvcndhcmRMaXN0OyB9CiAKQEAgLTE2NSw2
ICsxNjgsNyBAQCBwcml2YXRlOgogICAgIFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbkRhdGEgbV9s
YXN0TmF2aWdhdGlvbkFjdGlvbjsKICAgICBXZWJLaXQ6OkZyYW1lSW5mb0RhdGEgbV9vcmlnaW5h
dGluZ0ZyYW1lSW5mbzsKICAgICBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEgbV9kZXN0aW5h
dGlvbkZyYW1lU2VjdXJpdHlPcmlnaW47CisgICAgYm9vbCBtX3VzZXJDb250ZW50RXh0ZW5zaW9u
c0VuYWJsZWQgeyB0cnVlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBBUEkKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDUyYjRjOGUyMjdhM2JkM2Q3ZTQ1N2Jm
NmM1ZGNkMGUzNmIxODdiZGEuLjI1NzgyYjQxNmM3ODM5MzNiYjliNWM4YjY5MGQzMzA5ZDdiNzNh
NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTM0Niw2
ICsxMzQ2LDExIEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVsb2Fk
KE9wdGlvblNldDxXZWJDb3JlOjpSZWxvYWRPcHRpb24+IG9wCiAgICAgCiAgICAgYXV0byBuYXZp
Z2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZVJlbG9hZE5hdmlnYXRpb24oKTsKIAor
ICAgIC8vIFN0b3JlIGRlY2lzaW9uIHRvIHJlbG9hZCB3aXRob3V0IGNvbnRlbnQgYmxvY2tlcnMg
b24gdGhlIG5hdmlnYXRpb24gc28gdGhhdCB3ZSBjYW4gbGF0ZXIgc2V0IHRoZSBjb3JyZXNwb25k
aW5nCisgICAgLy8gV2Vic2l0ZVBvbGljaWVzIGZsYWcgaW4gV2ViUGFnZVByb3h5OjpyZWNlaXZl
ZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbigpLgorICAgIGlmIChvcHRpb25zLmNvbnRhaW5zKFdl
YkNvcmU6OlJlbG9hZE9wdGlvbjo6RGlzYWJsZUNvbnRlbnRCbG9ja2VycykpCisgICAgICAgIG5h
dmlnYXRpb24tPnNldFVzZXJDb250ZW50RXh0ZW5zaW9uc0VuYWJsZWQoZmFsc2UpOworCiAgICAg
bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpSZWxvYWQobmF2aWdhdGlvbi0+bmF2
aWdhdGlvbklEKCksIG9wdGlvbnMudG9SYXcoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSksIG1f
cGFnZUlEKTsKICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwog
CkBAIC0yNzQwLDYgKzI3NDUsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdh
dGlvblBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEEKICAgICAgICAg
ICAgIGNoYW5nZVdlYnNpdGVEYXRhU3RvcmUocG9saWNpZXMtPndlYnNpdGVEYXRhU3RvcmUoKS0+
d2Vic2l0ZURhdGFTdG9yZSgpKTsKICAgICB9CiAKKyAgICBpZiAobmF2aWdhdGlvbiAmJiAhbmF2
aWdhdGlvbi0+dXNlckNvbnRlbnRFeHRlbnNpb25zRW5hYmxlZCgpKSB7CisgICAgICAgIGlmICgh
ZGF0YSkKKyAgICAgICAgICAgIGRhdGEgPSBXZWJzaXRlUG9saWNpZXNEYXRhIHsgfTsKKyAgICAg
ICAgZGF0YS0+Y29udGVudEJsb2NrZXJzRW5hYmxlZCA9IGZhbHNlOworICAgIH0KKwogICAgIGlm
IChwb2xpY3lBY3Rpb24gPT0gUG9saWN5QWN0aW9uOjpVc2UgJiYgbmF2aWdhdGlvbiAmJiAobmF2
aWdhdGlvbi0+aXNTeXN0ZW1QcmV2aWV3KCkgfHwgbmF2aWdhdGlvbi0+c2hvdWxkRm9yY2VEb3du
bG9hZCgpKSkKICAgICAgICAgcG9saWN5QWN0aW9uID0gUG9saWN5QWN0aW9uOjpEb3dubG9hZDsK
IApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDk2
NzA4ZTc5YmFkNmEwMzVhOGVmNzIwZGJhOWE4ZTYzZDI5NWI5YjEuLjE0MDA2MjkxNDU2ZmZlZTcz
Y2MwMjk5MTAxMGNmYmY3NzBmOGJlNmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg
Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wMi0yMCAgQ2hyaXMgRHVt
ZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgIlJlbG9h
ZCB3aXRob3V0IGNvbnRlbnQgZXh0ZW5zaW9ucyIgZG9lcyBub3Qgd29yayB3aGVuIHRoZSBtYWlu
IHJlc291cmNlIGlzIGJsb2NrZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv
d19idWcuY2dpP2lkPTE5NDg3MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDc5MjQ1MDA+CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4KKworICAgICAgICBBZGQgQVBJ
IHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv
Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorCiAyMDE5LTAyLTIwICBBZHJpYW4gUGVy
ZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBF
bmFibGUgc3VwcG9ydCBmb3IgQ09OVEVOVF9FWFRFTlNJT05TCmRpZmYgLS1naXQgYS9Ub29scy9U
ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1t
IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2
aWdhdGlvbi5tbQppbmRleCA4Yzk2YmVjMDNiM2U3MGZmZGRhYTM0OWE1NjJkNzJjNTVhNDFkNWVm
Li45MGQzMTJmZjEyNTgyZTZmYmJmZTJiZDJmODYzMTdkMjRkZmZlZTkyIDEwMDY0NAotLS0gYS9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0
aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz
c1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTQ4NjQsNiArNDg2NCw4MSBAQCBURVNUKFByb2Nlc3NT
d2FwLCBDb250ZW50QmxvY2tpbmdBZnRlclByb2Nlc3NTd2FwKQogICAgIGRvbmUgPSBmYWxzZTsK
IH0KIAorc3RhdGljIGNvbnN0IGNoYXIqIG5vdGlmeUxvYWRlZEJ5dGVzID0gUiJQU09OUkVTT1VS
Q0UoCis8c2NyaXB0PgorICAgIHdpbmRvdy53ZWJraXQubWVzc2FnZUhhbmRsZXJzLnBzb24ucG9z
dE1lc3NhZ2UoIkxvYWRlZCIpOworPC9zY3JpcHQ+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQ
cm9jZXNzU3dhcCwgQ29udGVudEV4dGVuc2lvbkJsb2Nrc01haW5Mb2FkVGhlblJlbG9hZFdpdGhv
dXRFeHRlbnNpb25zKQoreworICAgIFtbV0tDb250ZW50UnVsZUxpc3RTdG9yZSBkZWZhdWx0U3Rv
cmVdIHJlbW92ZUNvbnRlbnRSdWxlTGlzdEZvcklkZW50aWZpZXI6QCJDb250ZW50QmxvY2tpbmdB
ZnRlclByb2Nlc3NTd2FwRXh0ZW5zaW9uIiBjb21wbGV0aW9uSGFuZGxlcjpeKE5TRXJyb3IgKmVy
cm9yKSB7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6
OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgYXV0byBwcm9jZXNz
UG9vbENvbmZpZ3VyYXRpb24gPSBwc29uUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCk7CisgICAg
YXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdp
dGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAg
YXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0
aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQ
b29sOnByb2Nlc3NQb29sLmdldCgpXTsKKworICAgIFJldGFpblB0cjxQU09OTWVzc2FnZUhhbmRs
ZXI+IG1lc3NhZ2VIYW5kbGVyID0gYWRvcHROUyhbW1BTT05NZXNzYWdlSGFuZGxlciBhbGxvY10g
aW5pdF0pOworICAgIFtbd2ViVmlld0NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVy
XSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjptZXNzYWdlSGFuZGxlci5nZXQoKSBuYW1lOkAicHNv
biJdOworCisgICAgX19ibG9jayBib29sIGRvbmVDb21waWxpbmcgPSBmYWxzZTsKKyAgICBbW1dL
Q29udGVudFJ1bGVMaXN0U3RvcmUgZGVmYXVsdFN0b3JlXSBjb21waWxlQ29udGVudFJ1bGVMaXN0
Rm9ySWRlbnRpZmllcjpAIkNvbnRlbnRCbG9ja2luZ0FmdGVyUHJvY2Vzc1N3YXBFeHRlbnNpb24i
IGVuY29kZWRDb250ZW50UnVsZUxpc3Q6YmxvY2ttZUZpbHRlciBjb21wbGV0aW9uSGFuZGxlcjpe
KFdLQ29udGVudFJ1bGVMaXN0ICpydWxlTGlzdCwgTlNFcnJvciAqZXJyb3IpIHsKKworICAgICAg
ICBFWFBFQ1RfTk9UX05VTEwocnVsZUxpc3QpOworICAgICAgICBFWFBFQ1RfTlVMTChlcnJvcik7
CisKKyAgICAgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLnVzZXJDb250ZW50Q29udHJv
bGxlciBhZGRDb250ZW50UnVsZUxpc3Q6cnVsZUxpc3RdOworCisgICAgICAgIGRvbmVDb21waWxp
bmcgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZUNv
bXBpbGluZyk7CisKKyAgICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxv
Y10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjov
L3d3dy5hcHBsZS5jb20vYmxvY2ttZS5odG1sIiB0b0RhdGE6bm90aWZ5TG9hZGVkQnl0ZXNdOwor
ICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0
KCkgZm9yVVJMU2NoZW1lOkAiUFNPTiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb
W1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAw
KSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBk
ZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7
CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKwor
ICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6
W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIl1d
OworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworICAgIFRlc3RXZWJLaXRBUEk6
OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgcmVjZWl2ZWRNZXNz
YWdlID0gZmFsc2U7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgcmVxdWVzdCA9IFtOU1VSTFJl
cXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LmFw
cGxlLmNvbS9ibG9ja21lLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVz
dF07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9
IGZhbHNlOworICAgIEVYUEVDVF9GQUxTRShyZWNlaXZlZE1lc3NhZ2UpOworCisgICAgW3dlYlZp
ZXcgX2xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nOkAiQmxvY2tlZCIgYmFzZVVSTDpbTlNVUkwgVVJM
V2l0aFN0cmluZzpAImRhdGE6dGV4dC9odG1sLCJdIGZvclVucmVhY2hhYmxlVVJMOltOU1VSTCBV
UkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy5hcHBsZS5jb20vYmxvY2ttZS5odG1sIl1dOworICAg
IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisg
ICAgW3dlYlZpZXcgX3JlbG9hZFdpdGhvdXRDb250ZW50QmxvY2tlcnNdOworICAgIFRlc3RXZWJL
aXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworCisgICAgRVhQRUNU
X0ZBTFNFKGZhaWxlZCk7CisgICAgRVhQRUNUX1RSVUUocmVjZWl2ZWRNZXNzYWdlKTsKKyAgICBF
WFBFQ1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LmFwcGxlLmNvbS9ibG9ja21lLmh0bWwiLCBbW3dl
YlZpZXcgVVJMXSBhYnNvbHV0ZVN0cmluZ10pOworCisgICAgW1tXS0NvbnRlbnRSdWxlTGlzdFN0
b3JlIGRlZmF1bHRTdG9yZV0gcmVtb3ZlQ29udGVudFJ1bGVMaXN0Rm9ySWRlbnRpZmllcjpAIkNv
bnRlbnRCbG9ja2luZ0FmdGVyUHJvY2Vzc1N3YXBFeHRlbnNpb24iIGNvbXBsZXRpb25IYW5kbGVy
Ol4oTlNFcnJvciAqZXJyb3IpIHsKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAg
VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cit9CisK
IHN0YXRpYyBib29sIGlzQ2FwdHVyaW5nID0gZmFsc2U7CiBAaW50ZXJmYWNlIEdldFVzZXJNZWRp
YVVJRGVsZWdhdGUgOiBOU09iamVjdDxXS1VJRGVsZWdhdGU+CiAtICh2b2lkKV93ZWJWaWV3OihX
S1dlYlZpZXcgKil3ZWJWaWV3IHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRGV2aWNl
czooX1dLQ2FwdHVyZURldmljZXMpZGV2aWNlcyB1cmw6KE5TVVJMICopdXJsIG1haW5GcmFtZVVS
TDooTlNVUkwgKiltYWluRnJhbWVVUkwgZGVjaXNpb25IYW5kbGVyOih2b2lkICheKShCT09MIGF1
dGhvcml6ZWQpKWRlY2lzaW9uSGFuZGxlcjsK
</data>

          </attachment>
      

    </bug>

</bugzilla>