160613 2016-08-05 15:34:33 -0700 revert r202466 r202546 this causes regressions in media loading with temporary redirects. 2016-08-05 18:15:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk bshafiei commit-queue eric.carlson jer.noble jonlee webkit-bug-importer oldest_to_newest 1218076 0 jeremyj-wk 2016-08-05 15:34:33 -0700 revert r202466 r202546 this causes regressions in media loading with temporary redirects. 1218085 1 jonlee 2016-08-05 15:55:14 -0700 *** Bug 160612 has been marked as a duplicate of this bug. *** 1218086 2 jonlee 2016-08-05 15:55:37 -0700 <rdar://problem/27592694> 1218113 3 285464 jeremyj-wk 2016-08-05 16:55:28 -0700 Created attachment 285464 Patch 1218153 4 285464 commit-queue 2016-08-05 18:15:23 -0700 Comment on attachment 285464 Patch Clearing flags on attachment: 285464 Committed r204210: <http://trac.webkit.org/changeset/204210> 1218154 5 commit-queue 2016-08-05 18:15:26 -0700 All reviewed patches have been landed. Closing bug. 285464 2016-08-05 16:55:28 -0700 2016-08-05 18:15:23 -0700 Patch bug-160613-20160805165401.patch text/plain 11369 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0MTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWViNjRhNWI1MDdiYTg1 MGIyNWRkZGIxZmM1Y2E5NmU1NmI3ZWE5YS4uZTgxODY5OGY1NTFkNWQyMDI2NDQ0ZWU2OTExNDA3 MjNhZjhkYmU4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA4LTA1ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICByZXZlcnQgcjIwMjQ2NiBy MjAyNTQ2IHRoaXMgY2F1c2VzIHJlZ3Jlc3Npb25zIGluIG1lZGlhIGxvYWRpbmcgd2l0aCB0ZW1w b3JhcnkgcmVkaXJlY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTYwNjEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBTa2lwcGluZyB0d28gdGVzdHMuCisKKyAgICAgICAgVGhp cyByZXZlcnRzIGEgY2hhbmdlIHRoYXQgYXR0ZW1wdGVkIHRvIGZpeCB0ZW1wb3JhcnkgcmVkaXJl Y3RzIHdpdGggbWVkaWEgbG9hZGluZy4KKyAgICAgICAgVGhlIGNoYW5nZSBpbnRyb2R1Y2VkIHBy b2JsZW1zLiBSZXZlcnRpbmcgdGhpcyB0byByZXF1aXJlIG1lZGlhIHN0YWNrIHRvIHByb3Blcmx5 CisgICAgICAgIGhhbmRsZSByZWRpcmVjdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1t OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6 aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29j b2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29j b2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lv biBpbml0V2l0aFJlc291cmNlTG9hZGVyOmRlbGVnYXRlOmRlbGVnYXRlUXVldWU6XSk6IERlbGV0 ZWQuCisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb24gdXBkYXRlSGFzU2luZ2xlU2VjdXJp dHlPcmlnaW46XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb24gZGF0 YVRhc2tXaXRoUmVxdWVzdDpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vz c2lvbiBkYXRhVGFza1dpdGhVUkw6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dlYkNvcmVOU1VS TFNlc3Npb25EYXRhVGFzayByZXNvdXJjZTpyZWNlaXZlZFJlc3BvbnNlOl0pOiBEZWxldGVkLgor ICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgcmVzb3VyY2U6cmVjZWl2ZWRS ZWRpcmVjdDpyZXF1ZXN0Ol0pOiBEZWxldGVkLgorCiAyMDE2LTA4LTA1ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMjA0MTI4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01l ZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KaW5kZXggNDk1ODk0ODhkZGMxY2E5 ZWQwNjlkYWFmNDNiMWQ3NzAyMWNiZGZkMS4uY2M0MTEzOTZjOTkzNTNlNDA3MzE5ZGJhYzk0Mzc5 NDhkZTQzYzE0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCkBAIC0yMjQ0LDE4ICsyMjQ0LDcg QEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpoYXNTaW5nbGVTZWN1 cml0eU9yaWdpbigpIGNvbnN0CiAgICAgCiAgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiByZXNvbHZl ZE9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHJlc29sdmVkVVJMKCkpKTsKICAgICBSZWY8 U2VjdXJpdHlPcmlnaW4+IHJlcXVlc3RlZE9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJv bVN0cmluZyhhc3NldFVSTCgpKSk7Ci0gICAgaWYgKCFyZXNvbHZlZE9yaWdpbi5nZXQoKS5pc1Nh bWVTY2hlbWVIb3N0UG9ydCgmcmVxdWVzdGVkT3JpZ2luLmdldCgpKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0jaWYgUExBVEZPUk0oSU9TKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID4gMTAxMTAwCi0gICAgQVZBc3NldFJlc291cmNlTG9hZGVyICpyZXNvdXJjZUxvYWRl ciA9IG1fYXZBc3NldC5nZXQoKS5yZXNvdXJjZUxvYWRlcjsKLSAgICBpZiAoU2V0dGluZ3M6Omlz QVZGb3VuZGF0aW9uTlNVUkxTZXNzaW9uRW5hYmxlZCgpICYmIFtyZXNvdXJjZUxvYWRlciByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKFVSTFNlc3Npb24pXSkgewotICAgICAgICBXZWJDb3Jl TlNVUkxTZXNzaW9uICpzZXNzaW9uID0gKFdlYkNvcmVOU1VSTFNlc3Npb24gKilyZXNvdXJjZUxv YWRlci5VUkxTZXNzaW9uOwotICAgICAgICBpZiAoW3Nlc3Npb24gcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3RvcihoYXNTaW5nbGVTZWN1cml0eU9yaWdpbildKQotICAgICAgICAgICAgcmV0dXJu IHNlc3Npb24uaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW47Ci0gICAgfQotI2VuZGlmCi0gICAgcmV0 dXJuIHRydWU7CisgICAgcmV0dXJuIHJlc29sdmVkT3JpZ2luLmdldCgpLmlzU2FtZVNjaGVtZUhv c3RQb3J0KCZyZXF1ZXN0ZWRPcmlnaW4uZ2V0KCkpOwogfQogCiBib29sIE1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKSBjb25zdApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNV UkxTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNv cmVOU1VSTFNlc3Npb24uaAppbmRleCA4YWRlNTBlNTliODE1MDNiNzU3ODYxYmEyN2YyNTc0YjI1 ZTU3NDgwLi42ZDUyZmNkYTg0NmQ1YzQ5M2QyZjVmYjg2NDM2NzFlZTM5YmY1MmZkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNl c3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNv cmVOU1VSTFNlc3Npb24uaApAQCAtNDcsNyArNDcsNiBAQCBjbGFzcyBDYWNoZWRSZXNvdXJjZVJl cXVlc3Q7CiBjbGFzcyBQbGF0Zm9ybU1lZGlhUmVzb3VyY2U7CiBjbGFzcyBQbGF0Zm9ybU1lZGlh UmVzb3VyY2VMb2FkZXI7CiBjbGFzcyBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ7 Ci1jbGFzcyBTZWN1cml0eU9yaWdpbjsKIH0KIAogZW51bSBjbGFzcyBXZWJDb3JlTlNVUkxTZXNz aW9uQ09SU0FjY2Vzc0NoZWNrUmVzdWx0cyB7CkBAIC02NiwxMSArNjUsOSBAQCBXRUJDT1JFX0VY UE9SVCBAaW50ZXJmYWNlIFdlYkNvcmVOU1VSTFNlc3Npb24gOiBOU09iamVjdCB7CiAgICAgSGFz aFNldDxSZXRhaW5QdHI8V2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrPj4gX2RhdGFUYXNrczsK ICAgICBMb2NrIF9kYXRhVGFza3NMb2NrOwogICAgIEJPT0wgX2ludmFsaWRhdGVkOwotICAgIEJP T0wgX2hhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOwogICAgIE5TVUludGVnZXIgX25leHRUYXNrSWRl bnRpZmllcjsKICAgICBPU09iamVjdFB0cjxkaXNwYXRjaF9xdWV1ZV90PiBfaW50ZXJuYWxRdWV1 ZTsKICAgICBXZWJDb3JlTlNVUkxTZXNzaW9uQ09SU0FjY2Vzc0NoZWNrUmVzdWx0cyBfY29yc1Jl c3VsdHM7Ci0gICAgUmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPiBfcmVxdWVzdGVkT3Jp Z2luOwogfQogLSAoaWQpaW5pdFdpdGhSZXNvdXJjZUxvYWRlcjooV2ViQ29yZTo6UGxhdGZvcm1N ZWRpYVJlc291cmNlTG9hZGVyJilsb2FkZXIgZGVsZWdhdGU6KGlkPE5TVVJMU2Vzc2lvblRhc2tE ZWxlZ2F0ZT4pZGVsZWdhdGUgZGVsZWdhdGVRdWV1ZTooTlNPcGVyYXRpb25RdWV1ZSopcXVldWU7 CiBAcHJvcGVydHkgKHJlYWRvbmx5LCByZXRhaW4pIE5TT3BlcmF0aW9uUXVldWUgKmRlbGVnYXRl UXVldWU7CkBAIC03OCw3ICs3NSw2IEBAIFdFQkNPUkVfRVhQT1JUIEBpbnRlcmZhY2UgV2ViQ29y ZU5TVVJMU2Vzc2lvbiA6IE5TT2JqZWN0IHsKIEBwcm9wZXJ0eSAocmVhZG9ubHksIGNvcHkpIE5T VVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb247CiBAcHJvcGVydHkgKGNvcHkp IE5TU3RyaW5nICpzZXNzaW9uRGVzY3JpcHRpb247CiBAcHJvcGVydHkgKHJlYWRvbmx5KSBCT09M IGRpZFBhc3NDT1JTQWNjZXNzQ2hlY2tzOwotQHByb3BlcnR5IChyZWFkb25seSkgQk9PTCBoYXNT aW5nbGVTZWN1cml0eU9yaWdpbjsKIC0gKHZvaWQpZmluaXNoVGFza3NBbmRJbnZhbGlkYXRlOwog LSAodm9pZClpbnZhbGlkYXRlQW5kQ2FuY2VsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0KaW5k ZXggNGM1N2MzYjY3YjBhNTg5NTViODVlZTM5ZmRjZjMzOWIyNzhiNmRiOC4uMTZlMTcxNDI1ZDI3 ODY2YjIxNGZjMDJlMGY0Nzg0M2JmYjliYzRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9uLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQpA QCAtMzAsNyArMzAsNiBAQAogCiAjaW1wb3J0ICJDYWNoZWRSZXNvdXJjZVJlcXVlc3QuaCIKICNp bXBvcnQgIlBsYXRmb3JtTWVkaWFSZXNvdXJjZUxvYWRlci5oIgotI2ltcG9ydCAiU2VjdXJpdHlP cmlnaW4uaCIKICNpbXBvcnQgIlN1YnJlc291cmNlTG9hZGVyLmgiCiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwpAQCAtNDUsNyArNDQsNiBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJTgogLSAo dm9pZCl0YXNrQ29tcGxldGVkOihXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKil0YXNrOwog LSAodm9pZClhZGREZWxlZ2F0ZU9wZXJhdGlvbjoodm9pZCAoXikodm9pZCkpb3BlcmF0aW9uOwog LSAodm9pZCl0YXNrOihXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKil0YXNrIGRpZFJlY2Vp dmVDT1JTQWNjZXNzQ2hlY2tSZXN1bHQ6KEJPT0wpcmVzdWx0OwotLSAodm9pZCl1cGRhdGVIYXNT aW5nbGVTZWN1cml0eU9yaWdpbjooU2VjdXJpdHlPcmlnaW4mKW9yaWdpbjsKIEBlbmQKIAogQGlu dGVyZmFjZSBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sgKCkKQEAgLTg1LDcgKzgzLDYgQEAg TlNfQVNTVU1FX05PTk5VTExfRU5ECiAgICAgc2VsZi5kZWxlZ2F0ZSA9IGluRGVsZWdhdGU7CiAg ICAgX3F1ZXVlID0gaW5RdWV1ZSA/IGluUXVldWUgOiBbTlNPcGVyYXRpb25RdWV1ZSBtYWluUXVl dWVdOwogICAgIF9pbnRlcm5hbFF1ZXVlID0gYWRvcHRPU09iamVjdChkaXNwYXRjaF9xdWV1ZV9j cmVhdGUoIldlYkNvcmVOU1VSTFNlc3Npb24gX2ludGVybmFsUXVldWUiLCBESVNQQVRDSF9RVUVV RV9TRVJJQUwpKTsKLSAgICBfaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4gPSBZRVM7CiAKICAgICBy ZXR1cm4gc2VsZjsKIH0KQEAgLTE1MCwyMSArMTQ3LDggQEAgTlNfQVNTVU1FX05PTk5VTExfRU5E CiAgICAgICAgIF9jb3JzUmVzdWx0cyA9IFdlYkNvcmVOU1VSTFNlc3Npb25DT1JTQWNjZXNzQ2hl Y2tSZXN1bHRzOjpQYXNzOwogfQogCi0tICh2b2lkKXVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3Jp Z2luOihTZWN1cml0eU9yaWdpbiYpb3JpZ2luCi17Ci0gICAgaWYgKCFfcmVxdWVzdGVkT3JpZ2lu KSB7Ci0gICAgICAgIF9yZXF1ZXN0ZWRPcmlnaW4gPSAmb3JpZ2luOwotICAgICAgICByZXR1cm47 Ci0gICAgfQotCi0gICAgaWYgKCFvcmlnaW4uaXNTYW1lU2NoZW1lSG9zdFBvcnQoX3JlcXVlc3Rl ZE9yaWdpbi5nZXQoKSkpCi0gICAgICAgIF9oYXNTaW5nbGVTZWN1cml0eU9yaWdpbiA9IGZhbHNl OwotfQotCiAjcHJhZ21hIG1hcmsgLSBOU1VSTFNlc3Npb24gQVBJCiBAc3ludGhlc2l6ZSBzZXNz aW9uRGVzY3JpcHRpb249X3Nlc3Npb25EZXNjcmlwdGlvbjsKLUBzeW50aGVzaXplIGhhc1Npbmds ZVNlY3VyaXR5T3JpZ2luPV9oYXNTaW5nbGVTZWN1cml0eU9yaWdpbjsKLQogQGR5bmFtaWMgZGVs ZWdhdGU7CiAtIChfX251bGxhYmxlIGlkPE5TVVJMU2Vzc2lvbkRlbGVnYXRlPilkZWxlZ2F0ZQog ewpAQCAtMjc1LDggKzI1OSw2IEBAIE5TX0FTU1VNRV9OT05OVUxMX0VORAogICAgIGlmIChfaW52 YWxpZGF0ZWQpCiAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICBbc2VsZiB1cGRhdGVIYXNTaW5n bGVTZWN1cml0eU9yaWdpbjpTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFtyZXF1ZXN0IFVSTF0pXTsK LQogICAgIFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayAqdGFzayA9IFtbV2ViQ29yZU5TVVJM U2Vzc2lvbkRhdGFUYXNrIGFsbG9jXSBpbml0V2l0aFNlc3Npb246c2VsZiBpZGVudGlmaWVyOl9u ZXh0VGFza0lkZW50aWZpZXIrKyByZXF1ZXN0OnJlcXVlc3RdOwogICAgIHsKICAgICAgICAgTG9j a2VyPExvY2s+IGxvY2tlcihfZGF0YVRhc2tzTG9jayk7CkBAIC0yOTAsOCArMjcyLDYgQEAgTlNf QVNTVU1FX05PTk5VTExfRU5ECiAgICAgaWYgKF9pbnZhbGlkYXRlZCkKICAgICAgICAgcmV0dXJu IG5pbDsKIAotICAgIFtzZWxmIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOlNlY3VyaXR5 T3JpZ2luOjpjcmVhdGUodXJsKV07Ci0KICAgICBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2sg KnRhc2sgPSBbW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayBhbGxvY10gaW5pdFdpdGhTZXNz aW9uOnNlbGYgaWRlbnRpZmllcjpfbmV4dFRhc2tJZGVudGlmaWVyKysgVVJMOnVybF07CiAgICAg ewogICAgICAgICBMb2NrZXI8TG9jaz4gbG9ja2VyKF9kYXRhVGFza3NMb2NrKTsKQEAgLTU3NSwy MiArNTU1LDkgQEAgdm9pZCBXZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRG aW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmIHJlc28KICAgICBBU1NFUlRfVU5VU0VEKHJl c291cmNlLCAmcmVzb3VyY2UgPT0gX3Jlc291cmNlKTsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwogICAgIFtzZWxmLnNlc3Npb24gdGFzazpzZWxmIGRpZFJlY2VpdmVDT1JTQWNjZXNzQ2hl Y2tSZXN1bHQ6cmVzb3VyY2UuZGlkUGFzc0FjY2Vzc0NvbnRyb2xDaGVjaygpXTsKLSAgICBbc2Vs Zi5zZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luOlNlY3VyaXR5T3JpZ2luOjpj cmVhdGUocmVzcG9uc2UudXJsKCkpXTsKICAgICBzZWxmLmNvdW50T2ZCeXRlc0V4cGVjdGVkVG9S ZWNlaXZlID0gcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCk7CiAgICAgW3NlbGYgX3Nl dERlZmVyc0xvYWRpbmc6WUVTXTsKICAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gc3Ryb25n UmVzcG9uc2UgeyByZXNwb25zZS5uc1VSTFJlc3BvbnNlKCkgfTsKLQotICAgIGlmIChyZXNwb25z ZS51cmwoKSAhPSBVUkwoc2VsZi5jdXJyZW50UmVxdWVzdC5VUkwpKSB7Ci0gICAgICAgIC8vIEZJ WE1FKDxyZGFyOi8vcHJvYmxlbS8yNzAwMDM2MT4pOgotICAgICAgICAvLyBXb3JrIGFyb3VuZCBh IGJ1ZyBpbiBDb3JlTWVkaWE6IENNIHdpbGwgcHVsbCB0aGUgVVJMIG91dCBvZiB0aGUgUmVzb3Vy Y2VSZXNwb25zZQotICAgICAgICAvLyBhbmQgdXNlIHRoYXQgVVJMIGZvciBhbGwgZnV0dXJlIHJl cXVlc3RzIGZvciB0aGUgc2FtZSBwaWVjZSBvZiBtZWRpYS4gVGhpcyBicmVha3MKLSAgICAgICAg Ly8gY2VydGFpbiBmZWF0dXJlcyBvZiBDT1JTLCBhcyB3ZWxsIGFzIGJlaW5nIGFnYWluc3QgdGhl IEhUVFAgc3BlYyBpbiB0aGUgY2FzZSBvZgotICAgICAgICAvLyBub24tcGVybWFuZW50IHJlZGly ZWN0cy4KLSAgICAgICAgYXV0byByZXNwb25zZURhdGEgPSByZXNwb25zZS5jcm9zc1RocmVhZERh dGEoKTsKLSAgICAgICAgcmVzcG9uc2VEYXRhLnVybCA9IFVSTChzZWxmLmN1cnJlbnRSZXF1ZXN0 LlVSTCk7Ci0gICAgICAgIHN0cm9uZ1Jlc3BvbnNlID0gUmVzb3VyY2VSZXNwb25zZUJhc2U6OmZy b21Dcm9zc1RocmVhZERhdGEoV1RGTW92ZShyZXNwb25zZURhdGEpKS5uc1VSTFJlc3BvbnNlKCk7 Ci0gICAgfQotCiAgICAgUmV0YWluUHRyPFdlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzaz4gc3Ry b25nU2VsZiB7IHNlbGYgfTsKICAgICBbc2VsZi5zZXNzaW9uIGFkZERlbGVnYXRlT3BlcmF0aW9u OltzdHJvbmdTZWxmLCBzdHJvbmdSZXNwb25zZV0gewogICAgICAgICBzdHJvbmdTZWxmLT5fcmVz cG9uc2UgPSBzdHJvbmdSZXNwb25zZS5nZXQoKTsKQEAgLTY1NCwxNCArNjIxLDYgQEAgdm9pZCBX ZWJDb3JlTlNVUkxTZXNzaW9uRGF0YVRhc2tDbGllbnQ6OmxvYWRGaW5pc2hlZChQbGF0Zm9ybU1l ZGlhUmVzb3VyY2UmIHJlc28KICAgICAvLyBkZWxlZ2F0ZSBoYW5kbGVzIHRoZSBjYWxsYmFjayBh bmQgcmVzcG9uZHMgdmlhIGEgY29tcGxldGlvbiBoYW5kbGVyLiBJZiwgaW4KICAgICAvLyB0aGUg ZnV0dXJlLCB0aGUgUmVzb3VyY2VMb2FkZXIgZXhwb3NlcyBhIGNhbGxiYWNrLWJhc2VkIHdpbGxT ZW5kUmVzcG9uc2UKICAgICAvLyBBUEksIHRoaXMgY2FuIGJlIGltcGxlbWVudGVkLgotCi0gICAg Ly8gRklYTUUoPHJkYXI6Ly9wcm9ibGVtLzI3MDAwMzYxPik6Ci0gICAgLy8gRG8gbm90IHVwZGF0 ZSB0aGUgY3VycmVudCByZXF1ZXN0IGlmIHRoZSByZWRpcmVjdCBpcyB0ZW1wb3Jhcnk7IHVzZSB0 aGlzCi0gICAgLy8gY3VycmVudCByZXF1ZXN0IGR1cmluZyByZXNwb25zZVJlY2VpZXZlZDogdG8g d29yayBhcm91bmQgYSBDb3JlTWVkaWEgYnVnLgotICAgIGlmIChyZXNwb25zZS5odHRwU3RhdHVz Q29kZSgpICE9IDMwMiAmJiByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpICE9IDMwNykKLSAgICAg ICAgc2VsZi5jdXJyZW50UmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6cmVx dWVzdC51cmwoKV07Ci0KLSAgICBbc2VsZi5zZXNzaW9uIHVwZGF0ZUhhc1NpbmdsZVNlY3VyaXR5 T3JpZ2luOlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVxdWVzdC51cmwoKSldOwogfQogCiAtICh2 b2lkKV9yZXNvdXJjZTooUGxhdGZvcm1NZWRpYVJlc291cmNlJilyZXNvdXJjZSBsb2FkRmluaXNo ZWRXaXRoRXJyb3I6KE5TRXJyb3IgKillcnJvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJiMTg0OGY2YWQ3MzM2MzUzZWIw YjVmYzVhMzdjMDg1Y2ZlMDQyOTEuLmZhNTU2MjkyYWY3ZjEyMGQxZDk1MDlmZjkyNjFhYjZjMGUz NDM2M2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNi0wOC0wNSAgSmVyZW15IEpvbmVzICA8 amVyZW15akBhcHBsZS5jb20+CisKKyAgICAgICAgcmV2ZXJ0IHIyMDI0NjYgcjIwMjU0NiB0aGlz IGNhdXNlcyByZWdyZXNzaW9ucyBpbiBtZWRpYSBsb2FkaW5nIHdpdGggdGVtcG9yYXJ5IHJlZGly ZWN0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 MDYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl dmVydGluZyBhIGZpeCB0aGF0IGVuYWJsZWQgdHdvIHRlc3RzLiBUaGVzZSB0ZXN0cyBub3cgZmFp bCBhbmQgYXJlIHNraXBwZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0 aW9uczoKKwogMjAxNi0wOC0wNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBTaWVycmEgV0sxOiBjb21wb3NpdGluZy9tYXNrcy9jb21wb3NpdGluZy1j bGlwLXBhdGgtY2hhbmdlLW5vLXJlcGFpbnQuaHRtbCBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhmMDhlMDM1ZGE0NTVkNTFkOTI3ZTM2ZmZh YWYxZTRjMGM5YWNjMzEuLmEzMGI5MzM5NWZiOGRlZDNlYzU2OGZhNTc0Zjc2ZDBhODczN2ZlMmUg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMzg1LDYg KzEzODUsMTAgQEAgd2Via2l0Lm9yZy9iLzE1ODg4OSBtZWRpYS92aWRlby1jb250cm9scy1zaG93 LW9uLWtiLW9yLWF4LWV2ZW50Lmh0bWwgWyBQYXNzIEZhaWwKIFsgU2llcnJhKyBdIGh0dHAvdGVz dHMvc2VjdXJpdHkvYW5jaG9yLWRvd25sb2FkLWFsbG93LXNhbWVvcmlnaW4uaHRtbCBbIFNraXAg XQogWyBTaWVycmErIF0gaHR0cC90ZXN0cy9zZWN1cml0eS9hbmNob3ItZG93bmxvYWQtYWxsb3ct YmxvYi5odG1sIFsgU2tpcCBdCiAKKyMgPHJkYXI6Ly9wcm9ibGVtLzI1NzgwMDM1PiBDU1AgZG9l cyBub3QgaWdub3JlIHBhdGhzIGZvciBtZWRpYSByZWRpcmVjdHMKK1sgU2llcnJhKyBdIGh0dHAv dGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2F1ZGlvLXJlZGlyZWN0LWFsbG93 ZWQyLmh0bWwgWyBTa2lwIF0KK1sgU2llcnJhKyBdIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVu dFNlY3VyaXR5UG9saWN5L3ZpZGVvLXJlZGlyZWN0LWFsbG93ZWQyLmh0bWwgWyBTa2lwIF0KKwog IyA8cmRhcjovL3Byb2JsZW0vMjY1OTA2MjM+IExheW91dFRlc3QgaHR0cC90ZXN0cy9wcmVsb2Fk L3NpbmdsZV9kb3dubG9hZF9wcmVsb2FkX3J1bm5lci5odG1sIGZhaWxpbmcKIFsgU2llcnJhKyBd IGh0dHAvdGVzdHMvcHJlbG9hZC9zaW5nbGVfZG93bmxvYWRfcHJlbG9hZF9ydW5uZXIuaHRtbCBb IFBhc3MgVGltZW91dCBGYWlsdXJlIF0KIAo=