<?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>206506</bug_id>
          
          <creation_ts>2020-01-20 09:44:53 -0800</creation_ts>
          <short_desc>[GTK] Improve user agent quirk for Google Docs and Google Drive</short_desc>
          <delta_ts>2021-02-17 07:07:31 -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>WebKitGTK</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=208647</see_also>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=142074</see_also>
          <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="Michael Catanzaro">mcatanzaro</reporter>
          <assigned_to name="Michael Catanzaro">mcatanzaro</assigned_to>
          <cc>bugs-noreply</cc>
    
    <cc>cgarcia</cc>
    
    <cc>commit-queue</cc>
    
    <cc>mcatanzaro</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1608787</commentid>
    <comment_count>0</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-01-20 09:44:53 -0800</bug_when>
    <thetext>I&apos;m getting a warning when viewing docs.google.com with 2.27.3: &quot;This browser is no longer supported&quot;

The Chromium version in UserAgentQuirks.cpp is going to need to be updated (latest tagged version is 81.0.4033.1). This probably ought to be updated before every new release of WebKitGTK or it will just keep breaking again and again.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1609010</commentid>
    <comment_count>1</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2020-01-21 06:28:27 -0800</bug_when>
    <thetext>I can&apos;t reproduce, but I guess it&apos;s ok to bump the chromium version in the UA string in any case.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1610322</commentid>
    <comment_count>2</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-01-23 14:18:42 -0800</bug_when>
    <thetext>Erm, sorry, docs.google.com doesn&apos;t even use the Chromium user agent. It uses the macOS user agent. (We should still update the Chromium user agent anyway, of course.)

I&apos;m also not sure what it doesn&apos;t like about our macOS quirk. We&apos;re sending &quot;Version/13.0 Safari/605.1.15&quot;, &quot;Macintosh; Intel Mac OS X 10_15&quot;... this is already the latest Safari (plus our frozen maximum WebKit version). Maintaining the user agent quirks was always my least-favorite task....

Not sure why you can&apos;t reproduce.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1620915</commentid>
    <comment_count>3</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-19 15:39:44 -0800</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #2)
&gt; Not sure why you can&apos;t reproduce.

I think the warning only occurs for the first document viewed after signing into your Google account. Reproducer is to click a link to a Google document while not signed into a Google account.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1620930</commentid>
    <comment_count>4</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-19 16:18:56 -0800</bug_when>
    <thetext>OK, in this case:

 * My favorite quirk, the macOS quirk, is no longer working to avoid the unsupported browser warnings, and has resulted in a bunch of complaints from users because Google Docs displays Mac-specific commands when using this quirk.
 * We can&apos;t use our fallback Chromium quirk, because Google Docs will try doing Chrome-specific things if it does.

So we need to introduce a Firefox user agent quirk, and hope for the best. It seems to work for me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1620956</commentid>
    <comment_count>5</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-19 17:05:59 -0800</bug_when>
    <thetext>Well I have a Firefox quirk that works, but it&apos;s hard to figure out the right set of URLs to apply it to. Whatever URL is performing the actual user agent check is not one that we currently recognize as a Google domain. I&apos;ll have to keep trying here.

I remember this problem was very frustrating last time I work on this quirk.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621016</commentid>
    <comment_count>6</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-19 18:59:14 -0800</bug_when>
    <thetext>OK, I figured it out. We have to send the fake UA to accounts.youtube.com. Because of course youtube.com is responsible for displaying unsupported browser warnings in Google Docs....</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621335</commentid>
    <comment_count>7</comment_count>
      <attachid>391313</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-20 11:36:36 -0800</bug_when>
    <thetext>Created attachment 391313
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621354</commentid>
    <comment_count>8</comment_count>
      <attachid>391313</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-20 12:21:19 -0800</bug_when>
    <thetext>Comment on attachment 391313
Patch

I must have done something wrong when testing Google Drive. It&apos;s still broken.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621419</commentid>
    <comment_count>9</comment_count>
      <attachid>391334</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2020-02-20 14:24:07 -0800</bug_when>
    <thetext>Created attachment 391334
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621581</commentid>
    <comment_count>10</comment_count>
      <attachid>391334</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-02-20 23:44:12 -0800</bug_when>
    <thetext>Comment on attachment 391334
Patch

Clearing flags on attachment: 391334

Committed r257128: &lt;https://trac.webkit.org/changeset/257128&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1621582</commentid>
    <comment_count>11</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-02-20 23:44:14 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>391313</attachid>
            <date>2020-02-20 11:36:36 -0800</date>
            <delta_ts>2020-02-20 14:24:05 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-206506-20200220133635.patch</filename>
            <type>text/plain</type>
            <size>9079</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZiMmIwYzVhY2M1Yzk5
