166843 2017-01-09 08:38:36 -0800 Merge OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options 2017-01-09 10:28:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=165569 P2 Normal --- 1 youennf youennf achristensen beidson cdumez commit-queue dbates japhet joepeck oldest_to_newest 1264997 0 youennf 2017-01-09 08:38:36 -0800 OpaqueResponseBodyPolicy and ResponseFilteringPolicy ThreadableLoader options are used one with the other, so let's merge them. 1265000 1 298362 youennf 2017-01-09 08:45:09 -0800 Created attachment 298362 Patch 1265004 2 youennf 2017-01-09 08:49:44 -0800 (In reply to comment #1) > Created attachment 298362 [details] > Patch In the future, we probably will need to revisit opaque response handling. Service worker might need to keep the internal response while only exposing the filtered response. See https://fetch.spec.whatwg.org/#concept-filtered-response. 1265048 3 298362 commit-queue 2017-01-09 10:28:00 -0800 Comment on attachment 298362 Patch Clearing flags on attachment: 298362 Committed r210514: <http://trac.webkit.org/changeset/210514> 1265049 4 commit-queue 2017-01-09 10:28:04 -0800 All reviewed patches have been landed. Closing bug. 298362 2017-01-09 08:45:09 -0800 2017-01-09 10:28:00 -0800 Patch bug-166843-20170109084336.patch text/plain 10260 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTNlOTM3YTE1YzM1ZmM0 NDhlZmE5MDczMWY2ZGYxZWZjOTY4ZDg3Ny4uMjdkNDQ3ZmNjNzc5ODMwNDE5ZjJlYzhkMmU2NGEy NGIxM2IwNGNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE3LTAxLTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgTWVyZ2luZyBUaHJlYWRh YmxlTG9hZGVyIHJlZHVuZGFudCBvcHRpb25zIG9uIGZpbHRlcmluZyByZXNwb25zZXMKKworICAg ICAgICBNZXJnZSBPcGFxdWVSZXNwb25zZUJvZHlQb2xpY3kgYW5kIFJlc3BvbnNlRmlsdGVyaW5n UG9saWN5IFRocmVhZGFibGVMb2FkZXIgb3B0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2ODQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAg ICAgICBSZW1vdmluZyBPcGFxdWVSZXNwb25zZUJvZHlQb2xpY3kgb3B0aW9uLgorICAgICAgICBX aGVuIFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5IGlzIHNldCB0byBFbmFibGUsIHRoZSBib2R5IGlz IGZpbHRlcmVkIG91dCBpbiBEb2N1bWVudFRocmVhZGFibGVMb2FkZXIuCisKKyAgICAgICAgKiBN b2R1bGVzL2ZldGNoL0ZldGNoTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZldGNoTG9h ZGVyOjpzdGFydCk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6IEltcGxlbWVudGluZyBib2R5IGZpbHRlcmluZyBiYXNlZCBvbiBSZXNwb25z ZUZpbHRlcmluZ1BvbGljeSBvcHRpb24uCisgICAgICAgICogbG9hZGVyL1RocmVhZGFibGVMb2Fk ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRocmVh ZGFibGVMb2FkZXJPcHRpb25zKToKKyAgICAgICAgKiBsb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5o OgorICAgICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyk6CisgICAgICAg ICogd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29y a2VyU2NyaXB0TG9hZGVyOjpsb2FkU3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJDb3JlOjpX b3JrZXJTY3JpcHRMb2FkZXI6OmxvYWRBc3luY2hyb25vdXNseSk6CisgICAgICAgICogeG1sL1hN TEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjcmVh dGVSZXF1ZXN0KToKKwogMjAxNy0wMS0wNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFRleHQgaGlnaGxpZ2h0IGNhdXNlcyBZb29uIEdvdGhpYyB3ZWJmb250IHRv IHJlZmxvdy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZmV0Y2gvRmV0Y2hM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9mZXRjaC9GZXRjaExvYWRlci5jcHAK aW5kZXggMTExZWU5ODcwNWIxNTBkMTkxYjFlOGRiMjBmZTU4MGI4MTgyNDA3OS4uNmUyZmQ1Yzgx OTNkM2M0OWE3Zjg4ZTQ5ZDE0M2E2MzJlNmRiNDBlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9mZXRjaC9GZXRjaExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9mZXRjaC9GZXRjaExvYWRlci5jcHAKQEAgLTc3LDcgKzc3LDcgQEAgdm9pZCBGZXRjaExv YWRlcjo6c3RhcnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmV0Y2hS ZXF1ZXN0JiByZXEKICAgICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyBvcHRpb25zKHJlcXVlc3Qu ZmV0Y2hPcHRpb25zKCksIENvbnNpZGVyUHJlZmxpZ2h0LAogICAgICAgICBjb250ZXh0LnNob3Vs ZEJ5cGFzc01haW5Xb3JsZENvbnRlbnRTZWN1cml0eVBvbGljeSgpID8gQ29udGVudFNlY3VyaXR5 UG9saWN5RW5mb3JjZW1lbnQ6OkRvTm90RW5mb3JjZSA6IENvbnRlbnRTZWN1cml0eVBvbGljeUVu Zm9yY2VtZW50OjpFbmZvcmNlQ29ubmVjdFNyY0RpcmVjdGl2ZSwKICAgICAgICAgU3RyaW5nKGNh Y2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5mZXRjaCksCi0gICAgICAgIE9wYXF1ZVJl c3BvbnNlQm9keVBvbGljeTo6RG9Ob3RSZWNlaXZlLCBSZXNwb25zZUZpbHRlcmluZ1BvbGljeTo6 RW5hYmxlKTsKKyAgICAgICAgUmVzcG9uc2VGaWx0ZXJpbmdQb2xpY3k6OkVuYWJsZSk7CiAgICAg b3B0aW9ucy5zZW5kTG9hZENhbGxiYWNrcyA9IFNlbmRDYWxsYmFja3M7CiAgICAgb3B0aW9ucy5k YXRhQnVmZmVyaW5nUG9saWN5ID0gRG9Ob3RCdWZmZXJEYXRhOwogICAgIG9wdGlvbnMuc2FtZU9y aWdpbkRhdGFVUkxGbGFnID0gU2FtZU9yaWdpbkRhdGFVUkxGbGFnOjpTZXQ7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IDUy MDFhNzA5ZjljMzRmNTFkYjQxNjNkY2VmZGQzY2MxYWRlN2FhNjcuLmIxOTM3MzM0MTNmZTU4NDA4 NGYzYTQ0MDI2YzQ5NzExOGI3OTI0ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC0yODEsMTMgKzI4MSwxOCBAQCB2b2lk IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6cmVzcG9uc2VSZWNlaXZlZChDYWNoZWRSZXNvdXJj ZSYgcmVzb3VyY2UsIGNvbnN0CiB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UsIFJlc291cmNlUmVzcG9uc2U6OlRhaW50aW5nIHRhaW50aW5nKQogewog ICAgIEFTU0VSVChtX2NsaWVudCk7CisgICAgQVNTRVJUKHJlc3BvbnNlLnR5cGUoKSAhPSBSZXNv dXJjZVJlc3BvbnNlOjpUeXBlOjpFcnJvcik7CiAKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmRpZFJlY2VpdmVUaHJlYWRhYmxlTG9hZGVyUmVzcG9uc2UoKnRoaXMsIGlkZW50aWZpZXIp OwogCi0gICAgQVNTRVJUKHJlc3BvbnNlLnR5cGUoKSAhPSBSZXNvdXJjZVJlc3BvbnNlOjpUeXBl OjpFcnJvcik7CisgICAgaWYgKG9wdGlvbnMoKS5maWx0ZXJpbmdQb2xpY3kgPT0gUmVzcG9uc2VG aWx0ZXJpbmdQb2xpY3k6OkRpc2FibGUpIHsKKyAgICAgICAgbV9jbGllbnQtPmRpZFJlY2VpdmVS ZXNwb25zZShpZGVudGlmaWVyLCByZXNwb25zZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK ICAgICBpZiAocmVzcG9uc2UudHlwZSgpID09IFJlc291cmNlUmVzcG9uc2U6OlR5cGU6OkRlZmF1 bHQpIHsKLSAgICAgICAgbV9jbGllbnQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBv cHRpb25zKCkuZmlsdGVyaW5nUG9saWN5ID09IFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5OjpFbmFi bGUgPyBSZXNvdXJjZVJlc3BvbnNlOjpmaWx0ZXJSZXNwb25zZShyZXNwb25zZSwgdGFpbnRpbmcp IDogcmVzcG9uc2UpOwotICAgICAgICBpZiAodGFpbnRpbmcgPT0gUmVzb3VyY2VSZXNwb25zZTo6 VGFpbnRpbmc6Ok9wYXF1ZSAmJiBvcHRpb25zKCkub3BhcXVlUmVzcG9uc2UgPT0gT3BhcXVlUmVz cG9uc2VCb2R5UG9saWN5OjpEb05vdFJlY2VpdmUpIHsKKyAgICAgICAgbV9jbGllbnQtPmRpZFJl Y2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCBSZXNvdXJjZVJlc3BvbnNlOjpmaWx0ZXJSZXNwb25z ZShyZXNwb25zZSwgdGFpbnRpbmcpKTsKKyAgICAgICAgaWYgKHRhaW50aW5nID09IFJlc291cmNl UmVzcG9uc2U6OlRhaW50aW5nOjpPcGFxdWUpIHsKICAgICAgICAgICAgIGNsZWFyUmVzb3VyY2Uo KTsKICAgICAgICAgICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgICAgICAgICBtX2NsaWVudC0+ ZGlkRmluaXNoTG9hZGluZyhpZGVudGlmaWVyLCAwLjApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1RocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IGE4ZDFmM2NjNjVmM2FkNWFjZjBlYzUyMmQ5ZmM4 OTZkYmNiMzE1ZDcuLjI4Yjg1MDQ5NDI5YjlkZWFmODQ2MWY3ZmFmN2JiNWFjMTI2NDE2MTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5jcHAKQEAgLTUyLDEyICs1 MiwxMSBAQCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9uczo6flRocmVhZGFibGVMb2FkZXJPcHRpb25z KCkKIHsKIH0KIAotVGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRocmVhZGFibGVMb2FkZXJPcHRp b25zKGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgYmFzZU9wdGlvbnMsIFByZWZsaWdodFBv bGljeSBwcmVmbGlnaHRQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50IGNv bnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBTdHJpbmcmJiBpbml0aWF0b3IsIE9wYXF1 ZVJlc3BvbnNlQm9keVBvbGljeSBvcGFxdWVSZXNwb25zZSwgUmVzcG9uc2VGaWx0ZXJpbmdQb2xp Y3kgZmlsdGVyaW5nUG9saWN5KQorVGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRocmVhZGFibGVM b2FkZXJPcHRpb25zKGNvbnN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyYgYmFzZU9wdGlvbnMsIFBy ZWZsaWdodFBvbGljeSBwcmVmbGlnaHRQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9y Y2VtZW50IGNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBTdHJpbmcmJiBpbml0aWF0 b3IsIFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5IGZpbHRlcmluZ1BvbGljeSkKICAgICA6IFJlc291 cmNlTG9hZGVyT3B0aW9ucyhiYXNlT3B0aW9ucykKICAgICAsIHByZWZsaWdodFBvbGljeShwcmVm bGlnaHRQb2xpY3kpCiAgICAgLCBjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudChjb250 ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudCkKICAgICAsIGluaXRpYXRvcihXVEZNb3ZlKGlu aXRpYXRvcikpCi0gICAgLCBvcGFxdWVSZXNwb25zZShvcGFxdWVSZXNwb25zZSkKICAgICAsIGZp bHRlcmluZ1BvbGljeShmaWx0ZXJpbmdQb2xpY3kpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L1RocmVhZGFibGVMb2FkZXIuaAppbmRleCAzMmEzNzM5ZWEzYzZjYzU2NzNjN2EzNTgwNTU4YmI0 ZWE5OWE5YWM5Li5kN2IzMWQyZjFkMDFiYzE5NDkzOGFkODhlNGJlYjg4OTEzNjkyNTgxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmgKQEAgLTU3LDExICs1Nyw2IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgRW5mb3JjZVNjcmlwdFNyY0RpcmVjdGl2ZSwK ICAgICB9OwogCi0gICAgZW51bSBjbGFzcyBPcGFxdWVSZXNwb25zZUJvZHlQb2xpY3kgewotICAg ICAgICBSZWNlaXZlLAotICAgICAgICBEb05vdFJlY2VpdmUKLSAgICB9OwotCiAgICAgZW51bSBj bGFzcyBSZXNwb25zZUZpbHRlcmluZ1BvbGljeSB7CiAgICAgICAgIEVuYWJsZSwKICAgICAgICAg RGlzYWJsZSwKQEAgLTY5LDE0ICs2NCwxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBz dHJ1Y3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMgOiBSZXNvdXJjZUxvYWRlck9wdGlvbnMgewog ICAgICAgICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucygpOwotICAgICAgICBUaHJlYWRhYmxlTG9h ZGVyT3B0aW9ucyhjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmLCBQcmVmbGlnaHRQb2xpY3ks IENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBTdHJpbmcmJiBpbml0aWF0b3IsIE9w YXF1ZVJlc3BvbnNlQm9keVBvbGljeSwgUmVzcG9uc2VGaWx0ZXJpbmdQb2xpY3kpOworICAgICAg ICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyhjb25zdCBSZXNvdXJjZUxvYWRlck9wdGlvbnMmLCBQ cmVmbGlnaHRQb2xpY3ksIENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50LCBTdHJpbmcm JiBpbml0aWF0b3IsIFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5KTsKICAgICAgICAgflRocmVhZGFi bGVMb2FkZXJPcHRpb25zKCk7CiAKICAgICAgICAgUHJlZmxpZ2h0UG9saWN5IHByZWZsaWdodFBv bGljeSB7IENvbnNpZGVyUHJlZmxpZ2h0IH07CiAgICAgICAgIENvbnRlbnRTZWN1cml0eVBvbGlj eUVuZm9yY2VtZW50IGNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50IHsgQ29udGVudFNl Y3VyaXR5UG9saWN5RW5mb3JjZW1lbnQ6OkVuZm9yY2VDb25uZWN0U3JjRGlyZWN0aXZlIH07CiAg ICAgICAgIFN0cmluZyBpbml0aWF0b3I7IC8vIFRoaXMgY2Fubm90IGJlIGFuIEF0b21pY1N0cmlu ZywgYXMgaXNvbGF0ZWRDb3B5KCkgd291bGRuJ3QgY3JlYXRlIGFuIG9iamVjdCB0aGF0J3Mgc2Fm ZSBmb3IgcGFzc2luZyB0byBhbm90aGVyIHRocmVhZC4KLSAgICAgICAgT3BhcXVlUmVzcG9uc2VC b2R5UG9saWN5IG9wYXF1ZVJlc3BvbnNlIHsgT3BhcXVlUmVzcG9uc2VCb2R5UG9saWN5OjpSZWNl aXZlIH07Ci0gICAgICAgIFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5IGZpbHRlcmluZ1BvbGljeSB7 IFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5OjpFbmFibGUgfTsKKyAgICAgICAgUmVzcG9uc2VGaWx0 ZXJpbmdQb2xpY3kgZmlsdGVyaW5nUG9saWN5IHsgUmVzcG9uc2VGaWx0ZXJpbmdQb2xpY3k6OkRp c2FibGUgfTsKICAgICB9OwogCiAgICAgLy8gVXNlZnVsIGZvciBkb2luZyBsb2FkZXIgb3BlcmF0 aW9ucyBmcm9tIGFueSB0aHJlYWQgKG5vdCB0aHJlYWRzYWZlLApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL1dvcmtlclRocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IGExNTY0ZDYxMjQxZDMy YTM1OWE3Njk1NjJhMGEzYTdlZmZkNWJmNDIuLjU2NDM5ZDc0NjM3ZDYxMzFlYjNmMzFmOTVhNGIw NjYwYTVlYmFjZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJl YWRhYmxlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvV29ya2VyVGhyZWFk YWJsZUxvYWRlci5jcHAKQEAgLTkyLDcgKzkyLDcgQEAgc3RydWN0IExvYWRlclRhc2tPcHRpb25z IHsKIH07CiAKIExvYWRlclRhc2tPcHRpb25zOjpMb2FkZXJUYXNrT3B0aW9ucyhjb25zdCBUaHJl YWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucywgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgUmVm PFNlY3VyaXR5T3JpZ2luPiYmIG9yaWdpbikKLSAgICA6IG9wdGlvbnMob3B0aW9ucywgb3B0aW9u cy5wcmVmbGlnaHRQb2xpY3ksIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1l bnQsIG9wdGlvbnMuaW5pdGlhdG9yLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zLm9wYXF1ZVJlc3Bv bnNlLCBvcHRpb25zLmZpbHRlcmluZ1BvbGljeSkKKyAgICA6IG9wdGlvbnMob3B0aW9ucywgb3B0 aW9ucy5wcmVmbGlnaHRQb2xpY3ksIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5RW5mb3Jj ZW1lbnQsIG9wdGlvbnMuaW5pdGlhdG9yLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zLmZpbHRlcmlu Z1BvbGljeSkKICAgICAsIHJlZmVycmVyKHJlZmVycmVyLmlzb2xhdGVkQ29weSgpKQogICAgICwg b3JpZ2luKFdURk1vdmUob3JpZ2luKSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dv cmtlcnMvV29ya2VyU2NyaXB0TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29y a2VyU2NyaXB0TG9hZGVyLmNwcAppbmRleCAxMzExNWJkYmEyNzc5ZmI3YjI5ZTBjMGUxY2I4N2E3 MTc3YTJhMDBhLi5iNmFhMjY3NTViNjU0ZWVhZDA2OWMwYjY0NTE4ZTc4ZmY3ZTNlOGM3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlclNjcmlwdExvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJTY3JpcHRMb2FkZXIuY3BwCkBAIC02Niw3 ICs2Niw2IEBAIHZvaWQgV29ya2VyU2NyaXB0TG9hZGVyOjpsb2FkU3luY2hyb25vdXNseShTY3Jp cHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpCiAgICAgb3B0aW9ucy5tb2RlID0gbW9k ZTsKICAgICBvcHRpb25zLnNlbmRMb2FkQ2FsbGJhY2tzID0gU2VuZENhbGxiYWNrczsKICAgICBv cHRpb25zLmNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50ID0gY29udGVudFNlY3VyaXR5 UG9saWN5RW5mb3JjZW1lbnQ7Ci0gICAgb3B0aW9ucy5maWx0ZXJpbmdQb2xpY3kgPSBSZXNwb25z ZUZpbHRlcmluZ1BvbGljeTo6RGlzYWJsZTsKIAogICAgIFdvcmtlclRocmVhZGFibGVMb2FkZXI6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoZG93bmNhc3Q8V29ya2VyR2xvYmFsU2NvcGU+KCpz Y3JpcHRFeGVjdXRpb25Db250ZXh0KSwgV1RGTW92ZSgqcmVxdWVzdCksICp0aGlzLCBvcHRpb25z KTsKIH0KQEAgLTkyLDcgKzkxLDYgQEAgdm9pZCBXb3JrZXJTY3JpcHRMb2FkZXI6OmxvYWRBc3lu Y2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXQKICAgICBvcHRp b25zLm1vZGUgPSBtb2RlOwogICAgIG9wdGlvbnMuc2VuZExvYWRDYWxsYmFja3MgPSBTZW5kQ2Fs bGJhY2tzOwogICAgIG9wdGlvbnMuY29udGVudFNlY3VyaXR5UG9saWN5RW5mb3JjZW1lbnQgPSBj b250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudDsKLSAgICBvcHRpb25zLmZpbHRlcmluZ1Bv bGljeSA9IFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5OjpEaXNhYmxlOwogCiAgICAgLy8gRHVyaW5n IGNyZWF0ZSwgY2FsbGJhY2tzIG1heSBoYXBwZW4gd2hpY2ggcmVtb3ZlIHRoZSBsYXN0IHJlZmVy ZW5jZSB0byB0aGlzIG9iamVjdC4KICAgICBSZWY8V29ya2VyU2NyaXB0TG9hZGVyPiBwcm90ZWN0 ZWRUaGlzKCp0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx dWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IGZl ZjYxNmI2ZDU0ZjZlMDAxMjY5MjhmMDRjMTdhMDExOTM5ZmE4YTMuLjU1ZGJmNGVlZWE5ZDU4YWVh OTY4NjRjMmNlZmZhMzY0Y2U4YWZkMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9Y TUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0 LmNwcApAQCAtNjY5LDYgKzY2OSw3IEBAIEV4Y2VwdGlvbk9yPHZvaWQ+IFhNTEh0dHBSZXF1ZXN0 OjpjcmVhdGVSZXF1ZXN0KCkKICAgICBvcHRpb25zLmNvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9y Y2VtZW50ID0gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zaG91bGRCeXBhc3NNYWluV29ybGRD b250ZW50U2VjdXJpdHlQb2xpY3koKSA/IENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50 OjpEb05vdEVuZm9yY2UgOiBDb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudDo6RW5mb3Jj ZUNvbm5lY3RTcmNEaXJlY3RpdmU7CiAgICAgb3B0aW9ucy5pbml0aWF0b3IgPSBjYWNoZWRSZXNv dXJjZVJlcXVlc3RJbml0aWF0b3JzKCkueG1saHR0cHJlcXVlc3Q7CiAgICAgb3B0aW9ucy5zYW1l T3JpZ2luRGF0YVVSTEZsYWcgPSBTYW1lT3JpZ2luRGF0YVVSTEZsYWc6OlNldDsKKyAgICBvcHRp b25zLmZpbHRlcmluZ1BvbGljeSA9IFJlc3BvbnNlRmlsdGVyaW5nUG9saWN5OjpFbmFibGU7CiAK ICAgICBpZiAobV90aW1lb3V0TWlsbGlzZWNvbmRzKSB7CiAgICAgICAgIGlmICghbV9hc3luYykK