153846 2016-02-03 16:12:16 -0800 Report blocked and cannotShowURL errors when using NetworkSession 2016-02-03 17:39:52 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen beidson koivisto oldest_to_newest 1161819 0 achristensen 2016-02-03 16:12:16 -0800 Report blocked and cannotShowURL errors when using NetworkSession 1161822 1 270607 achristensen 2016-02-03 16:20:21 -0800 Created attachment 270607 Patch 1161850 2 achristensen 2016-02-03 17:39:52 -0800 http://trac.webkit.org/changeset/196101 270607 2016-02-03 16:20:21 -0800 2016-02-03 17:24:03 -0800 Patch bug-153846-20160203161957.patch text/plain 12362 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTc4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTAyLTAzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwb3J0IHdh c0Jsb2NrZWQgYW5kIGNhbm5vdFNob3dVUkwgZXJyb3JzIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Np b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzg0 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgYnV0IHRoaXMgZml4ZXMgaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9yZWRpcmVj dC1jcm9zcy1vcmlnaW4tMi5odG1sCisgICAgICAgIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Npb24u CisKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkwuaDoKKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgYmVj YXVzZSB3ZSBhcmUgdXNpbmcgcG9ydEFsbG93ZWQgaW4gV2ViS2l0MiBub3cuCisKIDIwMTYtMDEt MjggIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBGaXggV2luZG93cyBidWlsZCBhZnRlciByMTk1Nzc0LgpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vVVJMLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJM LmgJKHJldmlzaW9uIDE5NTc4MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VSTC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yNDgsNyArMjQ4LDcgQEAgV0VCQ09SRV9FWFBPUlQgYm9vbCBwcm90 b2NvbElzSW5IVFRQRmFtaQogCiB1bnNpZ25lZCBzaG9ydCBkZWZhdWx0UG9ydEZvclByb3RvY29s KGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpOwogYm9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9jb2wo dW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCk7Ci1ib29sIHBvcnRB bGxvd2VkKGNvbnN0IFVSTCYpOyAvLyBCbGFja2xpc3QgcG9ydHMgdGhhdCBzaG91bGQgbmV2ZXIg YmUgdXNlZCBmb3IgV2ViIHJlc291cmNlcy4KK1dFQkNPUkVfRVhQT1JUIGJvb2wgcG9ydEFsbG93 ZWQoY29uc3QgVVJMJik7IC8vIEJsYWNrbGlzdCBwb3J0cyB0aGF0IHNob3VsZCBuZXZlciBiZSB1 c2VkIGZvciBXZWIgcmVzb3VyY2VzLgogCiBib29sIGlzVmFsaWRQcm90b2NvbChjb25zdCBTdHJp bmcmKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTk2MDcyKQorKysgU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTYtMDItMDMg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBS ZXBvcnQgd2FzQmxvY2tlZCBhbmQgY2Fubm90U2hvd1VSTCBlcnJvcnMgd2hlbiB1c2luZyBOZXR3 b3JrU2Vzc2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUzODQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtMb2FkOjpOZXR3b3JrTG9hZCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjpk aWRTZW5kRGF0YSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjp3YXNCbG9ja2VkKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0xvYWQ6OmNhbm5vdFNob3dVUkwpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrTG9hZDo6ZGlkUmVjZWl2ZVJlc3BvbnNlQXN5bmMpOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmg6CisgICAgICAgIE5ldHdvcmtEYXRhVGFzayBp cyBub3cgUmVmQ291bnRlZCBzbyB3ZSBjYW4gcHJvdGVjdCBpdCB3aGVuIHJlcG9ydGluZyBlcnJv cnMgd2hpY2ggZGVsZXRlIHRoZSBOZXR3b3JrTG9hZC4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrU2Vzc2lvbi5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvblRhc2tD bGllbnQ6On5OZXR3b3JrU2Vzc2lvblRhc2tDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrRGF0YVRhc2s6OmNyZWF0ZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OnRh a2VEb3dubG9hZElEKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrOjpOZXR3b3Jr RGF0YVRhc2spOgorICAgICAgICBDaGVjayB0aGUgdmFsaWRpdHkgb2YgdGhlIHJlcXVlc3RlZCB1 cmwgYW5kIGNoZWNrIGlmIHRoZSBwb3J0IGlzIGFsbG93ZWQgbGlrZSB3ZSBkbyBpbiB0aGUgUmVz b3VyY2VIYW5kbGUgY29uc3RydWN0b3IuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFz azo6fk5ldHdvcmtEYXRhVGFzayk6CisgICAgICAgIERvbid0IHJlbW92ZSB0aGUgdGFzayBmcm9t IHRoZSBOZXR3b3JrU2Vzc2lvbidzIG1hcCBpZiB3ZSBkaWRuJ3QgbWFrZSBpdCBiZWNhdXNlIHRo ZXJlIHdhcyBhbiBlcnJvci4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrOjpzY2hl ZHVsZUZhaWx1cmUpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OmZhaWx1cmVU aW1lckZpcmVkKToKKyAgICAgICAgSW1wbGVtZW50ZWQgbGlrZSBSZXNvdXJjZUhhbmRsZSdzLgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OnRyeVBhc3N3b3JkQmFzZWRBdXRoZW50 aWNhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFzazo6cmVzdW1lKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrOjpzdXNwZW5kKToKKyAgICAgICAgSGFuZGxl IHRoZSBmYWlsdXJlIHRpbWVyIGxpa2Ugd2UgZG8gaW4gUmVzb3VyY2VIYW5kbGU6OnNldERlZmVy c0xvYWRpbmcuCisKIDIwMTYtMDItMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KIAogICAgICAgICBVc2UgcHJvcG9zZWQgY3JlZGVudGlhbHMgaW4gYXV0aGVu dGljYXRpb24gY2hhbGxlbmdlcyB3aXRoIE5ldHdvcmtTZXNzaW9uCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCShyZXZpc2lvbiAxOTYwMzQp CisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUzLDcgKzUzLDcgQEAgTmV0d29ya0xvYWQ6Ok5ldHdvcmtMb2FkKE5ldHdv cmtMb2FkQ2xpZQogewogI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCiAgICAgaWYgKGF1dG8qIG5l dHdvcmtTZXNzaW9uID0gU2Vzc2lvblRyYWNrZXI6Om5ldHdvcmtTZXNzaW9uKHBhcmFtZXRlcnMu c2Vzc2lvbklEKSkgewotICAgICAgICBtX3Rhc2sgPSBzdGQ6Om1ha2VfdW5pcXVlPE5ldHdvcmtE YXRhVGFzaz4oKm5ldHdvcmtTZXNzaW9uLCAqdGhpcywgcGFyYW1ldGVycy5yZXF1ZXN0LCBwYXJh bWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMpOworICAgICAgICBtX3Rhc2sgPSBOZXR3b3Jr RGF0YVRhc2s6OmNyZWF0ZSgqbmV0d29ya1Nlc3Npb24sICp0aGlzLCBwYXJhbWV0ZXJzLnJlcXVl c3QsIHBhcmFtZXRlcnMuYWxsb3dTdG9yZWRDcmVkZW50aWFscyk7CiAgICAgICAgIGlmICghcGFy YW1ldGVycy5kZWZlcnNMb2FkaW5nKQogICAgICAgICAgICAgbV90YXNrLT5yZXN1bWUoKTsKICAg ICB9IGVsc2UKQEAgLTI0OCw2ICsyNDgsMTYgQEAgdm9pZCBOZXR3b3JrTG9hZDo6ZGlkU2VuZERh dGEodWludDY0X3QgdAogICAgIG1fY2xpZW50LmRpZFNlbmREYXRhKHRvdGFsQnl0ZXNTZW50LCB0 b3RhbEJ5dGVzRXhwZWN0ZWRUb1NlbmQpOwogfQogCit2b2lkIE5ldHdvcmtMb2FkOjp3YXNCbG9j a2VkKCkKK3sKKyAgICBtX2NsaWVudC5kaWRGYWlsTG9hZGluZyhibG9ja2VkRXJyb3IobV9jdXJy ZW50UmVxdWVzdCkpOworfQorCit2b2lkIE5ldHdvcmtMb2FkOjpjYW5ub3RTaG93VVJMKCkKK3sK KyAgICBtX2NsaWVudC5kaWRGYWlsTG9hZGluZyhjYW5ub3RTaG93VVJMRXJyb3IobV9jdXJyZW50 UmVxdWVzdCkpOworfQorICAgIAogI2Vsc2UKIAogdm9pZCBOZXR3b3JrTG9hZDo6ZGlkUmVjZWl2 ZVJlc3BvbnNlQXN5bmMoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVjZWl2ZWRSZXNwb25zZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL05ldHdvcmtMb2FkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvTmV0d29ya0xvYWQuaAkocmV2aXNpb24gMTk2MDM0KQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuaAkod29ya2luZyBjb3B5KQpAQCAtNzQsNiArNzQs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbXBsZXRlV2l0aEVycm9yKGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImKSBmaW5hbCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZv aWQgZGlkQmVjb21lRG93bmxvYWQoKSBmaW5hbCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQg ZGlkU2VuZERhdGEodWludDY0X3QgdG90YWxCeXRlc1NlbnQsIHVpbnQ2NF90IHRvdGFsQnl0ZXNF eHBlY3RlZFRvU2VuZCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHdhc0Jsb2NrZWQoKSBv dmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgY2Fubm90U2hvd1VSTCgpIG92ZXJyaWRlOwogI2Vs c2UKICAgICAvLyBSZXNvdXJjZUhhbmRsZUNsaWVudAogICAgIHZpcnR1YWwgdm9pZCB3aWxsU2Vu ZFJlcXVlc3RBc3luYyhXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0 UmVzcG9uc2UpIG92ZXJyaWRlOwpAQCAtMTIzLDcgKzEyNSw3IEBAIHByaXZhdGU6CiAgICAgTmV0 d29ya0xvYWRDbGllbnQmIG1fY2xpZW50OwogICAgIGNvbnN0IE5ldHdvcmtMb2FkUGFyYW1ldGVy cyBtX3BhcmFtZXRlcnM7CiAjaWYgVVNFKE5FVFdPUktfU0VTU0lPTikKLSAgICBzdGQ6OnVuaXF1 ZV9wdHI8TmV0d29ya0RhdGFUYXNrPiBtX3Rhc2s7CisgICAgUmVmUHRyPE5ldHdvcmtEYXRhVGFz az4gbV90YXNrOwogICAgIFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIG1fY2hhbGxl bmdlOwogICAgIENoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyIG1fY2hhbGxlbmdlQ29tcGxldGlv bkhhbmRsZXI7CiAgICAgUmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlciBtX3Jlc3BvbnNlQ29tcGxl dGlvbkhhbmRsZXI7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmgJKHJldmlzaW9uIDE5NjAzNCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcg QEAgT0JKQ19DTEFTUyBXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGU7CiAjaW5jbHVkZSA8V2ViQ29y ZS9GcmFtZUxvYWRlclR5cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUhhbmRsZVR5 cGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXNzaW9uSUQuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L1RpbWVyLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvUmVmLmg+ CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KQEAgLTc4LDE1ICs3OSwyMCBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIGRpZENvbXBsZXRlV2l0aEVycm9yKGNvbnN0IFdlYkNvcmU6OlJl c291cmNlRXJyb3ImKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZEJlY29tZURvd25sb2FkKCkg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5kRGF0YSh1aW50NjRfdCB0b3RhbEJ5dGVzU2Vu dCwgdWludDY0X3QgdG90YWxCeXRlc0V4cGVjdGVkVG9TZW5kKSA9IDA7CisgICAgdmlydHVhbCB2 b2lkIHdhc0Jsb2NrZWQoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGNhbm5vdFNob3dVUkwoKSA9 IDA7CiAKICAgICB2aXJ0dWFsIH5OZXR3b3JrU2Vzc2lvblRhc2tDbGllbnQoKSB7IH0KIH07CiAK LWNsYXNzIE5ldHdvcmtEYXRhVGFzayB7CitjbGFzcyBOZXR3b3JrRGF0YVRhc2sgOiBwdWJsaWMg UmVmQ291bnRlZDxOZXR3b3JrRGF0YVRhc2s+IHsKICAgICBmcmllbmQgY2xhc3MgTmV0d29ya1Nl c3Npb247CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgTmV0d29ya0RhdGFUYXNrKE5ldHdvcmtTZXNz aW9uJiwgTmV0d29ya1Nlc3Npb25UYXNrQ2xpZW50JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXF1ZXN0JiwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMpOwotCisgICAgc3RhdGljIFJlZjxO ZXR3b3JrRGF0YVRhc2s+IGNyZWF0ZShOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya1Nl c3Npb25UYXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMgc3RvcmVkQ3JlZGVudGlhbHMpCisg ICAgeworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBOZXR3b3JrRGF0YVRhc2soc2Vzc2lv biwgY2xpZW50LCByZXF1ZXN0LCBzdG9yZWRDcmVkZW50aWFscykpOworICAgIH0KKyAgICAKICAg ICB2b2lkIHN1c3BlbmQoKTsKICAgICB2b2lkIGNhbmNlbCgpOwogICAgIHZvaWQgcmVzdW1lKCk7 CkBAIC0xMTQsNiArMTIwLDE4IEBAIHB1YmxpYzoKICAgICBib29sIHRyeVBhc3N3b3JkQmFzZWRB dXRoZW50aWNhdGlvbihjb25zdCBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYsIENo YWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyKTsKICAgICAKIHByaXZhdGU6CisgICAgTmV0d29ya0Rh dGFUYXNrKE5ldHdvcmtTZXNzaW9uJiwgTmV0d29ya1Nlc3Npb25UYXNrQ2xpZW50JiwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMpOwor CisgICAgZW51bSBGYWlsdXJlVHlwZSB7CisgICAgICAgIE5vRmFpbHVyZSwKKyAgICAgICAgQmxv Y2tlZEZhaWx1cmUsCisgICAgICAgIEludmFsaWRVUkxGYWlsdXJlCisgICAgfTsKKyAgICBGYWls dXJlVHlwZSBtX3NjaGVkdWxlZEZhaWx1cmVUeXBlIHsgTm9GYWlsdXJlIH07CisgICAgV2ViQ29y ZTo6VGltZXIgbV9mYWlsdXJlVGltZXI7CisgICAgdm9pZCBmYWlsdXJlVGltZXJGaXJlZCgpOwor ICAgIHZvaWQgc2NoZWR1bGVGYWlsdXJlKEZhaWx1cmVUeXBlKTsKKyAgICAKICAgICBOZXR3b3Jr U2Vzc2lvbiYgbV9zZXNzaW9uOwogICAgIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudCYgbV9jbGll bnQ7CiAgICAgUGVuZGluZ0Rvd25sb2FkKiBtX3BlbmRpbmdEb3dubG9hZCB7IG51bGxwdHIgfTsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9u Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29j b2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkocmV2aXNpb24gMTk2MDcyKQorKysgU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9SZXNvdXJjZVJlcXVl c3QuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9TaGFyZWRCdWZmZXIuaD4KKyNpbXBvcnQgPFdlYkNvcmUvVVJMLmg+CiAjaW1wb3J0IDx3 dGYvTWFpblRocmVhZC5oPgogI2ltcG9ydCA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKQEAgLTI3 NCwxMSArMjc1LDIyIEBAIERvd25sb2FkSUQgTmV0d29ya1Nlc3Npb246OnRha2VEb3dubG9hZEkK IH0KIAogTmV0d29ya0RhdGFUYXNrOjpOZXR3b3JrRGF0YVRhc2soTmV0d29ya1Nlc3Npb24mIHNl c3Npb24sIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3RXaXRoQ3JlZGVudGlhbHMsIFdlYkNvcmU6OlN0b3JlZENy ZWRlbnRpYWxzIHN0b3JlZENyZWRlbnRpYWxzKQotICAgIDogbV9zZXNzaW9uKHNlc3Npb24pCisg ICAgOiBtX2ZhaWx1cmVUaW1lcigqdGhpcywgJk5ldHdvcmtEYXRhVGFzazo6ZmFpbHVyZVRpbWVy RmlyZWQpCisgICAgLCBtX3Nlc3Npb24oc2Vzc2lvbikKICAgICAsIG1fY2xpZW50KGNsaWVudCkK IHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCisgICAgaWYgKCFyZXF1ZXN0V2l0aENy ZWRlbnRpYWxzLnVybCgpLmlzVmFsaWQoKSkgeworICAgICAgICBzY2hlZHVsZUZhaWx1cmUoSW52 YWxpZFVSTEZhaWx1cmUpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIGlmICgh cG9ydEFsbG93ZWQocmVxdWVzdFdpdGhDcmVkZW50aWFscy51cmwoKSkpIHsKKyAgICAgICAgc2No ZWR1bGVGYWlsdXJlKEJsb2NrZWRGYWlsdXJlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAg ICAKICAgICBhdXRvIHJlcXVlc3QgPSByZXF1ZXN0V2l0aENyZWRlbnRpYWxzOwogICAgIG1fdXNl ciA9IHJlcXVlc3QudXJsKCkudXNlcigpOwogICAgIG1fcGFzc3dvcmQgPSByZXF1ZXN0LnVybCgp LnBhc3MoKTsKQEAgLTI5NSwxMCArMzA3LDM5IEBAIE5ldHdvcmtEYXRhVGFzazo6TmV0d29ya0Rh dGFUYXNrKE5ldHdvcmsKIAogTmV0d29ya0RhdGFUYXNrOjp+TmV0d29ya0RhdGFUYXNrKCkKIHsK LSAgICBBU1NFUlQobV9zZXNzaW9uLm1fZGF0YVRhc2tNYXAuY29udGFpbnModGFza0lkZW50aWZp ZXIoKSkpOwotICAgIEFTU0VSVChtX3Nlc3Npb24ubV9kYXRhVGFza01hcC5nZXQodGFza0lkZW50 aWZpZXIoKSkgPT0gdGhpcyk7Ci0gICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKLSAgICBtX3Nl c3Npb24ubV9kYXRhVGFza01hcC5yZW1vdmUodGFza0lkZW50aWZpZXIoKSk7CisgICAgaWYgKG1f dGFzaykgeworICAgICAgICBBU1NFUlQobV9zZXNzaW9uLm1fZGF0YVRhc2tNYXAuY29udGFpbnMo dGFza0lkZW50aWZpZXIoKSkpOworICAgICAgICBBU1NFUlQobV9zZXNzaW9uLm1fZGF0YVRhc2tN YXAuZ2V0KHRhc2tJZGVudGlmaWVyKCkpID09IHRoaXMpOworICAgICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOworICAgICAgICBtX3Nlc3Npb24ubV9kYXRhVGFza01hcC5yZW1vdmUodGFza0lk ZW50aWZpZXIoKSk7CisgICAgfQorfQorCit2b2lkIE5ldHdvcmtEYXRhVGFzazo6c2NoZWR1bGVG YWlsdXJlKEZhaWx1cmVUeXBlIHR5cGUpCit7CisgICAgQVNTRVJUKHR5cGUgIT0gTm9GYWlsdXJl KTsKKyAgICBtX3NjaGVkdWxlZEZhaWx1cmVUeXBlID0gdHlwZTsKKyAgICBtX2ZhaWx1cmVUaW1l ci5zdGFydE9uZVNob3QoMCk7Cit9CisKK3ZvaWQgTmV0d29ya0RhdGFUYXNrOjpmYWlsdXJlVGlt ZXJGaXJlZCgpCit7CisgICAgUmVmUHRyPE5ldHdvcmtEYXRhVGFzaz4gcHJvdGVjdCh0aGlzKTsK KworICAgIHN3aXRjaCAobV9zY2hlZHVsZWRGYWlsdXJlVHlwZSkgeworICAgIGNhc2UgQmxvY2tl ZEZhaWx1cmU6CisgICAgICAgIG1fc2NoZWR1bGVkRmFpbHVyZVR5cGUgPSBOb0ZhaWx1cmU7Cisg ICAgICAgIGNsaWVudCgpLndhc0Jsb2NrZWQoKTsKKyAgICAgICAgcmV0dXJuOworICAgIGNhc2Ug SW52YWxpZFVSTEZhaWx1cmU6CisgICAgICAgIG1fc2NoZWR1bGVkRmFpbHVyZVR5cGUgPSBOb0Zh aWx1cmU7CisgICAgICAgIGNsaWVudCgpLmNhbm5vdFNob3dVUkwoKTsKKyAgICAgICAgcmV0dXJu OworICAgIGNhc2UgTm9GYWlsdXJlOgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICAgICAgYnJlYWs7CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBib29s IE5ldHdvcmtEYXRhVGFzazo6dHJ5UGFzc3dvcmRCYXNlZEF1dGhlbnRpY2F0aW9uKGNvbnN0IFdl YkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBjaGFsbGVuZ2UsIENoYWxsZW5nZUNvbXBs ZXRpb25IYW5kbGVyIGNvbXBsZXRpb25IYW5kbGVyKQpAQCAtMzI4LDExICszNjksMTUgQEAgdm9p ZCBOZXR3b3JrRGF0YVRhc2s6OmNhbmNlbCgpCiAKIHZvaWQgTmV0d29ya0RhdGFUYXNrOjpyZXN1 bWUoKQogeworICAgIGlmIChtX3NjaGVkdWxlZEZhaWx1cmVUeXBlICE9IE5vRmFpbHVyZSkKKyAg ICAgICAgbV9mYWlsdXJlVGltZXIuc3RhcnRPbmVTaG90KDApOwogICAgIFttX3Rhc2sgcmVzdW1l XTsKIH0KIAogdm9pZCBOZXR3b3JrRGF0YVRhc2s6OnN1c3BlbmQoKQogeworICAgIGlmIChtX2Zh aWx1cmVUaW1lci5pc0FjdGl2ZSgpKQorICAgICAgICBtX2ZhaWx1cmVUaW1lci5zdG9wKCk7CiAg ICAgW21fdGFzayBzdXNwZW5kXTsKIH0KICAgICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlz aW9uIDE5NjA5MikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDEzIEBACisyMDE2LTAyLTAzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlz dGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVwb3J0IGJsb2NrZWQgYW5kIGNhbm5vdFNo b3dVUkwgZXJyb3JzIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Mzg0NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6YmxvY2tlZEVy cm9yKToKKwogMjAxNi0wMi0wMyAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5Ad2Via2l0Lm9yZz4K IAogICAgICAgICBCdWlsZCBmaXguCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkocmV2aXNpb24gMTk1 NzgxKQorKysgU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTExNDksNiArMTE0OSw3IEBAIFJlc291cmNlRXJy b3IgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNhbmMKICAgICAKIFJlc291cmNlRXJyb3IgV2ViRnJh bWVMb2FkZXJDbGllbnQ6OmJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QpCiB7CisgICAgV1RGTG9nQWx3YXlzKCJFUlJPUiAxIik7CiAgICAgcmV0dXJuIFtOU0Vycm9y IF93ZWJLaXRFcnJvcldpdGhEb21haW46V2ViS2l0RXJyb3JEb21haW4gY29kZTpXZWJLaXRFcnJv ckNhbm5vdFVzZVJlc3RyaWN0ZWRQb3J0IFVSTDpyZXF1ZXN0LnVybCgpXTsKIH0KIAo=