MTBlZTc0YWY5YTBmMmE5NDUwNjUyMWJmMy4uOWE1NThkYjkyMmZkNTMwYTE0ODEzYWY2Y2E4MmEy
ZTExOTY5NzNmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTAyLTIwICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIElt
cHJvdmUgdXNlciBhZ2VudCBxdWlyayBmb3IgR29vZ2xlIERvY3MKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjUwNgorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3AgdXNpbmcgb3VyIG1hY09TIHBsYXRm
b3JtIHF1aXJrIGZvciBHb29nbGUgRG9jcyBhbmQgR29vZ2xlIERyaXZlLiBJdCBpcyBub3Qgc3Vj
Y2Vzc2Z1bGx5CisgICAgICAgIHN1cHByZXNzaW5nIHRoZSB1bnN1cHBvcnRlZCBicm93c2VyIHdh
cm5pbmdzIHRoYXQgaXQgd2FzIGFkZGVkIHRvIGF2b2lkLiBJdCBpcyBhbHNvCisgICAgICAgIHJl
c3BvbnNpYmxlIGZvciBjb21wbGFpbnRzIGZyb20gdXNlcnMgd2hvIGRvIG5vdCBsaWtlIHNlZWlu
ZyBtYWNPUy1zdHlsZSBzaG9ydGN1dHMgd2l0aAorICAgICAgICB0aGUgQ29tbWFuZCBrZXkgcmF0
aGVyIHRoYW4gQ3RybC4KKworICAgICAgICBSZXBsYWNlIGl0IHdpdGggYSBuZXcgRmlyZWZveCBi
cm93c2VyIHF1aXJrLiBXZSBjYW4gYXZvaWQgdGhlIHVuc3VwcG9ydGVkIGJyb3dzZXIgd2Fybmlu
ZyBieQorICAgICAgICB1c2luZyB0aGlzIHF1aXJrIG9ubHkgb24gYWNjb3VudHMueW91dHViZS5j
b20uIFRoZXJlJ3Mgbm8gbmVlZCBmb3IgYW55IG90aGVyIHF1aXJrIHNwZWNpZmljCisgICAgICAg
IHRvIEdvb2dsZSBEb2NzIChhbHRob3VnaCByZW1vdmluZyB0aGUgbWFjT1MgcGxhdGZvcm0gcXVp
cmsgbWVhbnMgd2UnbGwgaW5zdGVhZCBiZWdpbiB1c2luZworICAgICAgICB0aGUgeDg2XzY0IExp
bnV4IHF1aXJrIHRoYXQgd2Ugc2VuZCB0byBvdGhlciBHb29nbGUgZG9tYWlucykuCisKKyAgICAg
ICAgKiBwbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dXJs
UmVxdWlyZXNGaXJlZm94QnJvd3Nlcik6CisgICAgICAgIChXZWJDb3JlOjp1cmxSZXF1aXJlc01h
Y2ludG9zaFBsYXRmb3JtKToKKyAgICAgICAgKFdlYkNvcmU6OnVybFJlcXVpcmVzTGludXhEZXNr
dG9wUGxhdGZvcm0pOgorICAgICAgICAoV2ViQ29yZTo6VXNlckFnZW50UXVpcmtzOjpxdWlya3NG
b3JVUkwpOgorICAgICAgICAoV2ViQ29yZTo6VXNlckFnZW50UXVpcmtzOjpzdHJpbmdGb3JRdWly
ayk6CisgICAgICAgICogcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmg6CisgICAgICAgICogcGxh
dGZvcm0vZ2xpYi9Vc2VyQWdlbnRHTGliLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkVXNl
ckFnZW50U3RyaW5nKToKKwogMjAyMC0wMi0xOSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs
ZS5jb20+CiAKICAgICAgICAgW21hYyBkZWJ1Z10gUmVncmVzc2lvbjogaHR0cC90ZXN0cy93ZWJz
b2NrZXQvdGVzdHMvaHliaS93b3JrZXJzL3dvcmtlci1yZWxvYWQuaHRtbCBpcyBhIGZsYWt5IGNy
YXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3Mu
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmNwcAppbmRleCA2
MTM0ZGUxOTM1NTcyZGI5NWIxMjlkNGUwMDQ3NDhmZTBlZmVhZGRkLi42ZTk1NzYzZmY1Y2I3MzBh
MWI2OWUxYWNmOGFmNWEwMDRjM2UyODQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Vz
ZXJBZ2VudFF1aXJrcy5jcHAKQEAgLTcwLDYgKzcwLDI0IEBAIHN0YXRpYyBib29sIHVybFJlcXVp
cmVzQ2hyb21lQnJvd3Nlcihjb25zdCBVUkwmIHVybCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK
Ky8vIFByZWZlciB1c2luZyB0aGUgbWFjT1MgcGxhdGZvcm0gcXVpcmsgcmF0aGVyIHRoYW4gdGhl
IEZpcmVmb3ggcXVpcmsuIFRoaXMKKy8vIHF1aXJrIGlzIGdvb2QgZm9yIHdlYnNpdGVzIHRoYXQg
ZG8gbWFjT1Mtc3BlY2lmaWMgdGhpbmdzIHdlIGRvbid0IHdhbnQgb24KKy8vIG90aGVyIHBsYXRm
b3JtcywgYW5kIHdoZW4gdGhlIHJpc2sgb2YgdGhlIHdlYnNpdGUgZG9pbmcgRmlyZWZveC1zcGVj
aWZpYworLy8gdGhpbmdzIGlzIHJlbGF0aXZlbHkgbG93Lgorc3RhdGljIGJvb2wgdXJsUmVxdWly
ZXNGaXJlZm94QnJvd3Nlcihjb25zdCBVUkwmIHVybCkKK3sKKyAgICBTdHJpbmcgZG9tYWluID0g
dXJsLmhvc3QoKS50b1N0cmluZygpOworCisgICAgLy8gVGhpcyBxdWlyayBhY3R1YWxseSBoYXMg
bm90aGluZyB0byBkbyB3aXRoIFlvdVR1YmUuIEl0J3MgbmVlZGVkIHRvIGF2b2lkCisgICAgLy8g
dW5zdXBwb3J0ZWQgYnJvd3NlciB3YXJuaW5ncyBvbiBHb29nbGUgRG9jcyBhbmQgR29vZ2xlIERy
aXZlLiBBZnRlcgorICAgIC8vIHJlbW92aW5nIHRoaXMgcXVpcmssIHRvIHJlcHJvZHVjZSB0aGUg
d2FybmluZ3MgaW4gR29vZ2xlIERvY3MgeW91IHdpbGwKKyAgICAvLyBuZWVkIHRvIHNpZ24gb3V0
IG9mIEdvb2dsZSwgdGhlbiBjbGljayBvbiBhIGxpbmsgdG8gYSBub24tcHVibGljIGRvY3VtZW50
CisgICAgLy8gdGhhdCByZXF1aXJlcyBzaWduaW5nIGluLiBUaGUgdW5zdXBwb3J0ZWQgYnJvd3Nl
ciB3YXJuaW5nIHdpbGwgYmUKKyAgICAvLyBkaXNwbGF5ZWQgb25seSBhZnRlciBzaWduaW5nIGlu
LiBSZXByb2R1Y2luZyB0aGUgd2FybmluZyBpbiBHb29nbGUgRHJpdmUKKyAgICAvLyBpcyBlYXNp
ZXIgYW5kIGp1c3QgcmVxdWlyZXMgc2lnbmluZyBpbnRvIEdvb2dsZSBEcml2ZS4KKyAgICByZXR1
cm4gZG9tYWluID09ICJhY2NvdW50cy55b3V0dWJlLmNvbSI7Cit9CisKIHN0YXRpYyBib29sIHVy
bFJlcXVpcmVzTWFjaW50b3NoUGxhdGZvcm0oY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgU3RyaW5n
IGRvbWFpbiA9IHVybC5ob3N0KCkudG9TdHJpbmcoKTsKQEAgLTEwNCwxMiArMTIyLDYgQEAgc3Rh
dGljIGJvb2wgdXJsUmVxdWlyZXNNYWNpbnRvc2hQbGF0Zm9ybShjb25zdCBVUkwmIHVybCkKICAg
ICAgICAgfHwgZG9tYWluID09ICJleGNoYW5nZS50dS1iZXJsaW4uZGUiKQogICAgICAgICByZXR1
cm4gdHJ1ZTsKIAotICAgIC8vIEdvb2dsZSBEb2NzIGFuZCBHb29nbGUgRHJpdmUgYm90aCBzaG93
IGEgc2NhcnkgdW5zdXBwb3J0ZWQgYnJvd3NlcgotICAgIC8vIHdhcm5pbmcgd2l0aCBXZWJLaXRH
VEsncyBzdGFuZGFyZCB1c2VyIGFnZW50LgotICAgIGlmIChkb21haW4gPT0gImRvY3MuZ29vZ2xl
LmNvbSIKLSAgICAgICAgfHwgZG9tYWluID09ICJkcml2ZS5nb29nbGUuY29tIikKLSAgICAgICAg
cmV0dXJuIHRydWU7Ci0KICAgICAvLyBCYW5rIG9mIEFtZXJpY2Egc2hvd3MgYW4gdW5zdXBwb3J0
ZWQgYnJvd3NlciB3YXJuaW5nIHdpdGggV2ViS2l0R1RLJ3MKICAgICAvLyBzdGFuZGFyZCB1c2Vy
IGFnZW50LgogICAgIGlmIChiYXNlRG9tYWluID09ICJiYW5rb2ZhbWVyaWNhLmNvbSIpCkBAIC0x
MjAsMTAgKzEzMiw3IEBAIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTWFjaW50b3NoUGxhdGZvcm0o
Y29uc3QgVVJMJiB1cmwpCiAKIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTGludXhEZXNrdG9wUGxh
dGZvcm0oY29uc3QgVVJMJiB1cmwpCiB7Ci0gICAgLy8gZG9jcy5nb29nbGUuY29tIGFuZCBkcml2
ZS5nb29nbGUuY29tIHJlcXVpcmUgdGhlIG1hY09TIHBsYXRmb3JtIHF1aXJrLgotICAgIHJldHVy
biBpc0dvb2dsZSh1cmwpCi0gICAgICAgICYmIHVybC5ob3N0KCkgIT0gImRvY3MuZ29vZ2xlLmNv
bSIKLSAgICAgICAgJiYgdXJsLmhvc3QoKSAhPSAiZHJpdmUuZ29vZ2xlLmNvbSI7CisgICAgcmV0
dXJuIGlzR29vZ2xlKHVybCk7CiB9CiAKIFVzZXJBZ2VudFF1aXJrcyBVc2VyQWdlbnRRdWlya3M6
OnF1aXJrc0ZvclVSTChjb25zdCBVUkwmIHVybCkKQEAgLTEzNCw2ICsxNDMsOCBAQCBVc2VyQWdl
bnRRdWlya3MgVXNlckFnZW50UXVpcmtzOjpxdWlya3NGb3JVUkwoY29uc3QgVVJMJiB1cmwpCiAK
ICAgICBpZiAodXJsUmVxdWlyZXNDaHJvbWVCcm93c2VyKHVybCkpCiAgICAgICAgIHF1aXJrcy5h
ZGQoVXNlckFnZW50UXVpcmtzOjpOZWVkc0Nocm9tZUJyb3dzZXIpOworICAgIGVsc2UgaWYgKHVy
bFJlcXVpcmVzRmlyZWZveEJyb3dzZXIodXJsKSkKKyAgICAgICAgcXVpcmtzLmFkZChVc2VyQWdl
bnRRdWlya3M6Ok5lZWRzRmlyZWZveEJyb3dzZXIpOwogCiAgICAgaWYgKHVybFJlcXVpcmVzTWFj
aW50b3NoUGxhdGZvcm0odXJsKSkKICAgICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6
Ok5lZWRzTWFjaW50b3NoUGxhdGZvcm0pOwpAQCAtMTQ5LDYgKzE2MCw4IEBAIFN0cmluZyBVc2Vy
QWdlbnRRdWlya3M6OnN0cmluZ0ZvclF1aXJrKFVzZXJBZ2VudFF1aXJrIHF1aXJrKQogICAgIGNh
c2UgTmVlZHNDaHJvbWVCcm93c2VyOgogICAgICAgICAvLyBHZXQgdmVyc2lvbnMgZnJvbSBodHRw
czovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vc3JjLmdpdAogICAgICAgICBy
ZXR1cm4gIkNocm9tZS83NS4wLjM3NzAuMTQxIl9zOworICAgIGNhc2UgTmVlZHNGaXJlZm94QnJv
d3NlcjoKKyAgICAgICAgcmV0dXJuICI7IHJ2OjcyLjApIEdlY2tvLzIwMTAwMTAxIEZpcmVmb3gv
NzIuMCJfczsKICAgICBjYXNlIE5lZWRzTWFjaW50b3NoUGxhdGZvcm06CiAgICAgICAgIHJldHVy
biAiTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNSJfczsKICAgICBjYXNlIE5lZWRzTGlu
dXhEZXNrdG9wUGxhdGZvcm06CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V
c2VyQWdlbnRRdWlya3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJr
cy5oCmluZGV4IGRjNzdkNGU4NTBlZjkwOWQ0YjAwNTZkN2M5YTdlMWFkNDVmZGQ4ZWYuLjk4MmY4
N2Y4YzFjNGFiOTBjN2NmYzBjYzg2ZjVjNGJmZTM2ZmFlZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5oCkBAIC0zNCw2ICszNCw3IEBAIGNsYXNzIFVzZXJBZ2Vu
dFF1aXJrcyB7CiBwdWJsaWM6CiAgICAgZW51bSBVc2VyQWdlbnRRdWlyayB7CiAgICAgICAgIE5l
ZWRzQ2hyb21lQnJvd3NlciwKKyAgICAgICAgTmVlZHNGaXJlZm94QnJvd3NlciwKICAgICAgICAg
TmVlZHNNYWNpbnRvc2hQbGF0Zm9ybSwKICAgICAgICAgTmVlZHNMaW51eERlc2t0b3BQbGF0Zm9y
bSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9Vc2VyQWdlbnRH
TGliLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHAK
aW5kZXggMmZhMjk3NGVmNzJjOGI2ODlmYjFkMDliYmMzZThhZTQyMDg5MzNhMy4uNjcyOTE2MjRl
ZmZkZmMxMTNiZDFhMDg0YzBlN2RmMzgwODJjZGRlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ2xpYi9Vc2VyQWdlbnRHTGliLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9nbGliL1VzZXJBZ2VudEdMaWIuY3BwCkBAIC05Miw2ICs5MiwxMSBAQCBzdGF0aWMg
U3RyaW5nIGJ1aWxkVXNlckFnZW50U3RyaW5nKGNvbnN0IFVzZXJBZ2VudFF1aXJrcyYgcXVpcmtz
KQogICAgICAgICB1YVN0cmluZy5hcHBlbmQocGxhdGZvcm1WZXJzaW9uRm9yVUFTdHJpbmcoKSk7
CiAgICAgfQogCisgICAgaWYgKHF1aXJrcy5jb250YWlucyhVc2VyQWdlbnRRdWlya3M6Ok5lZWRz
RmlyZWZveEJyb3dzZXIpKSB7CisgICAgICAgIHVhU3RyaW5nLmFwcGVuZChVc2VyQWdlbnRRdWly
a3M6OnN0cmluZ0ZvclF1aXJrKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNGaXJlZm94QnJvd3Nlcikp
OworICAgICAgICByZXR1cm4gdWFTdHJpbmcudG9TdHJpbmcoKTsKKyAgICB9CisKICAgICB1YVN0
cmluZy5hcHBlbmRMaXRlcmFsKCIpIEFwcGxlV2ViS2l0LyIpOwogICAgIHVhU3RyaW5nLmFwcGVu
ZCh2ZXJzaW9uRm9yVUFTdHJpbmcoKSk7CiAgICAgdWFTdHJpbmcuYXBwZW5kTGl0ZXJhbCgiIChL
SFRNTCwgbGlrZSBHZWNrbykgIik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s
cy9DaGFuZ2VMb2cKaW5kZXggZDBiOGY3OWI5MDEwZDk0ZjMzMDRmOTlmOTM4MTZlZmJlMWEwMzRi
ZS4uMjFjNDIwNDY3ZDM4YzlmMTBmNDUxODJmM2E0Nzk2ODNlNzI1MjExNiAxMDA2NDQKLS0tIGEv
VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisy
MDIwLTAyLTIwICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisg
ICAgICAgIFtHVEtdIEltcHJvdmUgdXNlciBhZ2VudCBxdWlyayBmb3IgR29vZ2xlIERvY3MKKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjUwNgorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktp
dEFQSS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2VudFF1aXJrcy5jcHA6CisgICAgICAgIChUZXN0V2Vi
S2l0QVBJOjphc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNGaXJlZm94QnJvd3NlclF1aXJrKToKKyAg
ICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTAyLTE5ICBKb25hdGhhbiBCZWRh
cmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENv
cnJlY3RseSByZXBvcnQgSlNDIHRlc3RzIGZvciB3aW5kb3dzCmRpZmYgLS1naXQgYS9Ub29scy9U
ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtzLmNwcCBiL1Rvb2xzL1Rl
c3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IDBhNDYx
NmM2YjFmMDY4YWQ3YTY1NDMxN2ZmOTNjNjMzOWM3YjdmZWUuLmRiZTliZmYyNTQwOTVmM2JhNDEz
NDIxMjc2ZGYzNWI5MTU4YzViZDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz
dHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3MuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv
VGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3MuY3BwCkBAIC00Miw2ICs0MiwxNiBAQCBzdGF0
aWMgdm9pZCBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVCcm93c2VyUXVpcmsoY29uc3Qg
Y2hhciogdXJsKQogICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5jb250YWlucygiRmlyZWZveCIp
KTsKIH0KIAorc3RhdGljIHZvaWQgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzRmlyZWZveEJyb3dz
ZXJRdWlyayhjb25zdCBjaGFyKiB1cmwpCit7CisgICAgU3RyaW5nIHVhU3RyaW5nID0gc3RhbmRh
cmRVc2VyQWdlbnRGb3JVUkwoVVJMKHsgfSwgdXJsKSk7CisKKyAgICBFWFBFQ1RfRkFMU0UodWFT
dHJpbmcuY29udGFpbnMoIkNocm9tZSIpKTsKKyAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29u
dGFpbnMoIlNhZmFyaSIpKTsKKyAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkNo
cm9taXVtIikpOworICAgIEVYUEVDVF9UUlVFKHVhU3RyaW5nLmNvbnRhaW5zKCJGaXJlZm94Iikp
OworfQorCiBzdGF0aWMgdm9pZCBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNMaW51eFBsYXRmb3Jt
UXVpcmsoY29uc3QgY2hhciogdXJsKQogewogICAgIFN0cmluZyB1YVN0cmluZyA9IHN0YW5kYXJk
VXNlckFnZW50Rm9yVVJMKFVSTCh7IH0sIHVybCkpOwpAQCAtODEsNiArOTEsOCBAQCBURVNUKFVz
ZXJBZ2VudFRlc3QsIFF1aXJrcykKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVC
cm93c2VyUXVpcmsoImh0dHA6Ly90eXBla2l0LmNvbS8iKTsKICAgICBhc3NlcnRVc2VyQWdlbnRG
b3JVUkxIYXNDaHJvbWVCcm93c2VyUXVpcmsoImh0dHA6Ly90eXBla2l0Lm5ldC8iKTsKIAorICAg
IGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0ZpcmVmb3hCcm93c2VyUXVpcmsoImh0dHA6Ly9hY2Nv
dW50cy55b3V0dWJlLmNvbS8iKTsKKwogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0xpbnV4
UGxhdGZvcm1RdWlyaygiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwogICAgIGFzc2VydFVzZXJB
Z2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL3d3dy5nb29nbGUuZXMvIik7
CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8v
Y2FsZW5kYXIuZ29vZ2xlLmNvbS8iKTsKQEAgLTkyLDcgKzEwNCw2IEBAIFRFU1QoVXNlckFnZW50
VGVzdCwgUXVpcmtzKQogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVp
cmsoImh0dHA6Ly93d3cud2hhdHNhcHAuY29tLyIpOwogICAgIGFzc2VydFVzZXJBZ2VudEZvclVS
TEhhc01hY1BsYXRmb3JtUXVpcmsoImh0dHA6Ly93ZWIud2hhdHNhcHAuY29tLyIpOwogICAgIGFz
c2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmsoImh0dHA6Ly93d3cuY2hhc2Uu
Y29tLyIpOwotICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmsoImh0
dHA6Ly9kb2NzLmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFj
UGxhdGZvcm1RdWlyaygiaHR0cDovL2RyaXZlLmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0VXNl
ckFnZW50Rm9yVVJMSGFzTWFjUGxhdGZvcm1RdWlyaygiaHR0cDovL3BheXBhbC5jb20vIik7CiAg
ICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFjUGxhdGZvcm1RdWlyaygiaHR0cDovL291dGxv
b2subGl2ZS5jb20vIik7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>391334</attachid>
            <date>2020-02-20 14:24:07 -0800</date>
            <delta_ts>2020-02-20 23:44:12 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-206506-20200220162406.patch</filename>
            <type>text/plain</type>
            <size>10795</size>
            <attacher name="Michael Catanzaro">mcatanzaro</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZiMmIwYzVhY2M1Yzk5
