209000 2020-03-12 09:19:08 -0700 Resource load statistics data summary should return all third party data 2020-03-12 14:23:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham commit-queue webkit-bug-importer wilander oldest_to_newest 1629212 0 katherine_cheney 2020-03-12 09:19:08 -0700 It would be more informative to return all third party data, not just prevalent domains. 1629215 1 katherine_cheney 2020-03-12 09:19:35 -0700 <rdar://problem/60348306> 1629219 2 393383 katherine_cheney 2020-03-12 09:24:56 -0700 Created attachment 393383 Patch 1629241 3 393383 wilander 2020-03-12 10:33:38 -0700 Comment on attachment 393383 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393383&action=review r=me. Please address my comment on the cookie blocking mode. > Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsDatabaseStore.cpp:844 > + || sortedStatistics.bindText(1, "%") I think this should be made conditional on the configured WebCore::ThirdPartyCookieBlockingMode. If == WebCore::ThirdPartyCookieBlockingMode::All, send back all third party data, otherwise keep the old behavior. You already have a thirdPartyCookieBlockingMode() getter in the ResourceLoadStatisticsStore base class. Then your API tests might have to enable WebCore::ThirdPartyCookieBlockingMode::All if they aren't already running under that configuration. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:986 > + // Set two third parties to be prevalent, leave evil1.com as non-prevalent to ensure Personally, I'd prefer not to call prevalent domains "evil" since there's nothing inherently evil about them. But I know it's existing code. 1629325 4 393405 katherine_cheney 2020-03-12 13:13:50 -0700 Created attachment 393405 Patch 1629326 5 katherine_cheney 2020-03-12 13:14:26 -0700 (In reply to katherine_cheney from comment #4) > Created attachment 393405 [details] > Patch Thanks John! Made these changes. Waiting on EWS before cq+ 1629359 6 393405 commit-queue 2020-03-12 14:22:53 -0700 Comment on attachment 393405 Patch Clearing flags on attachment: 393405 Committed r258357: <https://trac.webkit.org/changeset/258357> 1629360 7 commit-queue 2020-03-12 14:22:55 -0700 All reviewed patches have been landed. Closing bug. 1629362 8 webkit-bug-importer 2020-03-12 14:23:17 -0700 <rdar://problem/60387086> 393383 2020-03-12 09:24:56 -0700 2020-03-12 13:13:48 -0700 Patch bug-209000-20200312092455.patch text/plain 9176 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4Mjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA4YzlhZDU2ZjZmZjU0MWZh YWM3YWFjMDBlZTUwMDY4ZTQzYWQzZWYuLjRmNGQ3ZGQ2OGRhMjZiNmJlNGE4MWZkMjIzZDhmMDFl NGY4MjA2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDMtMTIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgbG9h ZCBzdGF0aXN0aWNzIGRhdGEgc3VtbWFyeSBzaG91bGQgcmV0dXJuIGFsbCB0aGlyZCBwYXJ0eSBk YXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkw MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwMzQ4MzA2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBwYXRjaCBh ZGp1c3RzIG9sZCB0ZXN0cyB0byB0ZXN0IHRoaXMgbmV3CisgICAgICAgIGJlaGF2aW9yLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZS5jcHA6CisgICAgICAgICclJyB3aWxsIHJldHVybiBhIHJvdyByZWdhcmRs ZXNzIG9mIHdoYXQgdGhlIHZhbHVlIGluIHRoZSBzcGVjaWZpZWQKKyAgICAgICAgY29sdW1uIGlz LgorCiAyMDIwLTAzLTExICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29t PgogCiAgICAgICAgIEFkZCBhIHBhcmFtZXRlciB0byBhbGxvdyBpZ25vcmluZyBhcHAtYm91bmQg ZG9tYWluIGNhdGVnb3JpemF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3Bw IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAppbmRleCA1ZDg1M2ZkZDRmOThiZGQzM2ZhODIxOTNi NDMzNWFiZTY5YjgwMGVmLi5iOGRlNDI1MGU0NzRkODg2Yzg0N2Q2ZGMxMTU0YzMwMDE3MGYyMDJk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVz b3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VT dG9yZS5jcHAKQEAgLTg0MSw3ICs4NDEsNyBAQCBWZWN0b3I8V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpUaGlyZFBhcnR5RGF0YT4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdAogICAg IFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlEYXRhPiB0 aGlyZFBhcnR5RGF0YUxpc3Q7CiAgICAgU1FMaXRlU3RhdGVtZW50IHNvcnRlZFN0YXRpc3RpY3Mo bV9kYXRhYmFzZSwgbWFrZVN0cmluZygiU0VMRUNUICIsIGpvaW5TdWJTdGF0aXN0aWNzRm9yU29y dGluZygpKSk7CiAgICAgaWYgKHNvcnRlZFN0YXRpc3RpY3MucHJlcGFyZSgpICE9IFNRTElURV9P SwotICAgICAgICB8fCBzb3J0ZWRTdGF0aXN0aWNzLmJpbmRUZXh0KDEsICIxIikKKyAgICAgICAg fHwgc29ydGVkU3RhdGlzdGljcy5iaW5kVGV4dCgxLCAiJSIpCiAgICAgICAgIHx8IHNvcnRlZFN0 YXRpc3RpY3MuYmluZFRleHQoMiwgIiUiKSAhPSBTUUxJVEVfT0spIHsKICAgICAgICAgUkVMRUFT RV9MT0dfRVJST1IoTmV0d29yaywgIlJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3Jl OjphZ2dyZWdhdGVkVGhpcmRQYXJ0eURhdGEsIGVycm9yIG1lc3NhZ2U6ICUiIFBVQkxJQ19MT0df U1RSSU5HLCBtX2RhdGFiYXNlLmxhc3RFcnJvck1zZygpKTsKICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggY2FkNWIwNjAyY2E0OGE0OTM1MzMxMDE3YWZlMDRjNmYwZGNjODZmZi4uY2Q0OTU4NzYx NGU3MmU5MWQ2ZjhlNmMzZjJlMzE1MzEzZDk5MjliNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTEyICBL YXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291 cmNlIGxvYWQgc3RhdGlzdGljcyBkYXRhIHN1bW1hcnkgc2hvdWxkIHJldHVybiBhbGwgdGhpcmQg cGFydHkgZGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA5MDAwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MDM0ODMwNj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYXJrZWQgb25seSAyIG9mIDMg ZG9tYWlucyBwcmV2YWxlbnQgaW4gZGF0YSBzdW1tYXJ5IHRlc3RzIHRvIGVuc3VyZQorICAgICAg ICB0aGUgY2FsbCByZXR1cm5zIGFsbCB0aGlyZCBwYXJ0aWVzLCBub3QganVzdCBwcmV2YWxlbnQg b25lcy4KKyAgICAgICAgQWRkZWQgYSBtb3JlIGFnZ3Jlc3NpdmUgY2hlY2sgZm9yIHRoZSBzaXpl IG9mIHRoZSBhcnJheSBhdCB0aGUKKyAgICAgICAgYmVnaW5uaW5nIG9mIHRoZSB0ZXN0IHRvIGVu c3VyZSB0aGUgYXJyYXkgaXMgc3RpbGwgcmV0dXJuaW5nIDMgdmFsdWVzLiAKKyAgICAgICAgQWxz byByZW1vdmVkIHRoZSBBU1NFUlQgc3RhdGVtZW50cyBhcyB0aGV5IHNlZW0gdG8gY2F1c2UgdGlt ZW91dHMgKG5vdAorICAgICAgICBjbGVhciBjcmFzaGVzKSB3aGVuIHRoZXkgYXJlIG5vdCB0cnVl LCB3aGljaCBpcyBoYXJkIHRvIGRlYnVnLgorICAgICAgICBJZiB0aGVzZSB2YWx1ZXMgYXJlIG5p bCwgdGhlIHRlc3Qgd2lsbCBmYWlsIGluIHRoZSBFWFBFQ1RfV0tfU1RSRVEKKyAgICAgICAgY2hl Y2tzLCB3ZSBkb24ndCBuZWVkIEFTU0VSVCBzdGF0ZW1lbnRzLgorICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5tbToKKyAgICAg ICAgKFRFU1QpOgorCiAyMDIwLTAzLTExICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW1dlYkF1dGhuXSBGb3JtYWxpemUgdGhlIEtleWNoYWluIHNjaGVtYQpk aWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJj ZUxvYWRTdGF0aXN0aWNzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLm1tCmluZGV4IDA4MzYwYmU5ODMwZGVkMjExN2U2ZWM5 NmFjODk0YjYwOGE5NTFmOWIuLjUyYmNlMDZkYmNiNDI2ZTg0M2I3NTIzZGE3YzQ5MTdiYzdmYjFi ODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVz b3VyY2VMb2FkU3RhdGlzdGljcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW0KQEAgLTk4MywxMCArOTgzLDggQEAg VEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0 YVN1bW1hcnkpCiAKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmVGbGFnKTsKIAot ICAgIC8vIHNldCB0aGlyZCBwYXJ0aWVzIHRvIGJlIHByZXZhbGVudAotICAgIFtkYXRhU3RvcmUg X3NldFByZXZhbGVudERvbWFpbjpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly9ldmlsMS5j b20iXSBjb21wbGV0aW9uSGFuZGxlcjogXih2b2lkKSB7Ci0gICAgICAgIGRvbmVGbGFnID0gdHJ1 ZTsKLSAgICB9XTsKKyAgICAvLyBTZXQgdHdvIHRoaXJkIHBhcnRpZXMgdG8gYmUgcHJldmFsZW50 LCBsZWF2ZSBldmlsMS5jb20gYXMgbm9uLXByZXZhbGVudCB0byBlbnN1cmUKKyAgICAvLyB0aGlz IGNhbGwgcmV0dXJucyBhbGwgdGhpcmQgcGFydGllcy4KICAgICBkb25lRmxhZyA9IGZhbHNlOwog ICAgIFtkYXRhU3RvcmUgX3NldFByZXZhbGVudERvbWFpbjpbTlNVUkwgVVJMV2l0aFN0cmluZzpA Imh0dHA6Ly9ldmlsMi5jb20iXSBjb21wbGV0aW9uSGFuZGxlcjogXih2b2lkKSB7CiAgICAgICAg IGRvbmVGbGFnID0gdHJ1ZTsKQEAgLTEwOTYsNiArMTA5NCw3IEBAIFRFU1QoUmVzb3VyY2VMb2Fk U3RhdGlzdGljcywgR2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5KQogICAgIGRv bmVGbGFnID0gZmFsc2U7CiAgICAgW2RhdGFTdG9yZSBfZ2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFTdW1tYXJ5Ol52b2lkKE5TQXJyYXk8X1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc1RoaXJk UGFydHkgKj4gKnRoaXJkUGFydHlEYXRhKQogICAgIHsKKyAgICAgICAgRVhQRUNUX0VRKHN0YXRp Y19jYXN0PGludD4oW3RoaXJkUGFydHlEYXRhIGNvdW50XSksIDMpOwogICAgICAgICBOU0VudW1l cmF0b3IgKnRoaXJkUGFydHlEb21haW5zID0gW3RoaXJkUGFydHlEYXRhIG9iamVjdEVudW1lcmF0 b3JdOwogCiAgICAgICAgIC8vIGV2aWwzCkBAIC0xMTA3LDEwICsxMTA2LDYgQEAgVEVTVChSZXNv dXJjZUxvYWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkp CiAgICAgICAgIF9XS1Jlc291cmNlTG9hZFN0YXRpc3RpY3NGaXJzdFBhcnR5ICpldmlsM0ZpcnN0 UGFydHkyID0gW2V2aWwzRW51bWVyYXRvciBuZXh0T2JqZWN0XTsKICAgICAgICAgX1dLUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwzRmlyc3RQYXJ0eTMgPSBbZXZpbDNFbnVt ZXJhdG9yIG5leHRPYmplY3RdOwogCi0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwzRmlyc3RQYXJ0 eTEgIT0gbmlsKTsKLSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDNGaXJzdFBhcnR5MiAhPSBuaWwp OwotICAgICAgICBBU1NFUlRfVFJVRShldmlsM0ZpcnN0UGFydHkzICE9IG5pbCk7Ci0KICAgICAg ICAgRVhQRUNUX1dLX1NUUkVRKGV2aWwzRmlyc3RQYXJ0eTEuZmlyc3RQYXJ0eURvbWFpbiwgQCJ3 ZWJraXQyLm9yZyIpOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDNGaXJzdFBhcnR5Mi5m aXJzdFBhcnR5RG9tYWluLCBAIndlYmtpdDMub3JnIik7CiAgICAgICAgIEVYUEVDVF9XS19TVFJF UShldmlsM0ZpcnN0UGFydHkzLmZpcnN0UGFydHlEb21haW4sIEAid2Via2l0Lm9yZyIpOwpAQCAt MTEyNyw5ICsxMTIyLDYgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkpCiAgICAgICAgIF9XS1Jlc291cmNlTG9hZFN0YXRp c3RpY3NGaXJzdFBhcnR5ICpldmlsMUZpcnN0UGFydHkxPSBbZXZpbDFFbnVtZXJhdG9yIG5leHRP YmplY3RdOwogICAgICAgICBfV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRmlyc3RQYXJ0eSAqZXZp bDFGaXJzdFBhcnR5MiA9IFtldmlsMUVudW1lcmF0b3IgbmV4dE9iamVjdF07CiAKLSAgICAgICAg QVNTRVJUX1RSVUUoZXZpbDFGaXJzdFBhcnR5MSAhPSBuaWwpOwotICAgICAgICBBU1NFUlRfVFJV RShldmlsMUZpcnN0UGFydHkyICE9IG5pbCk7Ci0KICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKGV2 aWwxRmlyc3RQYXJ0eTEuZmlyc3RQYXJ0eURvbWFpbiwgQCJ3ZWJraXQyLm9yZyIpOwogICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDFGaXJzdFBhcnR5Mi5maXJzdFBhcnR5RG9tYWluLCBAIndl YmtpdC5vcmciKTsKIApAQCAtMTE0Myw4ICsxMTM1LDYgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkpCiAgICAgICAgIE5T RW51bWVyYXRvciAqZXZpbDJFbnVtZXJhdG9yID0gW2V2aWwyVGhpcmRQYXJ0eS51bmRlckZpcnN0 UGFydGllcyBvYmplY3RFbnVtZXJhdG9yXTsKICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlz dGljc0ZpcnN0UGFydHkgKmV2aWwyRmlyc3RQYXJ0eTEgPSBbZXZpbDJFbnVtZXJhdG9yIG5leHRP YmplY3RdOwogCi0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwyRmlyc3RQYXJ0eTEgIT0gbmlsKTsK LQogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDJGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9t YWluLCBAIndlYmtpdC5vcmciKTsKICAgICAgICAgRVhQRUNUX0ZBTFNFKGV2aWwyRmlyc3RQYXJ0 eTEudGhpcmRQYXJ0eVN0b3JhZ2VBY2Nlc3NHcmFudGVkKTsKICAgICAgICAgZG9uZUZsYWcgPSB0 cnVlOwpAQCAtMTE5NiwxNCArMTE4Niw4IEBAIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywg R2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5RGF0YWJhc2UpCiAKICAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmVGbGFnKTsKIAotICAgIC8vIFRlYWNoIElUUCBhYm91 dCBiYWQgb3JpZ2lucy4KLSAgICBkb25lRmxhZyA9IGZhbHNlOwotICAgIFtkYXRhU3RvcmUgX3Nl dFByZXZhbGVudERvbWFpbjpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly9ldmlsMS5jb20i XSBjb21wbGV0aW9uSGFuZGxlcjogXih2b2lkKSB7Ci0gICAgICAgIGRvbmVGbGFnID0gdHJ1ZTsK LSAgICB9XTsKLQotICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZUZsYWcpOwotCisg ICAgLy8gU2V0IHR3byB0aGlyZCBwYXJ0aWVzIHRvIGJlIHByZXZhbGVudCwgbGVhdmUgZXZpbDEu Y29tIGFzIG5vbi1wcmV2YWxlbnQgdG8gZW5zdXJlCisgICAgLy8gdGhpcyBjYWxsIHJldHVybnMg YWxsIHRoaXJkIHBhcnRpZXMuCiAgICAgZG9uZUZsYWcgPSBmYWxzZTsKICAgICBbZGF0YVN0b3Jl IF9zZXRQcmV2YWxlbnREb21haW46W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vZXZpbDIu Y29tIl0gY29tcGxldGlvbkhhbmRsZXI6IF4odm9pZCkgewogICAgICAgICBkb25lRmxhZyA9IHRy dWU7CkBAIC0xMzE2LDYgKzEzMDAsNyBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeURhdGFiYXNlKQogICAgIGRvbmVGbGFn ID0gZmFsc2U7CiAgICAgW2RhdGFTdG9yZSBfZ2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFT dW1tYXJ5Ol52b2lkKE5TQXJyYXk8X1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc1RoaXJkUGFydHkg Kj4gKnRoaXJkUGFydHlEYXRhKQogICAgIHsKKyAgICAgICAgRVhQRUNUX0VRKHN0YXRpY19jYXN0 PGludD4oW3RoaXJkUGFydHlEYXRhIGNvdW50XSksIDMpOwogICAgICAgICBOU0VudW1lcmF0b3Ig KnRoaXJkUGFydHlEb21haW5zID0gW3RoaXJkUGFydHlEYXRhIG9iamVjdEVudW1lcmF0b3JdOwog CiAgICAgICAgIC8vIGV2aWwzCkBAIC0xMzI3LDEwICsxMzEyLDYgQEAgVEVTVChSZXNvdXJjZUxv YWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnlEYXRhYmFz ZSkKICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwzRmly c3RQYXJ0eTIgPSBbZXZpbDNFbnVtZXJhdG9yIG5leHRPYmplY3RdOwogICAgICAgICBfV0tSZXNv dXJjZUxvYWRTdGF0aXN0aWNzRmlyc3RQYXJ0eSAqZXZpbDNGaXJzdFBhcnR5MyA9IFtldmlsM0Vu dW1lcmF0b3IgbmV4dE9iamVjdF07CiAKLSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDNGaXJzdFBh cnR5MSAhPSBuaWwpOwotICAgICAgICBBU1NFUlRfVFJVRShldmlsM0ZpcnN0UGFydHkyICE9IG5p bCk7Ci0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwzRmlyc3RQYXJ0eTMgIT0gbmlsKTsKLQogICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDNGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9tYWluLCBA IndlYmtpdDIub3JnIik7CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShldmlsM0ZpcnN0UGFydHky LmZpcnN0UGFydHlEb21haW4sIEAid2Via2l0My5vcmciKTsKICAgICAgICAgRVhQRUNUX1dLX1NU UkVRKGV2aWwzRmlyc3RQYXJ0eTMuZmlyc3RQYXJ0eURvbWFpbiwgQCJ3ZWJraXQub3JnIik7CkBA IC0xMzY2LDkgKzEzNDcsNiBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeURhdGFiYXNlKQogICAgICAgICBfV0tSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRmlyc3RQYXJ0eSAqZXZpbDFGaXJzdFBhcnR5MT0gW2V2aWwxRW51bWVy YXRvciBuZXh0T2JqZWN0XTsKICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc0ZpcnN0 UGFydHkgKmV2aWwxRmlyc3RQYXJ0eTIgPSBbZXZpbDFFbnVtZXJhdG9yIG5leHRPYmplY3RdOwog Ci0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwxRmlyc3RQYXJ0eTEgIT0gbmlsKTsKLSAgICAgICAg QVNTRVJUX1RSVUUoZXZpbDFGaXJzdFBhcnR5MiAhPSBuaWwpOwotCiAgICAgICAgIEVYUEVDVF9X S19TVFJFUShldmlsMUZpcnN0UGFydHkxLmZpcnN0UGFydHlEb21haW4sIEAid2Via2l0Mi5vcmci KTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKGV2aWwxRmlyc3RQYXJ0eTIuZmlyc3RQYXJ0eURv bWFpbiwgQCJ3ZWJraXQub3JnIik7CiAKQEAgLTEzOTUsOCArMTM3Myw2IEBAIFRFU1QoUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcywgR2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5RGF0 YWJhc2UpCiAgICAgICAgIE5TRW51bWVyYXRvciAqZXZpbDJFbnVtZXJhdG9yID0gW2V2aWwyVGhp cmRQYXJ0eS51bmRlckZpcnN0UGFydGllcyBvYmplY3RFbnVtZXJhdG9yXTsKICAgICAgICAgX1dL UmVzb3VyY2VMb2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwyRmlyc3RQYXJ0eTEgPSBbZXZp bDJFbnVtZXJhdG9yIG5leHRPYmplY3RdOwogCi0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwyRmly c3RQYXJ0eTEgIT0gbmlsKTsKLQogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDJGaXJzdFBh cnR5MS5maXJzdFBhcnR5RG9tYWluLCBAIndlYmtpdC5vcmciKTsKICAgICAgICAgRVhQRUNUX0ZB TFNFKGV2aWwyRmlyc3RQYXJ0eTEudGhpcmRQYXJ0eVN0b3JhZ2VBY2Nlc3NHcmFudGVkKTsKIAo= 393405 2020-03-12 13:13:50 -0700 2020-03-12 14:22:53 -0700 Patch bug-209000-20200312131349.patch text/plain 12743 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA2ZDVjMGY4Mzc3Y2EyMzcy MTZlMDdlNjU3N2ZmMmEyZjM0ODMxMmUuLmU1YmE1M2VkZWU3YzJhYTU5ZDIzMDMyOGNjYmEzZjI1 OTdiNmIwMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDMtMTIgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgbG9h ZCBzdGF0aXN0aWNzIGRhdGEgc3VtbWFyeSBzaG91bGQgcmV0dXJuIGFsbCB0aGlyZCBwYXJ0eSBk YXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkw MDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYwMzQ4MzA2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IEpvaG4gV2lsYW5kZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIHBhdGNoIGFk anVzdHMgb2xkIHRlc3RzIHRvIHRlc3QgdGhpcyBuZXcgYmVoYXZpb3IKKworICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3Rv cmUuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3Jl Lm1tOgorICAgICAgICAoLVtXS1dlYnNpdGVEYXRhU3RvcmUgX3NldFRoaXJkUGFydHlDb29raWVC bG9ja2luZ01vZGU6b25seU9uU2l0ZXNXaXRob3V0VXNlckludGVyYWN0aW9uOmNvbXBsZXRpb25I YW5kbGVyOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0 b3JlUHJpdmF0ZS5oOgorICAgICAgICBBZGRlZCBuZXcgZnVuY3Rpb24gX3NldFRoaXJkUGFydHlD b29raWVCbG9ja2luZ01vZGUgc28gQVBJIHRlc3RzIGNhbgorICAgICAgICBzZXQgdGhpcyBwYXJh bWV0ZXIuCisKIDIwMjAtMDMtMTIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBXS1dlYlZpZXcuaGFzT25seVNlY3VyZUNvbnRlbnQgc2hvdWxk IGJlIGNvcnJlY3QgYWZ0ZXIgYmFjay9mb3J3YXJkIG5hdmlnYXRpb25zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlz dGljc0RhdGFiYXNlU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFz c2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAppbmRleCA1ZDg1 M2ZkZDRmOThiZGQzM2ZhODIxOTNiNDMzNWFiZTY5YjgwMGVmLi45OGU2OTRiOWFhMjBhNGJiYzRh MTM1ZTUxNDdiMTVlZmIxZTFmNjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZS5jcHAKQEAgLTgzOSw5ICs4MzksMTAgQEAgVmVjdG9y PFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+IFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXQKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAg IFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlEYXRhPiB0 aGlyZFBhcnR5RGF0YUxpc3Q7CisgICAgY29uc3QgYXV0byBwcmV2YWxlbnREb21haW5zQmluZFBh cmFtZXRlciA9IHRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUoKSA9PSBUaGlyZFBhcnR5Q29v a2llQmxvY2tpbmdNb2RlOjpBbGwgPyAiJSIgOiAiMSI7CiAgICAgU1FMaXRlU3RhdGVtZW50IHNv cnRlZFN0YXRpc3RpY3MobV9kYXRhYmFzZSwgbWFrZVN0cmluZygiU0VMRUNUICIsIGpvaW5TdWJT dGF0aXN0aWNzRm9yU29ydGluZygpKSk7CiAgICAgaWYgKHNvcnRlZFN0YXRpc3RpY3MucHJlcGFy ZSgpICE9IFNRTElURV9PSwotICAgICAgICB8fCBzb3J0ZWRTdGF0aXN0aWNzLmJpbmRUZXh0KDEs ICIxIikKKyAgICAgICAgfHwgc29ydGVkU3RhdGlzdGljcy5iaW5kVGV4dCgxLCBwcmV2YWxlbnRE b21haW5zQmluZFBhcmFtZXRlcikKICAgICAgICAgfHwgc29ydGVkU3RhdGlzdGljcy5iaW5kVGV4 dCgyLCAiJSIpICE9IFNRTElURV9PSykgewogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihOZXR3 b3JrLCAiUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6OmFnZ3JlZ2F0ZWRUaGly ZFBhcnR5RGF0YSwgZXJyb3IgbWVzc2FnZTogJSIgUFVCTElDX0xPR19TVFJJTkcsIG1fZGF0YWJh c2UubGFzdEVycm9yTXNnKCkpOwogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3Rv cmUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0 b3JlLm1tCmluZGV4IGVkMmU1ZWY2ODIxNjRhZTVkNTJjNGEzYmZjM2QyYzhkNWQ1ODc2M2EuLjg0 ZGMyYzg4ZmQ3Nzk5OWQ1MTA3NjNjNjc5ZmIzNDdkM2NhM2I1NTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpA QCAtNTc1LDYgKzU3NSwxNyBAQCAtICh2b2lkKV9wcm9jZXNzU3RhdGlzdGljc0FuZERhdGFSZWNv cmRzOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgogI2VuZGlmCiB9CiAKKy0gKHZv aWQpX3NldFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6KEJPT0wpZW5hYmxlZCBvbmx5T25T aXRlc1dpdGhvdXRVc2VySW50ZXJhY3Rpb246KEJPT0wpb25seU9uU2l0ZXNXaXRob3V0VXNlcklu dGVyYWN0aW9uIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFu ZGxlcgoreworI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCisgICAgX3dlYnNp dGVEYXRhU3RvcmUtPnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NTaG91bGRCbG9ja1RoaXJkUGFy dHlDb29raWVzRm9yVGVzdGluZyhlbmFibGVkLCBvbmx5T25TaXRlc1dpdGhvdXRVc2VySW50ZXJh Y3Rpb24sIFtjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFuZGxl cildKCkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcigpOworICAgIH0pOworI2Vsc2UKKyAg ICBjb21wbGV0aW9uSGFuZGxlcigpOworI2VuZGlmCit9CisKIC0gKGJvb2wpX2hhc1JlZ2lzdGVy ZWRTZXJ2aWNlV29ya2VyCiB7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVBy aXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRh U3RvcmVQcml2YXRlLmgKaW5kZXggZWRkYmYzMDA5MDJhODYyMjIyM2Y2MGM2OTViMjVhMWM0OTMz MjIyNC4uZWRlNzU4ZjA0MDE0MmY0NWFjYjdlNWRkYjIxY2U4Mzc4MGRhYjNmYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZVBy aXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl RGF0YVN0b3JlUHJpdmF0ZS5oCkBAIC03Niw2ICs3Niw3IEBAIHR5cGVkZWYgTlNfT1BUSU9OUyhO U1VJbnRlZ2VyLCBfV0tXZWJzaXRlRGF0YVN0b3JlRmV0Y2hPcHRpb25zKSB7CiAtICh2b2lkKV9j bGVhclByZXZhbGVudERvbWFpbjooTlNVUkwgKilkb21haW4gY29tcGxldGlvbkhhbmRsZXI6KHZv aWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tf TUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9jbGVhclJlc291cmNlTG9hZFN0 YXRpc3RpY3M6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFC TEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9pc1JlZ2lz dGVyZWRBc1N1YnJlc291cmNlVW5kZXJGaXJzdFBhcnR5OihOU1VSTCAqKWZpcnN0UGFydHlVUkwg dGhpcmRQYXJ0eTooTlNVUkwgKil0aGlyZFBhcnR5VVJMIGNvbXBsZXRpb25IYW5kbGVyOih2b2lk ICheKShCT09MKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01B Q19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworLSAodm9pZClfc2V0VGhpcmRQYXJ0eUNvb2tpZUJs b2NraW5nTW9kZTooQk9PTCllbmFibGVkIG9ubHlPblNpdGVzV2l0aG91dFVzZXJJbnRlcmFjdGlv bjooQk9PTClvbmx5T25TaXRlc1dpdGhvdXRVc2VySW50ZXJhY3Rpb24gY29tcGxldGlvbkhhbmRs ZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVyIFdLX0FQSV9BVkFJTEFCTEUobWFj b3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9wcm9jZXNzU3RhdGlz dGljc0FuZERhdGFSZWNvcmRzOih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlciBXS19B UElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEzLjApKTsKIC0gKHZvaWQpX2FwcEJvdW5k RG9tYWluczoodm9pZCAoXikoTlNBcnJheTxOU1N0cmluZyAqPiAqKSljb21wbGV0aW9uSGFuZGxl ciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwog CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2Ni Yzc1NTk4OGFiODg4ZTU5Y2Q2ZGI4ZjMxMTFlYjg0YmE0MTY0Mi4uNTc1OTE1ZDFkODgyOTRjNTU3 ODQwNzFjZWMyMDQ5NzljMTU2NjMyZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAzLTEyICBLYXRlIENoZW5l eSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlIGxvYWQg c3RhdGlzdGljcyBkYXRhIHN1bW1hcnkgc2hvdWxkIHJldHVybiBhbGwgdGhpcmQgcGFydHkgZGF0 YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MDAw CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MDM0ODMwNj4KKworICAgICAgICBSZXZpZXdlZCBi eSBKb2huIFdpbGFuZGVyLgorCisgICAgICAgIE1hcmtlZCBvbmx5IDIgb2YgMyBkb21haW5zIHBy ZXZhbGVudCBpbiBkYXRhIHN1bW1hcnkgdGVzdHMgdG8gZW5zdXJlCisgICAgICAgIHRoZSBjYWxs IHJldHVybnMgYWxsIHRoaXJkIHBhcnRpZXMsIG5vdCBqdXN0IHByZXZhbGVudCBvbmVzLgorICAg ICAgICBBZGRlZCBhIG1vcmUgYWdncmVzc2l2ZSBjaGVjayBmb3IgdGhlIHNpemUgb2YgdGhlIGFy cmF5IGF0IHRoZQorICAgICAgICBiZWdpbm5pbmcgb2YgdGhlIHRlc3QgdG8gZW5zdXJlIHRoZSBh cnJheSBpcyBzdGlsbCByZXR1cm5pbmcgMyB2YWx1ZXMuIAorICAgICAgICBBbHNvIHJlbW92ZWQg dGhlIEFTU0VSVCBzdGF0ZW1lbnRzIGFzIHRoZXkgc2VlbSB0byBjYXVzZSB0aW1lb3V0cyAobm90 CisgICAgICAgIGNsZWFyIGNyYXNoZXMpIHdoZW4gdGhleSBhcmUgbm90IHRydWUsIHdoaWNoIGlz IGhhcmQgdG8gZGVidWcuCisgICAgICAgIElmIHRoZXNlIHZhbHVlcyBhcmUgbmlsLCB0aGUgdGVz dCB3aWxsIGZhaWwgaW4gdGhlIEVYUEVDVF9XS19TVFJFUQorICAgICAgICBjaGVja3MsIHdlIGRv bid0IG5lZWQgQVNTRVJUIHN0YXRlbWVudHMuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW06CisgICAgICAgIChURVNU KToKKwogMjAyMC0wMy0xMiAgTWF0dCBMZXdpcyAgPGpsZXdpczNAYXBwbGUuY29tPgogCiAgICAg ICAgIE1ha2UgZmxhdHBhY2sgaW1wb3J0IGZvciBydW4td2Via2l0LXRlc3RzIG9ubHkgaGFwcGVu IG9uIGxpbnV4IHN5c3RlbXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5tbQppbmRleCAwODM2 MGJlOTgzMGRlZDIxMTdlNmVjOTZhYzg5NGI2MDhhOTUxZjliLi43NzM3YjRhNzMwNGI3OWI3NzBj NGRhYWViZWQwOWE4MGExZmFhMjdmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLm1tCkBA IC05ODIsMTEgKzk4MiwxNiBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSkKICAgICB9XTsKIAogICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZUZsYWcpOwotCi0gICAgLy8gc2V0IHRoaXJkIHBhcnRpZXMgdG8g YmUgcHJldmFsZW50Ci0gICAgW2RhdGFTdG9yZSBfc2V0UHJldmFsZW50RG9tYWluOltOU1VSTCBV UkxXaXRoU3RyaW5nOkAiaHR0cDovL2V2aWwxLmNvbSJdIGNvbXBsZXRpb25IYW5kbGVyOiBeKHZv aWQpIHsKKyAgICAKKyAgICBkb25lRmxhZyA9IGZhbHNlOworICAgIFtkYXRhU3RvcmUgX3NldFRo aXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6dHJ1ZSBvbmx5T25TaXRlc1dpdGhvdXRVc2VySW50 ZXJhY3Rpb246ZmFsc2UgY29tcGxldGlvbkhhbmRsZXI6IF4odm9pZCkgewogICAgICAgICBkb25l RmxhZyA9IHRydWU7CiAgICAgfV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRv bmVGbGFnKTsKKworICAgIC8vIFNldCB0d28gdGhpcmQgcGFydGllcyB0byBiZSBwcmV2YWxlbnQs IGxlYXZlIGV2aWwxLmNvbSBhcyBub24tcHJldmFsZW50IHRvIGVuc3VyZQorICAgIC8vIHRoaXMg Y2FsbCByZXR1cm5zIGFsbCB0aGlyZCBwYXJ0aWVzLgogICAgIGRvbmVGbGFnID0gZmFsc2U7CiAg ICAgW2RhdGFTdG9yZSBfc2V0UHJldmFsZW50RG9tYWluOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAi aHR0cDovL2V2aWwyLmNvbSJdIGNvbXBsZXRpb25IYW5kbGVyOiBeKHZvaWQpIHsKICAgICAgICAg ZG9uZUZsYWcgPSB0cnVlOwpAQCAtMTA5Niw2ICsxMTAxLDcgQEAgVEVTVChSZXNvdXJjZUxvYWRT dGF0aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkpCiAgICAgZG9u ZUZsYWcgPSBmYWxzZTsKICAgICBbZGF0YVN0b3JlIF9nZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YVN1bW1hcnk6XnZvaWQoTlNBcnJheTxfV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGhpcmRQ YXJ0eSAqPiAqdGhpcmRQYXJ0eURhdGEpCiAgICAgeworICAgICAgICBFWFBFQ1RfRVEoc3RhdGlj X2Nhc3Q8aW50PihbdGhpcmRQYXJ0eURhdGEgY291bnRdKSwgMyk7CiAgICAgICAgIE5TRW51bWVy YXRvciAqdGhpcmRQYXJ0eURvbWFpbnMgPSBbdGhpcmRQYXJ0eURhdGEgb2JqZWN0RW51bWVyYXRv cl07CiAKICAgICAgICAgLy8gZXZpbDMKQEAgLTExMDcsMTAgKzExMTMsNiBAQCBURVNUKFJlc291 cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSkK ICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwzRmlyc3RQ YXJ0eTIgPSBbZXZpbDNFbnVtZXJhdG9yIG5leHRPYmplY3RdOwogICAgICAgICBfV0tSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRmlyc3RQYXJ0eSAqZXZpbDNGaXJzdFBhcnR5MyA9IFtldmlsM0VudW1l cmF0b3IgbmV4dE9iamVjdF07CiAKLSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDNGaXJzdFBhcnR5 MSAhPSBuaWwpOwotICAgICAgICBBU1NFUlRfVFJVRShldmlsM0ZpcnN0UGFydHkyICE9IG5pbCk7 Ci0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwzRmlyc3RQYXJ0eTMgIT0gbmlsKTsKLQogICAgICAg ICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDNGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9tYWluLCBAIndl YmtpdDIub3JnIik7CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShldmlsM0ZpcnN0UGFydHkyLmZp cnN0UGFydHlEb21haW4sIEAid2Via2l0My5vcmciKTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVR KGV2aWwzRmlyc3RQYXJ0eTMuZmlyc3RQYXJ0eURvbWFpbiwgQCJ3ZWJraXQub3JnIik7CkBAIC0x MTI3LDkgKzExMjksNiBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291cmNl TG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSkKICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlz dGljc0ZpcnN0UGFydHkgKmV2aWwxRmlyc3RQYXJ0eTE9IFtldmlsMUVudW1lcmF0b3IgbmV4dE9i amVjdF07CiAgICAgICAgIF9XS1Jlc291cmNlTG9hZFN0YXRpc3RpY3NGaXJzdFBhcnR5ICpldmls MUZpcnN0UGFydHkyID0gW2V2aWwxRW51bWVyYXRvciBuZXh0T2JqZWN0XTsKIAotICAgICAgICBB U1NFUlRfVFJVRShldmlsMUZpcnN0UGFydHkxICE9IG5pbCk7Ci0gICAgICAgIEFTU0VSVF9UUlVF KGV2aWwxRmlyc3RQYXJ0eTIgIT0gbmlsKTsKLQogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZp bDFGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9tYWluLCBAIndlYmtpdDIub3JnIik7CiAgICAgICAg IEVYUEVDVF9XS19TVFJFUShldmlsMUZpcnN0UGFydHkyLmZpcnN0UGFydHlEb21haW4sIEAid2Vi a2l0Lm9yZyIpOwogCkBAIC0xMTQzLDggKzExNDIsNiBAQCBURVNUKFJlc291cmNlTG9hZFN0YXRp c3RpY3MsIEdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSkKICAgICAgICAgTlNF bnVtZXJhdG9yICpldmlsMkVudW1lcmF0b3IgPSBbZXZpbDJUaGlyZFBhcnR5LnVuZGVyRmlyc3RQ YXJ0aWVzIG9iamVjdEVudW1lcmF0b3JdOwogICAgICAgICBfV0tSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRmlyc3RQYXJ0eSAqZXZpbDJGaXJzdFBhcnR5MSA9IFtldmlsMkVudW1lcmF0b3IgbmV4dE9i amVjdF07CiAKLSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDJGaXJzdFBhcnR5MSAhPSBuaWwpOwot CiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShldmlsMkZpcnN0UGFydHkxLmZpcnN0UGFydHlEb21h aW4sIEAid2Via2l0Lm9yZyIpOwogICAgICAgICBFWFBFQ1RfRkFMU0UoZXZpbDJGaXJzdFBhcnR5 MS50aGlyZFBhcnR5U3RvcmFnZUFjY2Vzc0dyYW50ZWQpOwogICAgICAgICBkb25lRmxhZyA9IHRy dWU7CkBAIC0xMTgwLDYgKzExNzcsMTMgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBH ZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnlEYXRhYmFzZSkKICAgICAgICAgZG9u ZUZsYWcgPSB0cnVlOwogICAgIH1dOwogCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZk b25lRmxhZyk7CisgICAgCisgICAgZG9uZUZsYWcgPSBmYWxzZTsKKyAgICBbZGF0YVN0b3JlIF9z ZXRUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOnRydWUgb25seU9uU2l0ZXNXaXRob3V0VXNl ckludGVyYWN0aW9uOmZhbHNlIGNvbXBsZXRpb25IYW5kbGVyOiBeKHZvaWQpIHsKKyAgICAgICAg ZG9uZUZsYWcgPSB0cnVlOworICAgIH1dOworCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lRmxhZyk7CiAKICAgICBkb25lRmxhZyA9IGZhbHNlOwpAQCAtMTE5NiwxNCArMTIwMCw4 IEBAIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgR2V0UmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RhdGFTdW1tYXJ5RGF0YWJhc2UpCiAKICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRv bmVGbGFnKTsKIAotICAgIC8vIFRlYWNoIElUUCBhYm91dCBiYWQgb3JpZ2lucy4KLSAgICBkb25l RmxhZyA9IGZhbHNlOwotICAgIFtkYXRhU3RvcmUgX3NldFByZXZhbGVudERvbWFpbjpbTlNVUkwg VVJMV2l0aFN0cmluZzpAImh0dHA6Ly9ldmlsMS5jb20iXSBjb21wbGV0aW9uSGFuZGxlcjogXih2 b2lkKSB7Ci0gICAgICAgIGRvbmVGbGFnID0gdHJ1ZTsKLSAgICB9XTsKLQotICAgIFRlc3RXZWJL aXRBUEk6OlV0aWw6OnJ1bigmZG9uZUZsYWcpOwotCisgICAgLy8gU2V0IHR3byB0aGlyZCBwYXJ0 aWVzIHRvIGJlIHByZXZhbGVudCwgbGVhdmUgZXZpbDEuY29tIGFzIG5vbi1wcmV2YWxlbnQgdG8g ZW5zdXJlCisgICAgLy8gdGhpcyBjYWxsIHJldHVybnMgYWxsIHRoaXJkIHBhcnRpZXMuCiAgICAg ZG9uZUZsYWcgPSBmYWxzZTsKICAgICBbZGF0YVN0b3JlIF9zZXRQcmV2YWxlbnREb21haW46W05T VVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vZXZpbDIuY29tIl0gY29tcGxldGlvbkhhbmRsZXI6 IF4odm9pZCkgewogICAgICAgICBkb25lRmxhZyA9IHRydWU7CkBAIC0xMzE2LDYgKzEzMTQsNyBA QCBURVNUKFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NE YXRhU3VtbWFyeURhdGFiYXNlKQogICAgIGRvbmVGbGFnID0gZmFsc2U7CiAgICAgW2RhdGFTdG9y ZSBfZ2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5Ol52b2lkKE5TQXJyYXk8X1dL UmVzb3VyY2VMb2FkU3RhdGlzdGljc1RoaXJkUGFydHkgKj4gKnRoaXJkUGFydHlEYXRhKQogICAg IHsKKyAgICAgICAgRVhQRUNUX0VRKHN0YXRpY19jYXN0PGludD4oW3RoaXJkUGFydHlEYXRhIGNv dW50XSksIDMpOwogICAgICAgICBOU0VudW1lcmF0b3IgKnRoaXJkUGFydHlEb21haW5zID0gW3Ro aXJkUGFydHlEYXRhIG9iamVjdEVudW1lcmF0b3JdOwogCiAgICAgICAgIC8vIGV2aWwzCkBAIC0x MzI3LDEwICsxMzI2LDYgQEAgVEVTVChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnlEYXRhYmFzZSkKICAgICAgICAgX1dLUmVzb3VyY2VM b2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwzRmlyc3RQYXJ0eTIgPSBbZXZpbDNFbnVtZXJh dG9yIG5leHRPYmplY3RdOwogICAgICAgICBfV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRmlyc3RQ YXJ0eSAqZXZpbDNGaXJzdFBhcnR5MyA9IFtldmlsM0VudW1lcmF0b3IgbmV4dE9iamVjdF07CiAK LSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDNGaXJzdFBhcnR5MSAhPSBuaWwpOwotICAgICAgICBB U1NFUlRfVFJVRShldmlsM0ZpcnN0UGFydHkyICE9IG5pbCk7Ci0gICAgICAgIEFTU0VSVF9UUlVF KGV2aWwzRmlyc3RQYXJ0eTMgIT0gbmlsKTsKLQogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZp bDNGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9tYWluLCBAIndlYmtpdDIub3JnIik7CiAgICAgICAg IEVYUEVDVF9XS19TVFJFUShldmlsM0ZpcnN0UGFydHkyLmZpcnN0UGFydHlEb21haW4sIEAid2Vi a2l0My5vcmciKTsKICAgICAgICAgRVhQRUNUX1dLX1NUUkVRKGV2aWwzRmlyc3RQYXJ0eTMuZmly c3RQYXJ0eURvbWFpbiwgQCJ3ZWJraXQub3JnIik7CkBAIC0xMzY2LDkgKzEzNjEsNiBAQCBURVNU KFJlc291cmNlTG9hZFN0YXRpc3RpY3MsIEdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3Vt bWFyeURhdGFiYXNlKQogICAgICAgICBfV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRmlyc3RQYXJ0 eSAqZXZpbDFGaXJzdFBhcnR5MT0gW2V2aWwxRW51bWVyYXRvciBuZXh0T2JqZWN0XTsKICAgICAg ICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc0ZpcnN0UGFydHkgKmV2aWwxRmlyc3RQYXJ0eTIg PSBbZXZpbDFFbnVtZXJhdG9yIG5leHRPYmplY3RdOwogCi0gICAgICAgIEFTU0VSVF9UUlVFKGV2 aWwxRmlyc3RQYXJ0eTEgIT0gbmlsKTsKLSAgICAgICAgQVNTRVJUX1RSVUUoZXZpbDFGaXJzdFBh cnR5MiAhPSBuaWwpOwotCiAgICAgICAgIEVYUEVDVF9XS19TVFJFUShldmlsMUZpcnN0UGFydHkx LmZpcnN0UGFydHlEb21haW4sIEAid2Via2l0Mi5vcmciKTsKICAgICAgICAgRVhQRUNUX1dLX1NU UkVRKGV2aWwxRmlyc3RQYXJ0eTIuZmlyc3RQYXJ0eURvbWFpbiwgQCJ3ZWJraXQub3JnIik7CiAK QEAgLTEzOTUsOCArMTM4Nyw2IEBAIFRFU1QoUmVzb3VyY2VMb2FkU3RhdGlzdGljcywgR2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5RGF0YWJhc2UpCiAgICAgICAgIE5TRW51bWVy YXRvciAqZXZpbDJFbnVtZXJhdG9yID0gW2V2aWwyVGhpcmRQYXJ0eS51bmRlckZpcnN0UGFydGll cyBvYmplY3RFbnVtZXJhdG9yXTsKICAgICAgICAgX1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Zp cnN0UGFydHkgKmV2aWwyRmlyc3RQYXJ0eTEgPSBbZXZpbDJFbnVtZXJhdG9yIG5leHRPYmplY3Rd OwogCi0gICAgICAgIEFTU0VSVF9UUlVFKGV2aWwyRmlyc3RQYXJ0eTEgIT0gbmlsKTsKLQogICAg ICAgICBFWFBFQ1RfV0tfU1RSRVEoZXZpbDJGaXJzdFBhcnR5MS5maXJzdFBhcnR5RG9tYWluLCBA IndlYmtpdC5vcmciKTsKICAgICAgICAgRVhQRUNUX0ZBTFNFKGV2aWwyRmlyc3RQYXJ0eTEudGhp cmRQYXJ0eVN0b3JhZ2VBY2Nlc3NHcmFudGVkKTsKIAo=