236111 2022-02-03 17:18:41 -0800 Fix App Privacy Report redirect attribution 2022-03-21 15:54:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 238159 1 katherine_cheney katherine_cheney bfulgham sam webkit-bug-importer oldest_to_newest 1837183 0 katherine_cheney 2022-02-03 17:18:41 -0800 Fix App Privacy Report redirect attribution 1837184 1 450841 katherine_cheney 2022-02-03 17:21:42 -0800 Created attachment 450841 Patch 1837187 2 450841 sam 2022-02-03 17:36:30 -0800 Comment on attachment 450841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450841&action=review > Source/WebKit/ChangeLog:4 > + Need a short description (OOPS!). > + Need the bug URL (OOPS!). Looks like you forgot to fill this in. > LayoutTests/ChangeLog:4 > + Need a short description (OOPS!). > + Need the bug URL (OOPS!). Same here. 1837196 3 450841 bfulgham 2022-02-03 18:12:34 -0800 Comment on attachment 450841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450841&action=review And a test! I think this looks great, once you correct the ChangeLog. Thank you for jumping on this so quickly! > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:372 > auto oldInspectorInitiatorNodeIdentifier = inspectorInitiatorNodeIdentifier(); I think this is right, but I also suggest we clean up the constructors for CFNet and NSURLRequest.it may not fix anything, but I believe it is bad to ever have our WebKit flag out of sync with the NSURLRequest item. > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:-624 > -#endif Wry nice to simplify this! 1837435 4 450902 katherine_cheney 2022-02-04 08:34:12 -0800 Created attachment 450902 Patch for landing 1837436 5 katherine_cheney 2022-02-04 08:34:37 -0800 (In reply to Sam Weinig from comment #2) > Comment on attachment 450841 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450841&action=review > > > Source/WebKit/ChangeLog:4 > > + Need a short description (OOPS!). > > + Need the bug URL (OOPS!). > > Looks like you forgot to fill this in. > > > LayoutTests/ChangeLog:4 > > + Need a short description (OOPS!). > > + Need the bug URL (OOPS!). > > Same here. Fixed! Thanks. 1837440 6 katherine_cheney 2022-02-04 08:37:41 -0800 (In reply to Brent Fulgham from comment #3) > Comment on attachment 450841 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=450841&action=review > > And a test! I think this looks great, once you correct the ChangeLog. Thank > you for jumping on this so quickly! > > > Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp:372 > > auto oldInspectorInitiatorNodeIdentifier = inspectorInitiatorNodeIdentifier(); > > I think this is right, but I also suggest we clean up the constructors for > CFNet and NSURLRequest.it may not fix anything, but I believe it is bad to > ever have our WebKit flag out of sync with the NSURLRequest item. > Yeah, agreed. I filed rdar://88490742 for this. > > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:-624 > > -#endif > > Wry nice to simplify this! 1837451 7 ews-feeder 2022-02-04 09:07:47 -0800 Committed r289121 (246818@main): <https://commits.webkit.org/246818@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450902. 1837453 8 webkit-bug-importer 2022-02-04 09:08:23 -0800 <rdar://problem/88492251> 450841 2022-02-03 17:21:42 -0800 2022-02-04 08:34:09 -0800 Patch bug-236111-20220203172142.patch text/plain 9170 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM2Mjk5NjM4NDQyZjk3 OGU0ZmExMzRjNzk2YWNlZWQzZGQwYzMxNy4uMDdlMGY2MzBiMjIyYzA1ZDk1ZTViZmVhNmMyMGM5 MTYwMDlhZWM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTAzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBBcHAg UHJpdmFjeSBSZXBvcnQgcmVkaXJlY3QgYXR0cmlidXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjExMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvYXBwLXByaXZhY3kt cmVwb3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QuaHRtbAorCisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3Q6OnVwZGF0ZUZyb21EZWxlZ2F0ZVByZXNlcnZpbmdPbGRQcm9wZXJ0 aWVzKToKKwogMjAyMi0wMi0wMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgRmxha3kgc2NvcGUuYXNzZXJ0Tm9FeGNlcHRpb24oKSBhc3NlcnRpb24gaW4gfkpTRXhl Y1N0YXRlIHdoZW4gcnVubmluZyB3b3JrZXJzIFdQVCB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAxNTc3MjUw YTZhOTU2ZjhkMTlkMjc3MzQxYmVjYzQwZWYxMGRlODdiLi42Yzk3MGQyOTA1Mjk1ODJhMTI3MDIy ZWMzMDViZDVlMTg5ZGE2NDJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAyLTAz ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIE5l ZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLgorICAgICAgICBOZWVkIHRoZSBidWcgVVJM IChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAg ICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOndpbGxQZXJmb3Jt SFRUUFJlZGlyZWN0aW9uOm5ld1JlcXVlc3Q6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisKIDIwMjIt MDItMDMgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdW1dQXSBBZGQgZmlsZS1pb2N0bCB0ZWxlbWV0cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKaW5k ZXggMTNhZjkxNmNlZWY5Nzk4ZDE0YzI1MjFlMmY4MzE2ZDE5MzM4N2Y3MS4uZWRjM2QwMjZkMDFj MGFmNDc1ZDJiNDQ4OGMxZjJmMjYxMGQwMzg3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAKQEAg LTM3MCw2ICszNzAsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6dXBkYXRlRnJvbURlbGVnYXRl UHJlc2VydmluZ09sZFByb3BlcnRpZXMoY29uc3QgUmVzb3VyY2VSZQogICAgIGF1dG8gb2xkUmVx dWVzdGVyID0gcmVxdWVzdGVyKCk7CiAgICAgYXV0byBvbGRJbml0aWF0b3JJZGVudGlmaWVyID0g aW5pdGlhdG9ySWRlbnRpZmllcigpOwogICAgIGF1dG8gb2xkSW5zcGVjdG9ySW5pdGlhdG9yTm9k ZUlkZW50aWZpZXIgPSBpbnNwZWN0b3JJbml0aWF0b3JOb2RlSWRlbnRpZmllcigpOworICAgIGF1 dG8gb2xkQXBwSW5pdGlhdGVkVmFsdWUgPSBpc0FwcEluaXRpYXRlZCgpOwogCiAgICAgKnRoaXMg PSBkZWxlZ2F0ZVByb3ZpZGVkUmVxdWVzdDsKIApAQCAtMzgwLDYgKzM4MSw3IEBAIHZvaWQgUmVz b3VyY2VSZXF1ZXN0Ojp1cGRhdGVGcm9tRGVsZWdhdGVQcmVzZXJ2aW5nT2xkUHJvcGVydGllcyhj b25zdCBSZXNvdXJjZVJlCiAgICAgc2V0SW5pdGlhdG9ySWRlbnRpZmllcihvbGRJbml0aWF0b3JJ ZGVudGlmaWVyKTsKICAgICBpZiAob2xkSW5zcGVjdG9ySW5pdGlhdG9yTm9kZUlkZW50aWZpZXIp CiAgICAgICAgIHNldEluc3BlY3RvckluaXRpYXRvck5vZGVJZGVudGlmaWVyKCpvbGRJbnNwZWN0 b3JJbml0aWF0b3JOb2RlSWRlbnRpZmllcik7CisgICAgc2V0SXNBcHBJbml0aWF0ZWQob2xkQXBw SW5pdGlhdGVkVmFsdWUpOwogfQogCiBib29sIFJlc291cmNlUmVxdWVzdDo6aHR0cFBpcGVsaW5p bmdFbmFibGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA4MzRlNTI2MTczMzExOWU3MGUxZWYy MGQxNzdhNzM4MTlmZWZmYzkxLi45ZWFhODNmZWFlMTk1ZGU5YzA2YzVlNDE4ZGRjMWI4MzA4MGY4 NjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdv cmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv YS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC01OTcsMzEgKzU5NywxMyBAQCBzdGF0aWMgdm9p ZCB1cGRhdGVJZ25vcmVTdHJpY3RUcmFuc3BvcnRTZWN1cml0eVNldHRpbmcoUmV0YWluUHRyPE5T VVJMUmVxdWVzdD4mCiAgICAgICAgIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UgcmVzb3VyY2VS ZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAgIG5ldHdvcmtEYXRhVGFzay0+Y2hlY2tUQU8ocmVz b3VyY2VSZXNwb25zZSk7CiAKLSAgICAgICAgYm9vbCBpc0FwcEluaXRpYXRlZCA9IHRydWU7Ci0j aWYgRU5BQkxFKEFQUF9QUklWQUNZX1JFUE9SVCkKLSAgICAgICAgaXNBcHBJbml0aWF0ZWQgPSBy ZXF1ZXN0LmF0dHJpYnV0aW9uID09IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uRGV2ZWxvcGVyOwot I2VuZGlmCi0KLSAgICAgICAgbmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVj dGlvbihXVEZNb3ZlKHJlc291cmNlUmVzcG9uc2UpLCByZXF1ZXN0LCBbc2Vzc2lvbiA9IG5ldHdv cmtEYXRhVGFzay0+bmV0d29ya1Nlc3Npb24oKSwgY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxv Y2tQdHIoY29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmllciwgc2hvdWxkSWdub3JlSFNU UywgaXNBcHBJbml0aWF0ZWRdKGF1dG8mJiByZXF1ZXN0KSB7CisgICAgICAgIG5ldHdvcmtEYXRh VGFzay0+d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb24oV1RGTW92ZShyZXNvdXJjZVJlc3BvbnNl KSwgcmVxdWVzdCwgW3Nlc3Npb24gPSBuZXR3b3JrRGF0YVRhc2stPm5ldHdvcmtTZXNzaW9uKCks IGNvbXBsZXRpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb25IYW5kbGVyKSwgdGFz a0lkZW50aWZpZXIsIHNob3VsZElnbm9yZUhTVFNdKGF1dG8mJiByZXF1ZXN0KSB7CiAjaWYgIUxP R19ESVNBQkxFRAogICAgICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSB3aWxsUGVy Zm9ybUhUVFBSZWRpcmVjdGlvbiBjb21wbGV0aW9uSGFuZGxlciAoJXMpIiwgdGFza0lkZW50aWZp ZXIsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAjZWxzZQogICAgICAg ICAgICAgVU5VU0VEX1BBUkFNKHRhc2tJZGVudGlmaWVyKTsKICNlbmRpZgogICAgICAgICAgICAg YXV0byBuc1JlcXVlc3QgPSByZXRhaW5QdHIocmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6 SFRUUEJvZHlVcGRhdGVQb2xpY3k6OlVwZGF0ZUhUVFBCb2R5KSk7Ci0KLSNpZiBFTkFCTEUoQVBQ X1BSSVZBQ1lfUkVQT1JUKQotICAgICAgICAgICAgaWYgKHNlc3Npb24pIHsKLSAgICAgICAgICAg ICAgICBSZXRhaW5QdHI8TlNNdXRhYmxlVVJMUmVxdWVzdD4gbXV0YWJsZVJlcXVlc3QgPSBhZG9w dE5TKFtuc1JlcXVlc3QgbXV0YWJsZUNvcHldKTsKLSAgICAgICAgICAgICAgICBtdXRhYmxlUmVx dWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9IGlzQXBwSW5pdGlhdGVkID8gTlNVUkxSZXF1ZXN0QXR0 cmlidXRpb25EZXZlbG9wZXIgOiBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvblVzZXI7Ci0gICAgICAg ICAgICAgICAgbnNSZXF1ZXN0ID0gbXV0YWJsZVJlcXVlc3QuZ2V0KCk7Ci0KLSAgICAgICAgICAg ICAgICBzZXNzaW9uLT5hcHBQcml2YWN5UmVwb3J0VGVzdGluZ0RhdGEoKS5kaWRMb2FkQXBwSW5p dGlhdGVkUmVxdWVzdChuc1JlcXVlc3QuZ2V0KCkuYXR0cmlidXRpb24gPT0gTlNVUkxSZXF1ZXN0 QXR0cmlidXRpb25EZXZlbG9wZXIpOwotICAgICAgICAgICAgfQotI2Vsc2UKLSAgICAgICAgICAg IFVOVVNFRF9QQVJBTShpc0FwcEluaXRpYXRlZCk7Ci0gICAgICAgICAgICBVTlVTRURfUEFSQU0o c2Vzc2lvbik7Ci0jZW5kaWYKICAgICAgICAgICAgIHVwZGF0ZUlnbm9yZVN0cmljdFRyYW5zcG9y dFNlY3VyaXR5U2V0dGluZyhuc1JlcXVlc3QsIHNob3VsZElnbm9yZUhTVFMpOwogICAgICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIobnNSZXF1ZXN0LmdldCgpKTsKICAgICAgICAgfSk7CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggMjU5MzkwYTJhYTUzNTI0MGRlZGVkMmVjNjZkYmJhYzM5YTAyMzAxZi4uOWFkNTIyM2Q2MWFi NTI1MzcyNmNjMDc2MDI0ZWMwMmU3YWZlZDIzMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIy LTAyLTAzICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAg ICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLgorICAgICAgICBOZWVkIHRoZSBi dWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9yZXNvdXJjZXMvcmVkaXJl Y3QuanM6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3Vz ZXItYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBo dHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLXJlZGlyZWN0Lmh0 bWw6IEFkZGVkLgorCiAyMDIyLTAyLTAzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgU3RhcnQgY29ubmVjdGluZyBTaGFyZWRXb3JrZXIgdG8gdGhlIFdlYktpdDIg bGF5ZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw b3J0L3Jlc291cmNlcy9yZWRpcmVjdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXBy aXZhY3ktcmVwb3J0L3Jlc291cmNlcy9yZWRpcmVjdC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ODM0OWZkZTM5 YWM4M2IyOGIxMjIwOTQ1YmM3NWE5MWZkODVkYjYyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvcmVzb3VyY2VzL3JlZGlyZWN0Lmpz CkBAIC0wLDAgKzEgQEAKK2NvbnNvbGUubG9nKCJGQUlMIik7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLXJlZGly ZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw b3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYz ZTgxNDY2ZGM0NjRlYmZiNDIzYjk1ZmIxN2Y3OWZiY2U2MTQ0N2IKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0 aW9uLXJlZGlyZWN0LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK0NPTlNPTEUgTUVTU0FH RTogT3JpZ2luIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMCBpcyBub3QgYWxsb3dlZCBieSBBY2Nlc3Mt Q29udHJvbC1BbGxvdy1PcmlnaW4uIFN0YXR1cyBjb2RlOiAyMDAKK0NPTlNPTEUgTUVTU0FHRTog WE1MSHR0cFJlcXVlc3QgY2Fubm90IGxvYWQgaHR0cDovL2xvY2FsaG9zdDo4MDAwL2FwcC1wcml2 YWN5LXJlcG9ydC9yZXNvdXJjZXMvcmVkaXJlY3QuanMgZHVlIHRvIGFjY2VzcyBjb250cm9sIGNo ZWNrcy4KK1Rlc3QgdGhhdCBhIGNyb3NzLW9yaWdpbiByZWRpcmVjdCB0byBhIHNlcnZlciB0aGF0 IHJlc3BvbmRzIGlzIGluZGlzdGluZ3Vpc2hhYmxlIGZyb20gb25lIHRoYXQgZG9lcyBub3QuIFNo b3VsZCBzYXkgUEFTUzoKKworUEFTUyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9ubHkgbm9uIGFwcCBp bml0aWF0ZWQgcmVxdWVzdHMKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVT VCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2 YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0aW9uLXJlZGlyZWN0Lmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uZTc3YzYzYWQ3YTM3MDMzZThmNzE3M2I2OTQwZTI5ZjU4YjBlOGMxZAot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw b3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QuaHRtbApAQCAtMCwwICsxLDU5IEBACis8IURP Q1RZUEUgaHRtbD48IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGlzQXBwSW5pdGlhdGVkPWZhbHNl IF0gLS0+Cis8aGVhZD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGVzdCB0aGF0IGEgY3Jvc3Mtb3Jp Z2luIHJlZGlyZWN0IHRvIGEgc2VydmVyIHRoYXQgcmVzcG9uZHMgaXMgaW5kaXN0aW5ndWlzaGFi bGUgZnJvbSBvbmUgdGhhdCBkb2VzIG5vdC4gU2hvdWxkIHNheSBQQVNTOjwvcD4KKzxwcmUgaWQ9 J2NvbnNvbGUnPjwvcHJlPgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAgIGlm ICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsK KyAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgfQorCisgICAgZnVuY3Rp b24gbG9nKG1lc3NhZ2UpCisgICAgeworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn Y29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UgKyAi XG4iKSk7CisgICAgfQorCisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0 UnVubmVyLnNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKHRydWUpOworCisgICAgd2luZG93Lmpz VGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgewor ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UgKyAnXG4nKSk7CisgICAgfQorCisgICAgZnVu Y3Rpb24gYXNrRm9yQXR0cmlidXRpb24oKSB7CisgICAgICAgIHZhciBkaWRMb2FkQXBwQm91bmRS ZXF1ZXN0ID0gdGVzdFJ1bm5lci5kaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCgpOworICAgICAg ICB2YXIgZGlkTG9hZE5vbkFwcEJvdW5kUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlkTG9hZE5vbkFw cEluaXRpYXRlZFJlcXVlc3QoKTsKKworICAgICAgICBpZiAoZGlkTG9hZEFwcEJvdW5kUmVxdWVz dCkgeworICAgICAgICAgICAgbG9nKCJGQUlMIGRpZCBsb2FkIGFwcCBpbml0aWF0ZWQgcmVxdWVz dCIpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKworICAgICAgICBpZiAoIWRpZExvYWROb25BcHBCb3VuZFJlcXVlc3QpIHsKKyAg ICAgICAgICAgIGxvZygiRkFJTCBkaWQgbm90IGxvYWQgbm9uIGFwcCBpbml0aWF0ZWQgcmVxdWVz dCIpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKworICAgICAgICBsb2coIlBBU1Mgc3VjY2Vzc2Z1bGx5IGxvYWRlZCBvbmx5IG5v biBhcHAgaW5pdGlhdGVkIHJlcXVlc3RzIik7CisKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7Cisg ICAgfQorCisgICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdDsKKyAgICB4aHIub25lcnJv ciA9IGZ1bmN0aW9uKCkgeyBzZXRUaW1lb3V0KGFza0ZvckF0dHJpYnV0aW9uLCAwKTsgfQorICAg IHhoci5vcGVuKCJHRVQiLCAiL3Jlc291cmNlcy9yZWRpcmVjdC5weT91cmw9aHR0cDovL2xvY2Fs aG9zdDo4MDAwL2FwcC1wcml2YWN5LXJlcG9ydC9yZXNvdXJjZXMvcmVkaXJlY3QuanMiLCB0cnVl KTsKKyAgICB4aHIuc2VuZCgpOworCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgo= 450902 2022-02-04 08:34:12 -0800 2022-02-04 09:07:49 -0800 Patch for landing bug-236111-20220204083411.patch text/plain 12562 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM2Mjk5NjM4NDQyZjk3 OGU0ZmExMzRjNzk2YWNlZWQzZGQwYzMxNy4uNDEwODNkMjYzNjgxZTEwOTAyY2U0NGE2YTgyZTZk OGQ1YjBjZGQxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTAzICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBBcHAg UHJpdmFjeSBSZXBvcnQgcmVkaXJlY3QgYXR0cmlidXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjExMQorCisgICAgICAgIFJldmlld2VkIGJ5 IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1y ZXBvcnQvdXNlci1hdHRyaWJ1dGlvbi1yZWRpcmVjdC5odG1sCisgICAgICAgIFRlc3Q6IGh0dHAv dGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1yZWRpcmVjdC5odG1sCisK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6dXBkYXRlRnJvbURlbGVnYXRlUHJl c2VydmluZ09sZFByb3BlcnRpZXMpOgorCiAyMDIyLTAyLTAzICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KIAogICAgICAgICBGbGFreSBzY29wZS5hc3NlcnROb0V4Y2VwdGlvbigpIGFz c2VydGlvbiBpbiB+SlNFeGVjU3RhdGUgd2hlbiBydW5uaW5nIHdvcmtlcnMgV1BUIHRlc3RzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCmluZGV4IDE1NzcyNTBhNmE5NTZmOGQxOWQyNzczNDFiZWNjNDBlZjEwZGU4N2IuLmY5YTY2 MTI3YjBhMmVlODY3ZmUwNWQ4YTJjZDNmNWQzMmU3ODkwMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMjItMDItMDMgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5j b20+CisKKyAgICAgICAgRml4IEFwcCBQcml2YWN5IFJlcG9ydCByZWRpcmVjdCBhdHRyaWJ1dGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MTEx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAgICAgICgtW1dLTmV0 d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6d2lsbFBlcmZvcm1IVFRQUmVkaXJl Y3Rpb246bmV3UmVxdWVzdDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwogMjAyMi0wMi0wMyAgUGVy IEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU11bV1BdIEFk ZCBmaWxlLWlvY3RsIHRlbGVtZXRyeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcAppbmRleCAxM2FmOTE2 Y2VlZjk3OThkMTRjMjUyMWUyZjgzMTZkMTkzMzg3ZjcxLi5lZGMzZDAyNmQwMWMwYWY0NzVkMmI0 NDg4YzFmMmYyNjEwZDAzODdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlUmVxdWVzdENGTmV0LmNwcApAQCAtMzcwLDYgKzM3 MCw3IEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojp1cGRhdGVGcm9tRGVsZWdhdGVQcmVzZXJ2aW5n T2xkUHJvcGVydGllcyhjb25zdCBSZXNvdXJjZVJlCiAgICAgYXV0byBvbGRSZXF1ZXN0ZXIgPSBy ZXF1ZXN0ZXIoKTsKICAgICBhdXRvIG9sZEluaXRpYXRvcklkZW50aWZpZXIgPSBpbml0aWF0b3JJ ZGVudGlmaWVyKCk7CiAgICAgYXV0byBvbGRJbnNwZWN0b3JJbml0aWF0b3JOb2RlSWRlbnRpZmll ciA9IGluc3BlY3RvckluaXRpYXRvck5vZGVJZGVudGlmaWVyKCk7CisgICAgYXV0byBvbGRBcHBJ bml0aWF0ZWRWYWx1ZSA9IGlzQXBwSW5pdGlhdGVkKCk7CiAKICAgICAqdGhpcyA9IGRlbGVnYXRl UHJvdmlkZWRSZXF1ZXN0OwogCkBAIC0zODAsNiArMzgxLDcgQEAgdm9pZCBSZXNvdXJjZVJlcXVl c3Q6OnVwZGF0ZUZyb21EZWxlZ2F0ZVByZXNlcnZpbmdPbGRQcm9wZXJ0aWVzKGNvbnN0IFJlc291 cmNlUmUKICAgICBzZXRJbml0aWF0b3JJZGVudGlmaWVyKG9sZEluaXRpYXRvcklkZW50aWZpZXIp OwogICAgIGlmIChvbGRJbnNwZWN0b3JJbml0aWF0b3JOb2RlSWRlbnRpZmllcikKICAgICAgICAg c2V0SW5zcGVjdG9ySW5pdGlhdG9yTm9kZUlkZW50aWZpZXIoKm9sZEluc3BlY3RvckluaXRpYXRv ck5vZGVJZGVudGlmaWVyKTsKKyAgICBzZXRJc0FwcEluaXRpYXRlZChvbGRBcHBJbml0aWF0ZWRW YWx1ZSk7CiB9CiAKIGJvb2wgUmVzb3VyY2VSZXF1ZXN0OjpodHRwUGlwZWxpbmluZ0VuYWJsZWQo KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3Jr U2Vzc2lvbkNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3 b3JrU2Vzc2lvbkNvY29hLm1tCmluZGV4IDgzNGU1MjYxNzMzMTE5ZTcwZTFlZjIwZDE3N2E3Mzgx OWZlZmZjOTEuLjllYWE4M2ZlYWUxOTVkZTljMDZjNWU0MThkZGMxYjgzMDgwZjg2NGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtT ZXNzaW9uQ29jb2EubW0KQEAgLTU5NywzMSArNTk3LDEzIEBAIHN0YXRpYyB2b2lkIHVwZGF0ZUln bm9yZVN0cmljdFRyYW5zcG9ydFNlY3VyaXR5U2V0dGluZyhSZXRhaW5QdHI8TlNVUkxSZXF1ZXN0 PiYKICAgICAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNvdXJjZVJlc3BvbnNlKHJl c3BvbnNlKTsKICAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5jaGVja1RBTyhyZXNvdXJjZVJlc3Bv bnNlKTsKIAotICAgICAgICBib29sIGlzQXBwSW5pdGlhdGVkID0gdHJ1ZTsKLSNpZiBFTkFCTEUo QVBQX1BSSVZBQ1lfUkVQT1JUKQotICAgICAgICBpc0FwcEluaXRpYXRlZCA9IHJlcXVlc3QuYXR0 cmlidXRpb24gPT0gTlNVUkxSZXF1ZXN0QXR0cmlidXRpb25EZXZlbG9wZXI7Ci0jZW5kaWYKLQot ICAgICAgICBuZXR3b3JrRGF0YVRhc2stPndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKFdURk1v dmUocmVzb3VyY2VSZXNwb25zZSksIHJlcXVlc3QsIFtzZXNzaW9uID0gbmV0d29ya0RhdGFUYXNr LT5uZXR3b3JrU2Vzc2lvbigpLCBjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihjb21w bGV0aW9uSGFuZGxlciksIHRhc2tJZGVudGlmaWVyLCBzaG91bGRJZ25vcmVIU1RTLCBpc0FwcElu aXRpYXRlZF0oYXV0byYmIHJlcXVlc3QpIHsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT53aWxs UGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXVEZNb3ZlKHJlc291cmNlUmVzcG9uc2UpLCByZXF1ZXN0 LCBbc2Vzc2lvbiA9IG5ldHdvcmtEYXRhVGFzay0+bmV0d29ya1Nlc3Npb24oKSwgY29tcGxldGlv bkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIpLCB0YXNrSWRlbnRpZmll ciwgc2hvdWxkSWdub3JlSFNUU10oYXV0byYmIHJlcXVlc3QpIHsKICNpZiAhTE9HX0RJU0FCTEVE CiAgICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IHdpbGxQZXJmb3JtSFRUUFJl ZGlyZWN0aW9uIGNvbXBsZXRpb25IYW5kbGVyICglcykiLCB0YXNrSWRlbnRpZmllciwgcmVxdWVz dC51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICNlbHNlCiAgICAgICAgICAgICBVTlVT RURfUEFSQU0odGFza0lkZW50aWZpZXIpOwogI2VuZGlmCiAgICAgICAgICAgICBhdXRvIG5zUmVx dWVzdCA9IHJldGFpblB0cihyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpIVFRQQm9keVVw ZGF0ZVBvbGljeTo6VXBkYXRlSFRUUEJvZHkpKTsKLQotI2lmIEVOQUJMRShBUFBfUFJJVkFDWV9S RVBPUlQpCi0gICAgICAgICAgICBpZiAoc2Vzc2lvbikgewotICAgICAgICAgICAgICAgIFJldGFp blB0cjxOU011dGFibGVVUkxSZXF1ZXN0PiBtdXRhYmxlUmVxdWVzdCA9IGFkb3B0TlMoW25zUmVx dWVzdCBtdXRhYmxlQ29weV0pOwotICAgICAgICAgICAgICAgIG11dGFibGVSZXF1ZXN0LmdldCgp LmF0dHJpYnV0aW9uID0gaXNBcHBJbml0aWF0ZWQgPyBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlvbkRl dmVsb3BlciA6IE5TVVJMUmVxdWVzdEF0dHJpYnV0aW9uVXNlcjsKLSAgICAgICAgICAgICAgICBu c1JlcXVlc3QgPSBtdXRhYmxlUmVxdWVzdC5nZXQoKTsKLQotICAgICAgICAgICAgICAgIHNlc3Np b24tPmFwcFByaXZhY3lSZXBvcnRUZXN0aW5nRGF0YSgpLmRpZExvYWRBcHBJbml0aWF0ZWRSZXF1 ZXN0KG5zUmVxdWVzdC5nZXQoKS5hdHRyaWJ1dGlvbiA9PSBOU1VSTFJlcXVlc3RBdHRyaWJ1dGlv bkRldmVsb3Blcik7Ci0gICAgICAgICAgICB9Ci0jZWxzZQotICAgICAgICAgICAgVU5VU0VEX1BB UkFNKGlzQXBwSW5pdGlhdGVkKTsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShzZXNzaW9uKTsK LSNlbmRpZgogICAgICAgICAgICAgdXBkYXRlSWdub3JlU3RyaWN0VHJhbnNwb3J0U2VjdXJpdHlT ZXR0aW5nKG5zUmVxdWVzdCwgc2hvdWxkSWdub3JlSFNUUyk7CiAgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihuc1JlcXVlc3QuZ2V0KCkpOwogICAgICAgICB9KTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyNTkzOTBh MmFhNTM1MjQwZGVkZWQyZWM2NmRiYmFjMzlhMDIzMDFmLi41YTljNTk4YTgxZGY3MTBmOTczY2U3 YmVkYTY5MTNhNTM1ODc5NzBjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjItMDItMDMgIEth dGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IEFw cCBQcml2YWN5IFJlcG9ydCByZWRpcmVjdCBhdHRyaWJ1dGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MTExCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVw b3J0L3Jlc291cmNlcy9yZWRpcmVjdC5qczogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9h cHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLXJlZGlyZWN0LWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJp YnV0aW9uLXJlZGlyZWN0Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvYXBwLXBy aXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC91c2VyLWF0dHJpYnV0 aW9uLXJlZGlyZWN0Lmh0bWw6IEFkZGVkLgorCiAyMDIyLTAyLTAzICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgU3RhcnQgY29ubmVjdGluZyBTaGFyZWRXb3JrZXIg dG8gdGhlIFdlYktpdDIgbGF5ZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv YXBwLXByaXZhY3ktcmVwb3J0L2FwcC1hdHRyaWJ1dGlvbi1yZWRpcmVjdC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmlidXRp b24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI5ZjRkZWRkMTI4OGE1MWMzZjYx ZDNiNDUzNzJiMTU2MTdmOGMxNTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2FwcC1wcml2YWN5LXJlcG9ydC9hcHAtYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsOSBAQAorQ09OU09MRSBNRVNTQUdFOiBPcmlnaW4gaHR0cDovLzEy Ny4wLjAuMTo4MDAwIGlzIG5vdCBhbGxvd2VkIGJ5IEFjY2Vzcy1Db250cm9sLUFsbG93LU9yaWdp bi4gU3RhdHVzIGNvZGU6IDIwMAorQ09OU09MRSBNRVNTQUdFOiBYTUxIdHRwUmVxdWVzdCBjYW5u b3QgbG9hZCBodHRwOi8vbG9jYWxob3N0OjgwMDAvYXBwLXByaXZhY3ktcmVwb3J0L3Jlc291cmNl cy9yZWRpcmVjdC5qcyBkdWUgdG8gYWNjZXNzIGNvbnRyb2wgY2hlY2tzLgorVGVzdCB0aGF0IGEg Y3Jvc3Mtb3JpZ2luIHJlZGlyZWN0IHRvIGEgc2VydmVyIHRoYXQgcmVzcG9uZHMgaXMgaW5kaXN0 aW5ndWlzaGFibGUgZnJvbSBvbmUgdGhhdCBkb2VzIG5vdC4gU2hvdWxkIHNheSBQQVNTOgorCitQ QVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVkIHJlcXVlc3RzCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0 aW9uLXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5LXJl cG9ydC9hcHAtYXR0cmlidXRpb24tcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iZWRhZTk0ODUx ZTFkMzI1ZGZhOTZlZWZmZmY1ZDIxN2U1MzFkOWJiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvYXBwLWF0dHJpYnV0aW9uLXJlZGly ZWN0Lmh0bWwKQEAgLTAsMCArMSw1OSBAQAorPCFET0NUWVBFIGh0bWw+PCEtLSB3ZWJraXQtdGVz dC1ydW5uZXIgWyBpc0FwcEluaXRpYXRlZD10cnVlIF0gLS0+Cis8aGVhZD4KKyAgICA8c2NyaXB0 IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorPHA+VGVzdCB0aGF0IGEgY3Jvc3Mtb3JpZ2luIHJlZGlyZWN0IHRvIGEgc2VydmVyIHRo YXQgcmVzcG9uZHMgaXMgaW5kaXN0aW5ndWlzaGFibGUgZnJvbSBvbmUgdGhhdCBkb2VzIG5vdC4g U2hvdWxkIHNheSBQQVNTOjwvcD4KKzxwcmUgaWQ9J2NvbnNvbGUnPjwvcHJlPgorPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAg ICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50 aWxEb25lKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgeworICAg ICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRvY3Vt ZW50LmNyZWF0ZVRleHROb2RlKG1lc3NhZ2UgKyAiXG4iKSk7CisgICAgfQorCisgICAgaWYgKHdp bmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLnNldEFsbG93c0FueVNTTENlcnRp ZmljYXRlKHRydWUpOworCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAg ZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgeworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1lc3Nh Z2UgKyAnXG4nKSk7CisgICAgfQorCisgICAgZnVuY3Rpb24gYXNrRm9yQXR0cmlidXRpb24oKSB7 CisgICAgICAgIHZhciBkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCA9IHRlc3RSdW5uZXIuZGlk TG9hZEFwcEluaXRpYXRlZFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIGRpZExvYWROb25BcHBJbml0 aWF0ZWRSZXF1ZXN0ID0gdGVzdFJ1bm5lci5kaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCgp OworCisgICAgICAgIGlmIChkaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAg ICAgICAgbG9nKCJGQUlMIGRpZCBsb2FkIG5vbiBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAg ICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CisKKyAgICAgICAgaWYgKCFkaWRMb2FkQXBwSW5pdGlhdGVkUmVxdWVzdCkgeworICAgICAgICAg ICAgbG9nKCJGQUlMIGRpZCBub3QgbG9hZCBhcHAgaW5pdGlhdGVkIHJlcXVlc3QiKTsKKyAgICAg ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisK KyAgICAgICAgbG9nKCJQQVNTIHN1Y2Nlc3NmdWxseSBsb2FkZWQgb25seSBhcHAgaW5pdGlhdGVk IHJlcXVlc3RzIik7CisKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfQorCisgICAgdmFy IHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdDsKKyAgICB4aHIub25lcnJvciA9IGZ1bmN0aW9uKCkg eyBzZXRUaW1lb3V0KGFza0ZvckF0dHJpYnV0aW9uLCAwKTsgfQorICAgIHhoci5vcGVuKCJHRVQi LCAiL3Jlc291cmNlcy9yZWRpcmVjdC5weT91cmw9aHR0cDovL2xvY2FsaG9zdDo4MDAwL2FwcC1w cml2YWN5LXJlcG9ydC9yZXNvdXJjZXMvcmVkaXJlY3QuanMiLCB0cnVlKTsKKyAgICB4aHIuc2Vu ZCgpOworCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0 LmpzIj48L3NjcmlwdD4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvcmVzb3VyY2VzL3JlZGlyZWN0LmpzIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvcmVzb3VyY2VzL3JlZGly ZWN0LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjU4MzQ5ZmRlMzlhYzgzYjI4YjEyMjA5NDViYzc1YTkxZmQ4NWRi NjIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcC1wcml2YWN5 LXJlcG9ydC9yZXNvdXJjZXMvcmVkaXJlY3QuanMKQEAgLTAsMCArMSBAQAorY29uc29sZS5sb2co IkZBSUwiKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3kt cmVwb3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvdXNlci1hdHRyaWJ1dGlvbi1yZWRpcmVj dC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjNlODE0NjZkYzQ2NGViZmI0MjNiOTVmYjE3Zjc5 ZmJjZTYxNDQ3YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBw LXByaXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsOSBAQAorQ09OU09MRSBNRVNTQUdFOiBPcmlnaW4gaHR0cDovLzEyNy4wLjAuMTo4 MDAwIGlzIG5vdCBhbGxvd2VkIGJ5IEFjY2Vzcy1Db250cm9sLUFsbG93LU9yaWdpbi4gU3RhdHVz IGNvZGU6IDIwMAorQ09OU09MRSBNRVNTQUdFOiBYTUxIdHRwUmVxdWVzdCBjYW5ub3QgbG9hZCBo dHRwOi8vbG9jYWxob3N0OjgwMDAvYXBwLXByaXZhY3ktcmVwb3J0L3Jlc291cmNlcy9yZWRpcmVj dC5qcyBkdWUgdG8gYWNjZXNzIGNvbnRyb2wgY2hlY2tzLgorVGVzdCB0aGF0IGEgY3Jvc3Mtb3Jp Z2luIHJlZGlyZWN0IHRvIGEgc2VydmVyIHRoYXQgcmVzcG9uZHMgaXMgaW5kaXN0aW5ndWlzaGFi bGUgZnJvbSBvbmUgdGhhdCBkb2VzIG5vdC4gU2hvdWxkIHNheSBQQVNTOgorCitQQVNTIHN1Y2Nl c3NmdWxseSBsb2FkZWQgb25seSBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0cworUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0L3VzZXItYXR0cmlidXRpb24t cmVkaXJlY3QuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwLXByaXZhY3ktcmVwb3J0 L3VzZXItYXR0cmlidXRpb24tcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lNzdjNjNhZDdhMzcw MzNlOGY3MTczYjY5NDBlMjlmNThiMGU4YzFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9hcHAtcHJpdmFjeS1yZXBvcnQvdXNlci1hdHRyaWJ1dGlvbi1yZWRpcmVj dC5odG1sCkBAIC0wLDAgKzEsNTkgQEAKKzwhRE9DVFlQRSBodG1sPjwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgaXNBcHBJbml0aWF0ZWQ9ZmFsc2UgXSAtLT4KKzxoZWFkPgorICAgIDxzY3JpcHQg c3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHk+Cis8cD5UZXN0IHRoYXQgYSBjcm9zcy1vcmlnaW4gcmVkaXJlY3QgdG8gYSBzZXJ2ZXIgdGhh dCByZXNwb25kcyBpcyBpbmRpc3Rpbmd1aXNoYWJsZSBmcm9tIG9uZSB0aGF0IGRvZXMgbm90LiBT aG91bGQgc2F5IFBBU1M6PC9wPgorPHByZSBpZD0nY29uc29sZSc+PC9wcmU+Cis8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCI+CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7CisgICAg ICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRp bERvbmUoKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBsb2cobWVzc2FnZSkKKyAgICB7CisgICAg ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSArICJcbiIpKTsKKyAgICB9CisKKyAgICBpZiAod2lu ZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0QWxsb3dzQW55U1NMQ2VydGlm aWNhdGUodHJ1ZSk7CisKKyAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICBm dW5jdGlvbiBsb2cobWVzc2FnZSkKKyAgICB7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdjb25zb2xlJykuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2Fn ZSArICdcbicpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBhc2tGb3JBdHRyaWJ1dGlvbigpIHsK KyAgICAgICAgdmFyIGRpZExvYWRBcHBCb3VuZFJlcXVlc3QgPSB0ZXN0UnVubmVyLmRpZExvYWRB cHBJbml0aWF0ZWRSZXF1ZXN0KCk7CisgICAgICAgIHZhciBkaWRMb2FkTm9uQXBwQm91bmRSZXF1 ZXN0ID0gdGVzdFJ1bm5lci5kaWRMb2FkTm9uQXBwSW5pdGlhdGVkUmVxdWVzdCgpOworCisgICAg ICAgIGlmIChkaWRMb2FkQXBwQm91bmRSZXF1ZXN0KSB7CisgICAgICAgICAgICBsb2coIkZBSUwg ZGlkIGxvYWQgYXBwIGluaXRpYXRlZCByZXF1ZXN0Iik7CisgICAgICAgICAgICBmaW5pc2hKU1Rl c3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghZGlk TG9hZE5vbkFwcEJvdW5kUmVxdWVzdCkgeworICAgICAgICAgICAgbG9nKCJGQUlMIGRpZCBub3Qg bG9hZCBub24gYXBwIGluaXRpYXRlZCByZXF1ZXN0Iik7CisgICAgICAgICAgICBmaW5pc2hKU1Rl c3QoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGxvZygiUEFT UyBzdWNjZXNzZnVsbHkgbG9hZGVkIG9ubHkgbm9uIGFwcCBpbml0aWF0ZWQgcmVxdWVzdHMiKTsK KworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9CisKKyAgICB2YXIgeGhyID0gbmV3IFhN TEh0dHBSZXF1ZXN0OworICAgIHhoci5vbmVycm9yID0gZnVuY3Rpb24oKSB7IHNldFRpbWVvdXQo YXNrRm9yQXR0cmlidXRpb24sIDApOyB9CisgICAgeGhyLm9wZW4oIkdFVCIsICIvcmVzb3VyY2Vz L3JlZGlyZWN0LnB5P3VybD1odHRwOi8vbG9jYWxob3N0OjgwMDAvYXBwLXByaXZhY3ktcmVwb3J0 L3Jlc291cmNlcy9yZWRpcmVjdC5qcyIsIHRydWUpOworICAgIHhoci5zZW5kKCk7CisKKzwvc2Ny aXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0 PgorCis8L2JvZHk+Cis8L2h0bWw+Cg==