MTBlZTc0YWY5YTBmMmE5NDUwNjUyMWJmMy4uODM3NDQ1ODJkYzdkMGJmNDJmMzEyNjJmMjI2NDJm
NDY0MjQzODA3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTAyLTIwICBNaWNo
YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIElt
cHJvdmUgdXNlciBhZ2VudCBxdWlyayBmb3IgR29vZ2xlIERvY3MgYW5kIEdvb2dsZSBEcml2ZQor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2NTA2CisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RvcCB1c2lu
ZyBvdXIgbWFjT1MgcGxhdGZvcm0gcXVpcmsgZm9yIEdvb2dsZSBEb2NzIGFuZCBHb29nbGUgRHJp
dmUuIEl0IGlzIG5vdCBzdWNjZXNzZnVsbHkKKyAgICAgICAgc3VwcHJlc3NpbmcgdGhlIHVuc3Vw
cG9ydGVkIGJyb3dzZXIgd2FybmluZ3MgdGhhdCBpdCB3YXMgYWRkZWQgdG8gYXZvaWQuIEl0IGlz
IGFsc28KKyAgICAgICAgcmVzcG9uc2libGUgZm9yIGNvbXBsYWludHMgZnJvbSB1c2VycyB3aG8g
ZG8gbm90IGxpa2Ugc2VlaW5nIG1hY09TLXN0eWxlIHNob3J0Y3V0cyB3aXRoCisgICAgICAgIHRo
ZSBDb21tYW5kIGtleSByYXRoZXIgdGhhbiBDdHJsLgorCisgICAgICAgIFJlcGxhY2UgaXQgd2l0
aCBhIG5ldyBGaXJlZm94IGJyb3dzZXIgcXVpcmsuIFdlIGNhbiBhdm9pZCB0aGUgdW5zdXBwb3J0
ZWQgYnJvd3NlciB3YXJuaW5nIGluCisgICAgICAgIEdvb2dsZSBEb2NzIGJ5IHVzaW5nIHRoaXMg
cXVpcmsgb24gYWNjb3VudHMueW91dHViZS5jb20uIFRoZXJlJ3Mgbm8gbmVlZCBmb3IgYW55IG90
aGVyIHF1aXJrCisgICAgICAgIHNwZWNpZmljIHRvIEdvb2dsZSBEb2NzIChhbHRob3VnaCByZW1v
dmluZyB0aGUgbWFjT1MgcGxhdGZvcm0gcXVpcmsgbWVhbnMgd2UnbGwgaW5zdGVhZAorICAgICAg
ICBiZWdpbiB1c2luZyB0aGUgeDg2XzY0IExpbnV4IHF1aXJrIHRoYXQgd2Ugc2VuZCB0byBvdGhl
ciBHb29nbGUgZG9tYWlucykuIEdvb2dsZSBEcml2ZSB3aWxsCisgICAgICAgIGFsc28gdXNlIHRo
aXMgbmV3IHF1aXJrLgorCisgICAgICAgIEFsc28sIHJlbW92ZSBhIHN0YWxlIGNvbW1lbnQgaW5z
dHJ1Y3RpbmcgZGV2ZWxvcGVycyB0byB0ZXN0IGRvd25sb2FkaW5nIHRoZSBIYW5nb3V0cyBicm93
c2VyCisgICAgICAgIHBsdWdpbi4gV2Ugbm8gbG9uZ2VyIHN1cHBvcnQgTlBBUEksIHNvIEdvb2ds
ZSBIYW5nb3V0cyBpcyBhIGxvc3QgY2F1c2UgdW50aWwgd2UgZ2V0IFdlYlJUQworICAgICAgICB3
b3JraW5nLgorCisgICAgICAgICogcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OnVybFJlcXVpcmVzRmlyZWZveEJyb3dzZXIpOgorICAgICAgICAoV2ViQ29y
ZTo6dXJsUmVxdWlyZXNNYWNpbnRvc2hQbGF0Zm9ybSk6CisgICAgICAgIChXZWJDb3JlOjp1cmxS
ZXF1aXJlc0xpbnV4RGVza3RvcFBsYXRmb3JtKToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJBZ2Vu
dFF1aXJrczo6cXVpcmtzRm9yVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OlVzZXJBZ2VudFF1aXJr
czo6c3RyaW5nRm9yUXVpcmspOgorICAgICAgICAqIHBsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5o
OgorICAgICAgICAqIHBsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHA6CisgICAgICAgIChX
ZWJDb3JlOjpidWlsZFVzZXJBZ2VudFN0cmluZyk6CisKIDIwMjAtMDItMTkgIFlvdWVubiBGYWJs
ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFttYWMgZGVidWddIFJlZ3Jlc3Npb246
IGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd29ya2Vycy93b3JrZXItcmVsb2FkLmh0
bWwgaXMgYSBmbGFreSBjcmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
VXNlckFnZW50UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1
aXJrcy5jcHAKaW5kZXggNjEzNGRlMTkzNTU3MmRiOTViMTI5ZDRlMDA0NzQ4ZmUwZWZlYWRkZC4u
YmFkMTAwNmE2NWRiNGU5NDY0MzUxMWRiNjY5Yjc1YTQ0ZjY1Nzc5MyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwCkBAIC0zOSwxMSArMzksMTAgQEAgc3Rh
dGljIGJvb2wgaXNHb29nbGUoY29uc3QgVVJMJiB1cmwpCiAgICAgU3RyaW5nIGJhc2VEb21haW4g
PSB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKHVybC5ob3N0KCkudG9TdHJpbmcoKSk7CiAK
ICAgICAvLyBPdXIgR29vZ2xlIFVBIGlzICp2ZXJ5KiBjb21wbGljYXRlZCB0byBnZXQgcmlnaHQu
IFJlYWQKLSAgICAvLyBodHRwczovL3dlYmtpdC5vcmcvYi8xNDIwNzQgY2FyZWZ1bGx5IGJlZm9y
ZSBjaGFuZ2luZy4gVGVzdCB0aGF0IEVhcnRoCi0gICAgLy8gdmlldyBpcyBhdmFpbGFibGUgaW4g
R29vZ2xlIE1hcHMuIFRlc3QgR29vZ2xlIENhbGVuZGFyLiBUZXN0IGRvd25sb2FkaW5nCi0gICAg
Ly8gdGhlIEhhbmdvdXRzIGJyb3dzZXIgcGx1Z2luLiBUZXN0IGxvZ2dpbmcgb3V0IGFuZCBsb2dn
aW5nIGluIHRvIGEgR29vZ2xlCi0gICAgLy8gYWNjb3VudC4gQ2hhbmdlIHBsYXRmb3JtVmVyc2lv
bkZvclVBU3RyaW5nKCkgdG8gcmV0dXJuICJGcmVlQlNEIGFtZDY0IgotICAgIC8vIGFuZCB0ZXN0
IGV2ZXJ5dGhpbmcgYWdhaW4uCisgICAgLy8gaHR0cHM6Ly93ZWJraXQub3JnL2IvMTQyMDc0IGNh
cmVmdWxseSBiZWZvcmUgY2hhbmdpbmcuIFRlc3QgdGhhdCAzRAorICAgIC8vIHZpZXcgaXMgYXZh
aWxhYmxlIGluIEdvb2dsZSBNYXBzLiBUZXN0IEdvb2dsZSBDYWxlbmRhci4gVGVzdCBsb2dnaW5n
IG91dAorICAgIC8vIGFuZCBsb2dnaW5nIGluIHRvIGEgR29vZ2xlIGFjY291bnQuIENoYW5nZSBw
bGF0Zm9ybVZlcnNpb25Gb3JVQVN0cmluZygpCisgICAgLy8gdG8gcmV0dXJuICJGcmVlQlNEIGFt
ZDY0IiBhbmQgdGVzdCBldmVyeXRoaW5nIGFnYWluLgogICAgIGlmIChiYXNlRG9tYWluLnN0YXJ0
c1dpdGgoImdvb2dsZS4iKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgaWYgKGJhc2VEb21h
aW4gPT0gImdzdGF0aWMuY29tIikKQEAgLTcwLDYgKzY5LDMwIEBAIHN0YXRpYyBib29sIHVybFJl
cXVpcmVzQ2hyb21lQnJvd3Nlcihjb25zdCBVUkwmIHVybCkKICAgICByZXR1cm4gZmFsc2U7CiB9
CiAKKy8vIFByZWZlciB1c2luZyB0aGUgbWFjT1MgcGxhdGZvcm0gcXVpcmsgcmF0aGVyIHRoYW4g
dGhlIEZpcmVmb3ggcXVpcmsuIFRoaXMKKy8vIHF1aXJrIGlzIGdvb2QgZm9yIHdlYnNpdGVzIHRo
YXQgZG8gbWFjT1Mtc3BlY2lmaWMgdGhpbmdzIHdlIGRvbid0IHdhbnQgb24KKy8vIG90aGVyIHBs
YXRmb3JtcywgYW5kIHdoZW4gdGhlIHJpc2sgb2YgdGhlIHdlYnNpdGUgZG9pbmcgRmlyZWZveC1z
cGVjaWZpYworLy8gdGhpbmdzIGlzIHJlbGF0aXZlbHkgbG93Lgorc3RhdGljIGJvb2wgdXJsUmVx
dWlyZXNGaXJlZm94QnJvd3Nlcihjb25zdCBVUkwmIHVybCkKK3sKKyAgICBTdHJpbmcgZG9tYWlu
ID0gdXJsLmhvc3QoKS50b1N0cmluZygpOworCisgICAgLy8gVGhpcyBxdWlyayBhY3R1YWxseSBo
YXMgbm90aGluZyB0byBkbyB3aXRoIFlvdVR1YmUuIEl0J3MgbmVlZGVkIHRvIGF2b2lkCisgICAg
Ly8gdW5zdXBwb3J0ZWQgYnJvd3NlciB3YXJuaW5ncyBvbiBHb29nbGUgRG9jcy4gQWZ0ZXIgcmVt
b3ZpbmcgdGhpcyBxdWlyaywKKyAgICAvLyB0byByZXByb2R1Y2UgdGhlIHdhcm5pbmdzIHlvdSB3
aWxsIG5lZWQgdG8gc2lnbiBvdXQgb2YgR29vZ2xlLCB0aGVuIGNsaWNrCisgICAgLy8gb24gYSBs
aW5rIHRvIGEgbm9uLXB1YmxpYyBkb2N1bWVudCB0aGF0IHJlcXVpcmVzIHNpZ25pbmcgaW4uIFRo
ZQorICAgIC8vIHVuc3VwcG9ydGVkIGJyb3dzZXIgd2FybmluZyB3aWxsIGJlIGRpc3BsYXllZCBh
ZnRlciBzaWduaW5nIGluLgorICAgIGlmIChkb21haW4gPT0gImFjY291bnRzLnlvdXR1YmUuY29t
IikKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAvLyBHb29nbGUgRHJpdmUgc2hvd3MgYW4g
dW5zdXBwb3J0ZWQgYnJvd3NlciB3YXJuaW5nIHdpdGggV2ViS2l0R1RLJ3MKKyAgICAvLyBzdGFu
ZGFyZCB1c2VyIGFnZW50LgorICAgIGlmIChkb21haW4gPT0gImRyaXZlLmdvb2dsZS5jb20iKQor
ICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIGJv
b2wgdXJsUmVxdWlyZXNNYWNpbnRvc2hQbGF0Zm9ybShjb25zdCBVUkwmIHVybCkKIHsKICAgICBT
dHJpbmcgZG9tYWluID0gdXJsLmhvc3QoKS50b1N0cmluZygpOwpAQCAtMTA0LDEyICsxMjcsNiBA
QCBzdGF0aWMgYm9vbCB1cmxSZXF1aXJlc01hY2ludG9zaFBsYXRmb3JtKGNvbnN0IFVSTCYgdXJs
KQogICAgICAgICB8fCBkb21haW4gPT0gImV4Y2hhbmdlLnR1LWJlcmxpbi5kZSIpCiAgICAgICAg
IHJldHVybiB0cnVlOwogCi0gICAgLy8gR29vZ2xlIERvY3MgYW5kIEdvb2dsZSBEcml2ZSBib3Ro
IHNob3cgYSBzY2FyeSB1bnN1cHBvcnRlZCBicm93c2VyCi0gICAgLy8gd2FybmluZyB3aXRoIFdl
YktpdEdUSydzIHN0YW5kYXJkIHVzZXIgYWdlbnQuCi0gICAgaWYgKGRvbWFpbiA9PSAiZG9jcy5n
b29nbGUuY29tIgotICAgICAgICB8fCBkb21haW4gPT0gImRyaXZlLmdvb2dsZS5jb20iKQotICAg
ICAgICByZXR1cm4gdHJ1ZTsKLQogICAgIC8vIEJhbmsgb2YgQW1lcmljYSBzaG93cyBhbiB1bnN1
cHBvcnRlZCBicm93c2VyIHdhcm5pbmcgd2l0aCBXZWJLaXRHVEsncwogICAgIC8vIHN0YW5kYXJk
IHVzZXIgYWdlbnQuCiAgICAgaWYgKGJhc2VEb21haW4gPT0gImJhbmtvZmFtZXJpY2EuY29tIikK
QEAgLTEyMCwxMCArMTM3LDcgQEAgc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNNYWNpbnRvc2hQbGF0
Zm9ybShjb25zdCBVUkwmIHVybCkKIAogc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNMaW51eERlc2t0
b3BQbGF0Zm9ybShjb25zdCBVUkwmIHVybCkKIHsKLSAgICAvLyBkb2NzLmdvb2dsZS5jb20gYW5k
IGRyaXZlLmdvb2dsZS5jb20gcmVxdWlyZSB0aGUgbWFjT1MgcGxhdGZvcm0gcXVpcmsuCi0gICAg
cmV0dXJuIGlzR29vZ2xlKHVybCkKLSAgICAgICAgJiYgdXJsLmhvc3QoKSAhPSAiZG9jcy5nb29n
bGUuY29tIgotICAgICAgICAmJiB1cmwuaG9zdCgpICE9ICJkcml2ZS5nb29nbGUuY29tIjsKKyAg
ICByZXR1cm4gaXNHb29nbGUodXJsKTsKIH0KIAogVXNlckFnZW50UXVpcmtzIFVzZXJBZ2VudFF1
aXJrczo6cXVpcmtzRm9yVVJMKGNvbnN0IFVSTCYgdXJsKQpAQCAtMTM0LDYgKzE0OCw4IEBAIFVz
ZXJBZ2VudFF1aXJrcyBVc2VyQWdlbnRRdWlya3M6OnF1aXJrc0ZvclVSTChjb25zdCBVUkwmIHVy
bCkKIAogICAgIGlmICh1cmxSZXF1aXJlc0Nocm9tZUJyb3dzZXIodXJsKSkKICAgICAgICAgcXVp
cmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzQ2hyb21lQnJvd3Nlcik7CisgICAgZWxzZSBp
ZiAodXJsUmVxdWlyZXNGaXJlZm94QnJvd3Nlcih1cmwpKQorICAgICAgICBxdWlya3MuYWRkKFVz
ZXJBZ2VudFF1aXJrczo6TmVlZHNGaXJlZm94QnJvd3Nlcik7CiAKICAgICBpZiAodXJsUmVxdWly
ZXNNYWNpbnRvc2hQbGF0Zm9ybSh1cmwpKQogICAgICAgICBxdWlya3MuYWRkKFVzZXJBZ2VudFF1
aXJrczo6TmVlZHNNYWNpbnRvc2hQbGF0Zm9ybSk7CkBAIC0xNDksNiArMTY1LDggQEAgU3RyaW5n
IFVzZXJBZ2VudFF1aXJrczo6c3RyaW5nRm9yUXVpcmsoVXNlckFnZW50UXVpcmsgcXVpcmspCiAg
ICAgY2FzZSBOZWVkc0Nocm9tZUJyb3dzZXI6CiAgICAgICAgIC8vIEdldCB2ZXJzaW9ucyBmcm9t
IGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9zcmMuZ2l0CiAgICAg
ICAgIHJldHVybiAiQ2hyb21lLzc1LjAuMzc3MC4xNDEiX3M7CisgICAgY2FzZSBOZWVkc0ZpcmVm
b3hCcm93c2VyOgorICAgICAgICByZXR1cm4gIjsgcnY6NzIuMCkgR2Vja28vMjAxMDAxMDEgRmly
ZWZveC83Mi4wIl9zOwogICAgIGNhc2UgTmVlZHNNYWNpbnRvc2hQbGF0Zm9ybToKICAgICAgICAg
cmV0dXJuICJNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEwXzE1Il9zOwogICAgIGNhc2UgTmVl
ZHNMaW51eERlc2t0b3BQbGF0Zm9ybToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL1VzZXJBZ2VudFF1aXJrcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50
UXVpcmtzLmgKaW5kZXggZGM3N2Q0ZTg1MGVmOTA5ZDRiMDA1NmQ3YzlhN2UxYWQ0NWZkZDhlZi4u
OTgyZjg3ZjhjMWM0YWI5MGM3Y2ZjMGNjODZmNWM0YmZlMzZmYWVmMyAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmgKKysrIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmgKQEAgLTM0LDYgKzM0LDcgQEAgY2xhc3MgVXNl
ckFnZW50UXVpcmtzIHsKIHB1YmxpYzoKICAgICBlbnVtIFVzZXJBZ2VudFF1aXJrIHsKICAgICAg
ICAgTmVlZHNDaHJvbWVCcm93c2VyLAorICAgICAgICBOZWVkc0ZpcmVmb3hCcm93c2VyLAogICAg
ICAgICBOZWVkc01hY2ludG9zaFBsYXRmb3JtLAogICAgICAgICBOZWVkc0xpbnV4RGVza3RvcFBs
YXRmb3JtLAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL1VzZXJB
Z2VudEdMaWIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9Vc2VyQWdlbnRHTGli
LmNwcAppbmRleCAyZmEyOTc0ZWY3MmM4YjY4OWZiMWQwOWJiYzNlOGFlNDIwODkzM2EzLi42NzI5
MTYyNGVmZmRmYzExM2JkMWEwODRjMGU3ZGYzODA4MmNkZGU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9nbGliL1VzZXJBZ2VudEdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHAKQEAgLTkyLDYgKzkyLDExIEBAIHN0
YXRpYyBTdHJpbmcgYnVpbGRVc2VyQWdlbnRTdHJpbmcoY29uc3QgVXNlckFnZW50UXVpcmtzJiBx
dWlya3MpCiAgICAgICAgIHVhU3RyaW5nLmFwcGVuZChwbGF0Zm9ybVZlcnNpb25Gb3JVQVN0cmlu
ZygpKTsKICAgICB9CiAKKyAgICBpZiAocXVpcmtzLmNvbnRhaW5zKFVzZXJBZ2VudFF1aXJrczo6
TmVlZHNGaXJlZm94QnJvd3NlcikpIHsKKyAgICAgICAgdWFTdHJpbmcuYXBwZW5kKFVzZXJBZ2Vu
dFF1aXJrczo6c3RyaW5nRm9yUXVpcmsoVXNlckFnZW50UXVpcmtzOjpOZWVkc0ZpcmVmb3hCcm93
c2VyKSk7CisgICAgICAgIHJldHVybiB1YVN0cmluZy50b1N0cmluZygpOworICAgIH0KKwogICAg
IHVhU3RyaW5nLmFwcGVuZExpdGVyYWwoIikgQXBwbGVXZWJLaXQvIik7CiAgICAgdWFTdHJpbmcu
YXBwZW5kKHZlcnNpb25Gb3JVQVN0cmluZygpKTsKICAgICB1YVN0cmluZy5hcHBlbmRMaXRlcmFs
KCIgKEtIVE1MLCBsaWtlIEdlY2tvKSAiKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi
L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMGI4Zjc5YjkwMTBkOTRmMzMwNGY5OWY5MzgxNmVmYmUx
YTAzNGJlLi43NjFjOWVhNmM3MGRhMWQwZmMzYWJmODA0OGRjODA0ZDc1MWYxNGM1IDEwMDY0NAot
LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg
QEAKKzIwMjAtMDItMjAgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+
CisKKyAgICAgICAgW0dUS10gSW1wcm92ZSB1c2VyIGFnZW50IHF1aXJrIGZvciBHb29nbGUgRG9j
cyBhbmQgR29vZ2xlIERyaXZlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0yMDY1MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3Mu
Y3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6YXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzRmly
ZWZveEJyb3dzZXJRdWlyayk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAy
MC0wMi0xOSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAg
cmVzdWx0cy53ZWJraXQub3JnOiBDb3JyZWN0bHkgcmVwb3J0IEpTQyB0ZXN0cyBmb3Igd2luZG93
cwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2Vu
dFF1aXJrcy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50
UXVpcmtzLmNwcAppbmRleCAwYTQ2MTZjNmIxZjA2OGFkN2E2NTQzMTdmZjkzYzYzMzljN2I3ZmVl
Li40ZDZjNmI0MjJjNjhmYzk0OWM2ZTgxMTg3Y2NlYjI2Y2NiM2M1OWJhIDEwMDY0NAotLS0gYS9U
b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtzLmNwcAorKysg
Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtzLmNwcApA
QCAtNDIsNiArNDIsMTYgQEAgc3RhdGljIHZvaWQgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzQ2hy
b21lQnJvd3NlclF1aXJrKGNvbnN0IGNoYXIqIHVybCkKICAgICBFWFBFQ1RfRkFMU0UodWFTdHJp
bmcuY29udGFpbnMoIkZpcmVmb3giKSk7CiB9CiAKK3N0YXRpYyB2b2lkIGFzc2VydFVzZXJBZ2Vu
dEZvclVSTEhhc0ZpcmVmb3hCcm93c2VyUXVpcmsoY29uc3QgY2hhciogdXJsKQoreworICAgIFN0
cmluZyB1YVN0cmluZyA9IHN0YW5kYXJkVXNlckFnZW50Rm9yVVJMKFVSTCh7IH0sIHVybCkpOwor
CisgICAgRVhQRUNUX0ZBTFNFKHVhU3RyaW5nLmNvbnRhaW5zKCJDaHJvbWUiKSk7CisgICAgRVhQ
RUNUX0ZBTFNFKHVhU3RyaW5nLmNvbnRhaW5zKCJTYWZhcmkiKSk7CisgICAgRVhQRUNUX0ZBTFNF
KHVhU3RyaW5nLmNvbnRhaW5zKCJDaHJvbWl1bSIpKTsKKyAgICBFWFBFQ1RfVFJVRSh1YVN0cmlu
Zy5jb250YWlucygiRmlyZWZveCIpKTsKK30KKwogc3RhdGljIHZvaWQgYXNzZXJ0VXNlckFnZW50
Rm9yVVJMSGFzTGludXhQbGF0Zm9ybVF1aXJrKGNvbnN0IGNoYXIqIHVybCkKIHsKICAgICBTdHJp
bmcgdWFTdHJpbmcgPSBzdGFuZGFyZFVzZXJBZ2VudEZvclVSTChVUkwoeyB9LCB1cmwpKTsKQEAg
LTgxLDEwICs5MSwxNCBAQCBURVNUKFVzZXJBZ2VudFRlc3QsIFF1aXJrcykKICAgICBhc3NlcnRV
c2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVCcm93c2VyUXVpcmsoImh0dHA6Ly90eXBla2l0LmNvbS8i
KTsKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVCcm93c2VyUXVpcmsoImh0dHA6
Ly90eXBla2l0Lm5ldC8iKTsKIAorICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0ZpcmVmb3hC
cm93c2VyUXVpcmsoImh0dHA6Ly9hY2NvdW50cy55b3V0dWJlLmNvbS8iKTsKKyAgICBhc3NlcnRV
c2VyQWdlbnRGb3JVUkxIYXNGaXJlZm94QnJvd3NlclF1aXJrKCJodHRwOi8vZHJpdmUuZ29vZ2xl
LmNvbS8iKTsKKwogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWly
aygiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhh
c0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL3d3dy5nb29nbGUuZXMvIik7CiAgICAgYXNzZXJ0
VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8vY2FsZW5kYXIuZ29v
Z2xlLmNvbS8iKTsKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNMaW51eFBsYXRmb3JtUXVp
cmsoImh0dHA6Ly9wbHVzLmdvb2dsZS5jb20vIik7CisgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJM
SGFzTGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8vZHJpdmUuZ29vZ2xlLmNvbS8iKTsKIAogICAg
IGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmsoImh0dHA6Ly93d3cueWFo
b28uY29tLyIpOwogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmso
Imh0dHA6Ly9maW5hbmNlLnlhaG9vLmNvbS8iKTsKQEAgLTkyLDcgKzEwNiw2IEBAIFRFU1QoVXNl
ckFnZW50VGVzdCwgUXVpcmtzKQogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRm
b3JtUXVpcmsoImh0dHA6Ly93d3cud2hhdHNhcHAuY29tLyIpOwogICAgIGFzc2VydFVzZXJBZ2Vu
dEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmsoImh0dHA6Ly93ZWIud2hhdHNhcHAuY29tLyIpOwog
ICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVpcmsoImh0dHA6Ly93d3cu
Y2hhc2UuY29tLyIpOwotICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3JtUXVp
cmsoImh0dHA6Ly9kb2NzLmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJM
SGFzTWFjUGxhdGZvcm1RdWlyaygiaHR0cDovL2RyaXZlLmdvb2dsZS5jb20vIik7CiAgICAgYXNz
ZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFjUGxhdGZvcm1RdWlyaygiaHR0cDovL3BheXBhbC5jb20v
Iik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFjUGxhdGZvcm1RdWlyaygiaHR0cDov
L291dGxvb2subGl2ZS5jb20vIik7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>