208550 2020-03-03 17:11:17 -0800 Requests sent to _WKResourceLoadDelegate should include HTTPBody 2020-03-06 10:26:47 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen timothy webkit-bug-importer oldest_to_newest 1625333 0 achristensen 2020-03-03 17:11:17 -0800 Requests sent to _WKResourceLoadDelegate should include HTTPBody 1625336 1 392353 achristensen 2020-03-03 17:16:02 -0800 Created attachment 392353 Patch 1625345 2 achristensen 2020-03-03 17:55:56 -0800 http://trac.webkit.org/r257816 1625346 3 webkit-bug-importer 2020-03-03 17:56:15 -0800 <rdar://problem/60021891> 1626723 4 achristensen 2020-03-06 10:13:50 -0800 This HTTPServer change made the ResourceLoadDelegate.LoadInfo API test timeout sometimes. I'm going to fix it. 1626732 5 achristensen 2020-03-06 10:26:47 -0800 http://trac.webkit.org/r258004 392353 2020-03-03 17:16:02 -0800 2020-03-03 17:40:05 -0800 Patch bug-208550-20200303171602.patch text/plain 14943 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NzgwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTAzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVxdWVzdHMg c2VudCB0byBfV0tSZXNvdXJjZUxvYWREZWxlZ2F0ZSBzaG91bGQgaW5jbHVkZSBIVFRQQm9keQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NTUwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBi eSBBUEkgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmg6Cisg ICAgICAgIEV4cG9zZSBsZW5ndGhJbkJ5dGVzIHRvIGJlIHVzZWQgaW4gYSBjaGVjayBjYXBwaW5n IHRoZSBzaXplIG9mIGluY2x1ZGVkIGJvZHkgZGF0YS4KKyAgICAgICAgVGhpcyB3aWxsIHByZXZl bnQgZXh0ZXJlbWVseSBsYXJnZSBIVFRQIGJvZGllcyBmcm9tIGJlaW5nIHNlcmlhbGl6ZWQuCisK IDIwMjAtMDMtMDMgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxsYXdhQGFwcGxlLmNvbT4K IAogICAgICAgICBbQ0ddIENoYW5nZSB0aGUgVVRJIG9mIHRoZSAiV2ViUCIgaW1hZ2UgdG8gYmUg ImNvbS5nb29nbGUud2VicCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Rm9ybURhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0Zvcm1EYXRhLmgJKHJldmlzaW9uIDI1NzgwOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvRm9ybURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMjUwLDcgKzI1MCw3IEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIEZvcm1VUkxFbmNvZGVkOwogICAgIH0KIAotICAgIHVpbnQ2 NF90IGxlbmd0aEluQnl0ZXMoKSBjb25zdDsKKyAgICBXRUJDT1JFX0VYUE9SVCB1aW50NjRfdCBs ZW5ndGhJbkJ5dGVzKCkgY29uc3Q7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBVUkwgYXNCbG9iVVJM KCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTc4MDkpCisrKyBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTAz ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmVxdWVzdHMgc2VudCB0byBfV0tSZXNvdXJjZUxvYWREZWxlZ2F0ZSBzaG91bGQgaW5jbHVkZSBI VFRQQm9keQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjA4NTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TmV0d29ya0xvYWQpOgorICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktp dDo6UmVzb3VyY2VMb2FkRGVsZWdhdGU6OlJlc291cmNlTG9hZENsaWVudDo6ZGlkU2VuZFJlcXVl c3QgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXNvdXJjZUxv YWREaWRTZW5kUmVxdWVzdCk6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1By b2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkubWVzc2FnZXMuaW46CisKIDIwMjAtMDMtMDMgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtp cnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBXaW5DYWlybyBidWls ZCBmb2xsb3dpbmcgcjI1NzgwMS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDI1NzgwOSkK KysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzIzLDggKzMyMywxNSBAQCB2b2lkIE5ldHdvcmtSZXNvdXJj ZUxvYWRlcjo6c3RhcnROZXR3b3JrCiAgICAgaWYgKHJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0Js b2IoKSkKICAgICAgICAgcGFyYW1ldGVycy5ibG9iRmlsZVJlZmVyZW5jZXMgPSBuZXR3b3JrU2Vz c2lvbi0+YmxvYlJlZ2lzdHJ5KCkuZmlsZXNJbkJsb2Iob3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkp OwogCi0gICAgaWYgKG1fcGFyYW1ldGVycy5wYWdlSGFzUmVzb3VyY2VMb2FkQ2xpZW50KQotICAg ICAgICBtX2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNzKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3NQcm94eTo6UmVzb3VyY2VMb2FkRGlk U2VuZFJlcXVlc3QobV9wYXJhbWV0ZXJzLndlYlBhZ2VQcm94eUlELCByZXNvdXJjZUxvYWRJbmZv KCksIHJlcXVlc3QpLCAwKTsKKyAgICBpZiAobV9wYXJhbWV0ZXJzLnBhZ2VIYXNSZXNvdXJjZUxv YWRDbGllbnQpIHsKKyAgICAgICAgT3B0aW9uYWw8SVBDOjpGb3JtRGF0YVJlZmVyZW5jZT4gaHR0 cEJvZHk7CisgICAgICAgIGlmIChhdXRvKiBmb3JtRGF0YSA9IHJlcXVlc3QuaHR0cEJvZHkoKSkg eworICAgICAgICAgICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIG1heFNlcmlhbGl6ZWRSZXF1ZXN0 U2l6ZSA9IDEwMjQgKiAxMDI0OworICAgICAgICAgICAgaWYgKGZvcm1EYXRhLT5sZW5ndGhJbkJ5 dGVzKCkgPD0gbWF4U2VyaWFsaXplZFJlcXVlc3RTaXplKQorICAgICAgICAgICAgICAgIGh0dHBC b2R5ID0gSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSB7IGZvcm1EYXRhIH07CisgICAgICAgIH0KKyAg ICAgICAgbV9jb25uZWN0aW9uLT5uZXR3b3JrUHJvY2VzcygpLnBhcmVudFByb2Nlc3NDb25uZWN0 aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OlJlc291cmNlTG9hZERp ZFNlbmRSZXF1ZXN0KG1fcGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRCwgcmVzb3VyY2VMb2FkSW5m bygpLCByZXF1ZXN0LCBodHRwQm9keSksIDApOworICAgIH0KIAogICAgIHBhcmFtZXRlcnMucmVx dWVzdCA9IFdURk1vdmUocmVxdWVzdCk7CiAgICAgcGFyYW1ldGVycy5pc05hdmlnYXRpbmdUb0Fw cEJvdW5kRG9tYWluID0gbV9wYXJhbWV0ZXJzLmlzTmF2aWdhdGluZ1RvQXBwQm91bmREb21haW47 CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9SZXNvdXJjZUxvYWREZWxlZ2F0 ZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9SZXNvdXJj ZUxvYWREZWxlZ2F0ZS5tbQkocmV2aXNpb24gMjU3ODA5KQorKysgU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTgy LDcgKzgyLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6UmVzb3VyY2VMb2FkQwogICAg IGlmICghZGVsZWdhdGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIFtkZWxlZ2F0ZSB3ZWJWaWV3 Om1fcmVzb3VyY2VMb2FkRGVsZWdhdGUubV93ZWJWaWV3LmdldCgpLmdldCgpIHJlc291cmNlTG9h ZDp3cmFwcGVyKEFQSTo6UmVzb3VyY2VMb2FkSW5mbzo6Y3JlYXRlKFdURk1vdmUobG9hZEluZm8p KS5nZXQoKSkgZGlkU2VuZFJlcXVlc3Q6cmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6SFRU UEJvZHlVcGRhdGVQb2xpY3k6OkRvTm90VXBkYXRlSFRUUEJvZHkpXTsKKyAgICBbZGVsZWdhdGUg d2ViVmlldzptX3Jlc291cmNlTG9hZERlbGVnYXRlLm1fd2ViVmlldy5nZXQoKS5nZXQoKSByZXNv dXJjZUxvYWQ6d3JhcHBlcihBUEk6OlJlc291cmNlTG9hZEluZm86OmNyZWF0ZShXVEZNb3ZlKGxv YWRJbmZvKSkuZ2V0KCkpIGRpZFNlbmRSZXF1ZXN0OnJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNv cmU6OkhUVFBCb2R5VXBkYXRlUG9saWN5OjpVcGRhdGVIVFRQQm9keSldOwogfQogCiB2b2lkIFJl c291cmNlTG9hZERlbGVnYXRlOjpSZXNvdXJjZUxvYWRDbGllbnQ6OmRpZFBlcmZvcm1IVFRQUmVk aXJlY3Rpb24oV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZvJiYgbG9hZEluZm8sIFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmJiByZXNwb25zZSwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiYgcmVx dWVzdCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv TmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMjU3ODA5KQorKysgU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDc0LDEyICs0NzQsMTcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5 Ojpsb2dHbG9iYWxEaWFnbgogICAgICAgICBwYWdlLT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhW YWx1ZShtZXNzYWdlLCBkZXNjcmlwdGlvbiwgdmFsdWUsIHNpZ25pZmljYW50RmlndXJlcywgc2hv dWxkU2FtcGxlKTsKIH0KIAotdm9pZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXNvdXJjZUxvYWRE aWRTZW5kUmVxdWVzdChXZWJQYWdlUHJveHlJZGVudGlmaWVyIHBhZ2VJRCwgUmVzb3VyY2VMb2Fk SW5mbyYmIGxvYWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0KQordm9p ZCBOZXR3b3JrUHJvY2Vzc1Byb3h5OjpyZXNvdXJjZUxvYWREaWRTZW5kUmVxdWVzdChXZWJQYWdl UHJveHlJZGVudGlmaWVyIHBhZ2VJRCwgUmVzb3VyY2VMb2FkSW5mbyYmIGxvYWRJbmZvLCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0LCBPcHRpb25hbDxJUEM6OkZvcm1EYXRhUmVm ZXJlbmNlPiYmIGh0dHBCb2R5KQogewogICAgIGF1dG8qIHBhZ2UgPSBXZWJQcm9jZXNzUHJveHk6 OndlYlBhZ2UocGFnZUlEKTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAorICAg IGlmIChodHRwQm9keSkgeworICAgICAgICBhdXRvIGRhdGEgPSBodHRwQm9keS0+dGFrZURhdGEo KTsKKyAgICAgICAgcmVxdWVzdC5zZXRIVFRQQm9keShXVEZNb3ZlKGRhdGEpKTsKKyAgICB9CisK ICAgICBwYWdlLT5yZXNvdXJjZUxvYWREaWRTZW5kUmVxdWVzdChXVEZNb3ZlKGxvYWRJbmZvKSwg V1RGTW92ZShyZXF1ZXN0KSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05l dHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCShyZXZpc2lvbiAyNTc4MDkp CisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHku aAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsMTAgQEAKICNpbmNsdWRlICJMZWdhY3lDdXN0 b21Qcm90b2NvbE1hbmFnZXJQcm94eS5oIgogI2VuZGlmCiAKK25hbWVzcGFjZSBJUEMgeworY2xh c3MgRm9ybURhdGFSZWZlcmVuY2U7Cit9CisKIG5hbWVzcGFjZSBQQUwgewogY2xhc3MgU2Vzc2lv bklEOwogfQpAQCAtMjExLDcgKzIxNSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVzZXRRdW90 YShQQUw6OlNlc3Npb25JRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKIAotICAgIHZv aWQgcmVzb3VyY2VMb2FkRGlkU2VuZFJlcXVlc3QoV2ViUGFnZVByb3h5SWRlbnRpZmllciwgUmVz b3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJik7CisgICAgdm9pZCBy ZXNvdXJjZUxvYWREaWRTZW5kUmVxdWVzdChXZWJQYWdlUHJveHlJZGVudGlmaWVyLCBSZXNvdXJj ZUxvYWRJbmZvJiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmLCBPcHRpb25hbDxJUEM6OkZv cm1EYXRhUmVmZXJlbmNlPiYmKTsKICAgICB2b2lkIHJlc291cmNlTG9hZERpZFBlcmZvcm1IVFRQ UmVkaXJlY3Rpb24oV2ViUGFnZVByb3h5SWRlbnRpZmllciwgUmVzb3VyY2VMb2FkSW5mbyYmLCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmKTsK ICAgICB2b2lkIHJlc291cmNlTG9hZERpZFJlY2VpdmVDaGFsbGVuZ2UoV2ViUGFnZVByb3h5SWRl bnRpZmllciwgUmVzb3VyY2VMb2FkSW5mbyYmLCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZSYmKTsKICAgICB2b2lkIHJlc291cmNlTG9hZERpZFJlY2VpdmVSZXNwb25zZShXZWJQYWdl UHJveHlJZGVudGlmaWVyLCBSZXNvdXJjZUxvYWRJbmZvJiYsIFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQ cm9jZXNzUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAy NTc4MDkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTY2LDcgKzY2LDcgQEAgbWVzc2Fn ZXMgLT4gTmV0d29ya1Byb2Nlc3NQcm94eSBMZWdhY3lSZQogCiAgICAgUmVxdWVzdFN0b3JhZ2VT cGFjZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIHN0cnVjdCBXZWJDb3JlOjpDbGllbnRPcmln aW4gb3JpZ2luLCB1aW50NjRfdCBxdW90YSwgdWludDY0X3QgY3VycmVudFNpemUsIHVpbnQ2NF90 IHNwYWNlUmVxdWlyZWQpIC0+IChPcHRpb25hbDx1aW50NjRfdD4gbmV3UXVvdGEpIEFzeW5jCiAg ICAgCi0gICAgUmVzb3VyY2VMb2FkRGlkU2VuZFJlcXVlc3QoV2ViS2l0OjpXZWJQYWdlUHJveHlJ ZGVudGlmaWVyIHBhZ2VJZGVudGlmaWVyLCBzdHJ1Y3QgV2ViS2l0OjpSZXNvdXJjZUxvYWRJbmZv IHJlc291cmNlTG9hZEluZm8sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0KQorICAg IFJlc291cmNlTG9hZERpZFNlbmRSZXF1ZXN0KFdlYktpdDo6V2ViUGFnZVByb3h5SWRlbnRpZmll ciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyByZXNvdXJj ZUxvYWRJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgT3B0aW9uYWw8SVBD OjpGb3JtRGF0YVJlZmVyZW5jZT4gaHR0cEJvZHkpCiAgICAgUmVzb3VyY2VMb2FkRGlkUGVyZm9y bUhUVFBSZWRpcmVjdGlvbihXZWJLaXQ6OldlYlBhZ2VQcm94eUlkZW50aWZpZXIgcGFnZUlkZW50 aWZpZXIsIHN0cnVjdCBXZWJLaXQ6OlJlc291cmNlTG9hZEluZm8gcmVzb3VyY2VMb2FkSW5mbywg V2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNvdXJjZVJlc3BvbnNlLCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QgcmVxdWVzdCkKICAgICBSZXNvdXJjZUxvYWREaWRSZWNlaXZlQ2hhbGxlbmdl KFdlYktpdDo6V2ViUGFnZVByb3h5SWRlbnRpZmllciBwYWdlSWRlbnRpZmllciwgc3RydWN0IFdl YktpdDo6UmVzb3VyY2VMb2FkSW5mbyByZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZSBjaGFsbGVuZ2UpCiAgICAgUmVzb3VyY2VMb2FkRGlkUmVjZWl2ZVJl c3BvbnNlKFdlYktpdDo6V2ViUGFnZVByb3h5SWRlbnRpZmllciBwYWdlSWRlbnRpZmllciwgc3Ry dWN0IFdlYktpdDo6UmVzb3VyY2VMb2FkSW5mbyByZXNvdXJjZUxvYWRJbmZvLCBXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlKQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjU3ODE1KQorKysgVG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMDMgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXF1ZXN0cyBz ZW50IHRvIF9XS1Jlc291cmNlTG9hZERlbGVnYXRlIHNob3VsZCBpbmNsdWRlIEhUVFBCb2R5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg1NTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW06CisgICAgICAg IChURVNUKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW06Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjpIVFRQU2VydmVyOjpyZXNwb25kVG9SZXF1ZXN0cyk6Cisg ICAgICAgIEhUVFBTZXJ2ZXIgbm93IGxvb2tzIGZvciBDb250ZW50LUxlbmd0aCBpbiBpdHMgcmVx dWVzdC4KKyAgICAgICAgSWYgaXQgZmluZHMgdGhpcyBoZWFkZXIsIHRoYXQgbWVhbnMgdGhhdCB0 aGUgSFRUUCBib2R5IGlzIGdvaW5nIHRvIGJlIHJlY2VpdmVkIGluIGFub3RoZXIgcmVhZCwgdGhl biB0aGUgcmVzcG9uc2Ugc2hvdWxkIGJlIHNlbnQgYWZ0ZXIgcmVjZWl2aW5nIHRoYXQuCisKIDIw MjAtMDMtMDMgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBFeHBvc2Ugb3JpZ2luYWxVUkwgYW5kIG9yaWdpbmFsSFRUUE1ldGhvZCBvbiBfV0tS ZXNvdXJjZUxvYWRJbmZvCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHJldmlzaW9u IDI1NzgwOSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3Vy Y2VMb2FkRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTIwMyw3ICsyMDMsNyBAQCBURVNU KFJlc291cmNlTG9hZERlbGVnYXRlLCBMb2FkSW5mbykKIHsKICAgICBUZXN0V2ViS2l0QVBJOjpI VFRQU2VydmVyIHNlcnZlcih7CiAgICAgICAgIHsgIi8iLCB7ICI8aWZyYW1lIHNyYz0naWZyYW1l U3JjJz48L2lmcmFtZT4iIH0gfSwKLSAgICAgICAgeyAiL2lmcmFtZVNyYyIsIHsgIjxzY3JpcHQ+ ZmV0Y2goJ2ZldGNoVGFyZ2V0Jyk8L3NjcmlwdD4iIH0gfSwKKyAgICAgICAgeyAiL2lmcmFtZVNy YyIsIHsgIjxzY3JpcHQ+ZmV0Y2goJ2ZldGNoVGFyZ2V0JywgeyBib2R5OiAnYT1iJmM9ZCcsIG1l dGhvZDogJ3Bvc3QnfSk8L3NjcmlwdD4iIH0gfSwKICAgICAgICAgeyAiL2ZldGNoVGFyZ2V0Iiwg eyAiaGkiIH0gfSwKICAgICB9KTsKIApAQCAtMzA4LDYgKzMwOCw3IEBAIFRFU1QoUmVzb3VyY2VM b2FkRGVsZWdhdGUsIExvYWRJbmZvKQogICAgIEVYUEVDVF9FUShvdGhlclBhcmFtZXRlcnNbNV0s IG5pbCk7CiAgICAgRVhQRUNUX1dLX1NUUkVRKE5TU3RyaW5nRnJvbUNsYXNzKFtvdGhlclBhcmFt ZXRlcnNbNl0gY2xhc3NdKSwgIk5TTXV0YWJsZVVSTFJlcXVlc3QiKTsKICAgICBFWFBFQ1RfV0tf U1RSRVEoW290aGVyUGFyYW1ldGVyc1s2XSBVUkxdLnBhdGgsICIvZmV0Y2hUYXJnZXQiKTsKKyAg ICBFWFBFQ1RfV0tfU1RSRVEoW1tbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoRGF0YTpbb3RoZXJQ YXJhbWV0ZXJzWzZdIEhUVFBCb2R5XSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ10gYXV0 b3JlbGVhc2VdLCAiYT1iJmM9ZCIpOwogICAgIEVYUEVDVF9XS19TVFJFUShOU1N0cmluZ0Zyb21D bGFzcyhbb3RoZXJQYXJhbWV0ZXJzWzddIGNsYXNzXSksICJOU0hUVFBVUkxSZXNwb25zZSIpOwog ICAgIEVYUEVDVF9XS19TVFJFUShbb3RoZXJQYXJhbWV0ZXJzWzddIFVSTF0ucGF0aCwgIi9mZXRj aFRhcmdldCIpOwogICAgIEVYUEVDVF9FUShvdGhlclBhcmFtZXRlcnNbOF0sIG5pbCk7CkluZGV4 OiBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCShyZXZpc2lvbiAyNTc4MDkp CisrKyBUb29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIubW0JKHdvcmtpbmcgY29w eSkKQEAgLTI5LDYgKzI5LDkgQEAKICNpZiBIQVZFKE5FVFdPUktfRlJBTUVXT1JLKQogCiAjaW1w b3J0ICJVdGlsaXRpZXMuaCIKKyNpbXBvcnQgPHd0Zi9CbG9ja1B0ci5oPgorI2ltcG9ydCA8d3Rm L0NvbXBsZXRpb25IYW5kbGVyLmg+CisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAjaW1wb3J0 IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KIApAQCAtMTEyLDMyICsxMTUsNDMgQEAgdm9pZCBIVFRQU2VydmVyOjpyZXNwb25kVG9SZXF1 ZXN0cyhud19jbwogICAgICAgICBzaXplX3QgcGF0aExlbmd0aCA9IHBhdGhFbmQgLSByZXF1ZXN0 LmRhdGEoKSAtIHBhdGhQcmVmaXhMZW5ndGg7CiAgICAgICAgIFN0cmluZyBwYXRoKHJlcXVlc3Qu ZGF0YSgpICsgcGF0aFByZWZpeExlbmd0aCwgcGF0aExlbmd0aCk7CiAgICAgICAgIEFTU0VSVF9X SVRIX01FU1NBR0UobV9yZXF1ZXN0UmVzcG9uc2VNYXAuY29udGFpbnMocGF0aCksICJUaGlzIEhU VFBTZXJ2ZXIgZG9lcyBub3Qga25vdyBob3cgdG8gcmVzcG9uZCB0byBhIHJlcXVlc3QgZm9yICVz IiwgcGF0aC51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgCi0gICAgICAgIGF1dG8gcmVzcG9uc2Ug PSBtX3JlcXVlc3RSZXNwb25zZU1hcC5nZXQocGF0aCk7Ci0gICAgICAgIFN0cmluZ0J1aWxkZXIg cmVzcG9uc2VCdWlsZGVyOwotICAgICAgICByZXNwb25zZUJ1aWxkZXIuYXBwZW5kKCJIVFRQLzEu MSAiKTsKLSAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZE51bWJlcihyZXNwb25zZS5zdGF0 dXNDb2RlKTsKLSAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZCgnICcpOwotICAgICAgICBy ZXNwb25zZUJ1aWxkZXIuYXBwZW5kKHN0YXR1c1RleHQocmVzcG9uc2Uuc3RhdHVzQ29kZSkpOwot ICAgICAgICByZXNwb25zZUJ1aWxkZXIuYXBwZW5kKCJcclxuQ29udGVudC1MZW5ndGg6ICIpOwot ICAgICAgICByZXNwb25zZUJ1aWxkZXIuYXBwZW5kTnVtYmVyKHJlc3BvbnNlLmJvZHkubGVuZ3Ro KCkpOwotICAgICAgICByZXNwb25zZUJ1aWxkZXIuYXBwZW5kKCJcclxuIik7Ci0gICAgICAgIGZv ciAoYXV0byYgcGFpciA6IHJlc3BvbnNlLmhlYWRlckZpZWxkcykgewotICAgICAgICAgICAgcmVz cG9uc2VCdWlsZGVyLmFwcGVuZChwYWlyLmtleSk7Ci0gICAgICAgICAgICByZXNwb25zZUJ1aWxk ZXIuYXBwZW5kKCI6ICIpOwotICAgICAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZChwYWly LnZhbHVlKTsKKworICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IHNlbmRSZXNwb25z ZSA9IFt0aGlzLCBjb25uZWN0aW9uID0gcmV0YWluUHRyKGNvbm5lY3Rpb24pLCBjb250ZXh0ID0g cmV0YWluUHRyKGNvbnRleHQpLCBwYXRoID0gV1RGTW92ZShwYXRoKV0geworICAgICAgICAgICAg YXV0byByZXNwb25zZSA9IG1fcmVxdWVzdFJlc3BvbnNlTWFwLmdldChwYXRoKTsKKyAgICAgICAg ICAgIFN0cmluZ0J1aWxkZXIgcmVzcG9uc2VCdWlsZGVyOworICAgICAgICAgICAgcmVzcG9uc2VC dWlsZGVyLmFwcGVuZCgiSFRUUC8xLjEgIik7CisgICAgICAgICAgICByZXNwb25zZUJ1aWxkZXIu YXBwZW5kTnVtYmVyKHJlc3BvbnNlLnN0YXR1c0NvZGUpOworICAgICAgICAgICAgcmVzcG9uc2VC dWlsZGVyLmFwcGVuZCgnICcpOworICAgICAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZChz dGF0dXNUZXh0KHJlc3BvbnNlLnN0YXR1c0NvZGUpKTsKKyAgICAgICAgICAgIHJlc3BvbnNlQnVp bGRlci5hcHBlbmQoIlxyXG5Db250ZW50LUxlbmd0aDogIik7CisgICAgICAgICAgICByZXNwb25z ZUJ1aWxkZXIuYXBwZW5kTnVtYmVyKHJlc3BvbnNlLmJvZHkubGVuZ3RoKCkpOwogICAgICAgICAg ICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZCgiXHJcbiIpOwotICAgICAgICB9Ci0gICAgICAgIHJl c3BvbnNlQnVpbGRlci5hcHBlbmQoIlxyXG4iKTsKLSAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFw cGVuZChyZXNwb25zZS5ib2R5KTsKLSAgICAgICAgYXV0byByZXNwb25zZUJvZHlBbmRIZWFkZXIg PSByZXNwb25zZUJ1aWxkZXIudG9TdHJpbmcoKS5yZWxlYXNlSW1wbCgpOwotICAgICAgICBhdXRv IHJlc3BvbnNlRGF0YSA9IGFkb3B0TlMoZGlzcGF0Y2hfZGF0YV9jcmVhdGUocmVzcG9uc2VCb2R5 QW5kSGVhZGVyLT5jaGFyYWN0ZXJzOCgpLCByZXNwb25zZUJvZHlBbmRIZWFkZXItPmxlbmd0aCgp LCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewotICAgICAgICAgICAgKHZvaWQpcmVzcG9u c2VCb2R5QW5kSGVhZGVyOwotICAgICAgICB9KSk7Ci0gICAgICAgIG53X2Nvbm5lY3Rpb25fc2Vu ZChjb25uZWN0aW9uLCByZXNwb25zZURhdGEuZ2V0KCksIGNvbnRleHQsIHRydWUsIF4obndfZXJy b3JfdCBlcnJvcikgewotICAgICAgICAgICAgQVNTRVJUKCFlcnJvcik7Ci0gICAgICAgICAgICBy ZXNwb25kVG9SZXF1ZXN0cyhjb25uZWN0aW9uKTsKLSAgICAgICAgfSk7CisgICAgICAgICAgICBm b3IgKGF1dG8mIHBhaXIgOiByZXNwb25zZS5oZWFkZXJGaWVsZHMpIHsKKyAgICAgICAgICAgICAg ICByZXNwb25zZUJ1aWxkZXIuYXBwZW5kKHBhaXIua2V5KTsKKyAgICAgICAgICAgICAgICByZXNw b25zZUJ1aWxkZXIuYXBwZW5kKCI6ICIpOworICAgICAgICAgICAgICAgIHJlc3BvbnNlQnVpbGRl ci5hcHBlbmQocGFpci52YWx1ZSk7CisgICAgICAgICAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFw cGVuZCgiXHJcbiIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmVzcG9uc2VCdWlsZGVy LmFwcGVuZCgiXHJcbiIpOworICAgICAgICAgICAgcmVzcG9uc2VCdWlsZGVyLmFwcGVuZChyZXNw b25zZS5ib2R5KTsKKyAgICAgICAgICAgIGF1dG8gcmVzcG9uc2VCb2R5QW5kSGVhZGVyID0gcmVz cG9uc2VCdWlsZGVyLnRvU3RyaW5nKCkucmVsZWFzZUltcGwoKTsKKyAgICAgICAgICAgIGF1dG8g cmVzcG9uc2VEYXRhID0gYWRvcHROUyhkaXNwYXRjaF9kYXRhX2NyZWF0ZShyZXNwb25zZUJvZHlB bmRIZWFkZXItPmNoYXJhY3RlcnM4KCksIHJlc3BvbnNlQm9keUFuZEhlYWRlci0+bGVuZ3RoKCks IGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CisgICAgICAgICAgICAgICAgKHZvaWQpcmVz cG9uc2VCb2R5QW5kSGVhZGVyOworICAgICAgICAgICAgfSkpOworICAgICAgICAgICAgbndfY29u bmVjdGlvbl9zZW5kKGNvbm5lY3Rpb24uZ2V0KCksIHJlc3BvbnNlRGF0YS5nZXQoKSwgY29udGV4 dC5nZXQoKSwgdHJ1ZSwgXihud19lcnJvcl90IGVycm9yKSB7CisgICAgICAgICAgICAgICAgQVNT RVJUKCFlcnJvcik7CisgICAgICAgICAgICAgICAgcmVzcG9uZFRvUmVxdWVzdHMoY29ubmVjdGlv bi5nZXQoKSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfTsKKworICAgICAgICBpZiAoc3Ry c3RyKHJlcXVlc3QuZGF0YSgpLCAiQ29udGVudC1MZW5ndGgiKSkgeworICAgICAgICAgICAgbndf Y29ubmVjdGlvbl9yZWNlaXZlKGNvbm5lY3Rpb24sIDEsIHN0ZDo6bnVtZXJpY19saW1pdHM8dWlu dDMyX3Q+OjptYXgoKSwgbWFrZUJsb2NrUHRyKFtzZW5kUmVzcG9uc2UgPSBXVEZNb3ZlKHNlbmRS ZXNwb25zZSldIChkaXNwYXRjaF9kYXRhX3QgY29udGVudCwgbndfY29udGVudF9jb250ZXh0X3Qg Y29udGV4dCwgYm9vbCBjb21wbGV0ZSwgbndfZXJyb3JfdCBlcnJvcikgbXV0YWJsZSB7CisgICAg ICAgICAgICAgICAgaWYgKGVycm9yIHx8ICFjb250ZW50KQorICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICAgICAgc2VuZFJlc3BvbnNlKCk7CisgICAgICAgICAgICB9KS5n ZXQoKSk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgc2VuZFJlc3BvbnNlKCk7CiAgICAg fSk7CiB9CiAK