167236 2017-01-20 01:59:14 -0800 [SOUP] Custom protocols don't work in private browsing mode 2017-01-25 06:26:43 -0800 1 1 1 Unclassified WebKit Platform WebKit Local Build Unspecified Unspecified RESOLVED FIXED Soup P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue danw gustavo mcatanzaro mrobinson ossy oldest_to_newest 1268402 0 cgarcia 2017-01-20 01:59:14 -0800 We only register them in the default session. You can reproduce this with the GTK+ MiniBrowser. Open it, enable private browsing in settings dialog and navigate to about:minibrowser. 1268403 1 299336 cgarcia 2017-01-20 02:04:30 -0800 Created attachment 299336 Patch 1268406 2 299336 svillar 2017-01-20 02:20:36 -0800 Comment on attachment 299336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299336&action=review r+ but we need a test to verify that we don't regress > Source/WebCore/platform/network/soup/SoupNetworkSession.cpp:304 > + return; I guess you add this for extra safety as we're asserting above. Not sure we need it but no strong feelings. 1268407 3 299336 cgarcia 2017-01-20 02:29:46 -0800 Comment on attachment 299336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299336&action=review Didn't want to add tests depending on the soon deprecated private browsing setting, I'll add more unit tests when we add the new API for private browsing. >> Source/WebCore/platform/network/soup/SoupNetworkSession.cpp:304 >> + return; > > I guess you add this for extra safety as we're asserting above. Not sure we need it but no strong feelings. No, this is in case setCustomProtocolRequestType hasn't been called, like in the web process. It's true that in that case the type is 0, so we could just check if !type, but yes, added the type check for extra safety 1268733 4 cgarcia 2017-01-20 23:41:46 -0800 Committed r211012: <http://trac.webkit.org/changeset/211012> 1268736 5 cgarcia 2017-01-21 01:24:07 -0800 Reverted r211012 for reason: It caused a lot of crashes in the network process Committed r211014: <http://trac.webkit.org/changeset/211014> 1268737 6 cgarcia 2017-01-21 01:26:14 -0800 It's not possible to register a soup request type without types, that's why we installed the feature on every register scheme. I did my tests with MiniBrowser that always registers a scheme, that's why it worked, but fails with all layout tests. I need to rethink how to properly fix this. 1269016 7 299509 cgarcia 2017-01-23 00:24:56 -0800 Created attachment 299509 Updated patch Two changes to the previous version: * We call setup on all session after every scheme is registered instead of in registerProtocolClass(). * We check if the class has schemes before adding it to the session. 1269765 8 299509 svillar 2017-01-25 01:52:45 -0800 Comment on attachment 299509 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=299509&action=review > Source/WebKit2/ChangeLog:8 > + We only register them in the default session. This, combined with the title is the description of the issue, but I lack an explanation of the fix here. Yes I know you talk about specifics on the individual files, but I think it's far easier for the reader to have a general description here. 1269775 9 cgarcia 2017-01-25 04:24:22 -0800 Committed r211140: <http://trac.webkit.org/changeset/211140> 1269799 10 ossy 2017-01-25 06:16:21 -0800 (In reply to comment #9) > Committed r211140: <http://trac.webkit.org/changeset/211140> It broke the build on the 32 bit GTK bot: https://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/66858 1269801 11 cgarcia 2017-01-25 06:26:43 -0800 (In reply to comment #10) > (In reply to comment #9) > > Committed r211140: <http://trac.webkit.org/changeset/211140> > > It broke the build on the 32 bit GTK bot: > https://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/66858 Thanks for the heads up, I guess we can't forward declare GType then... 299336 2017-01-20 02:04:30 -0800 2017-01-23 00:24:56 -0800 Patch wk2-custom-protocols-private.diff text/plain 6507 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzYTQwMzlkNjhhZC4uOWQ3MTk1MmM5MDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNy0wMS0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1NPVVBdIEN1c3RvbSBwcm90b2NvbHMgZG9uJ3Qgd29yayBp biBwcml2YXRlIGJyb3dzaW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBzdGF0aWMgbWV0aG9kIHRvIHNldCB0aGUgZ2xvYmFsIGN1c3Rv bSBwcm90b2NvbHMgcmVxdWVzdCB0eXBlIGFuZCBzZXR1cCBtZXRob2QgdG8gYWRkIHRoZSBmZWF0 dXJlIHRvIHRoZSBzZXNzaW9uLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Nv dXBOZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nlc3Np b246OlNvdXBOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nl c3Npb246OnNldEN1c3RvbVByb3RvY29sUmVxdWVzdFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6 U291cE5ldHdvcmtTZXNzaW9uOjpzZXR1cEN1c3RvbVByb3RvY29scyk6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDE3LTAxLTE5ICBT YWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVH UkVTU0lPTihyMjA2MTU2KTogQW5pbWF0ZWQgaW1hZ2VzIGFyZSByZXBlYXRlZCBvbmUgZXh0cmEg aXRlcmF0aW9uIHRoYW4gdGhlIHZhbHVlIHdoaWNoIGlzIHNhdmVkIGluIHRoZSBpbWFnZSBmaWxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5l dHdvcmtTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9T b3VwTmV0d29ya1Nlc3Npb24uY3BwCmluZGV4IDg1MmI5YjhiZWViLi5kNGZmMmE3OGE2MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3Jr U2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Nv dXBOZXR3b3JrU2Vzc2lvbi5jcHAKQEAgLTQ4LDYgKzQ4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogc3RhdGljIGJvb2wgZ0lnbm9yZVRMU0Vycm9yczsKIHN0YXRpYyBDU3RyaW5nIGdJbml0aWFs QWNjZXB0TGFuZ3VhZ2VzOwogc3RhdGljIFNvdXBOZXR3b3JrUHJveHlTZXR0aW5ncyBnUHJveHlT ZXR0aW5nczsKK3N0YXRpYyBHVHlwZSBnQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0VHlwZTsKIAogI2lm ICFMT0dfRElTQUJMRUQKIGlubGluZSBzdGF0aWMgdm9pZCBzb3VwTG9nUHJpbnRlcihTb3VwTG9n Z2VyKiwgU291cExvZ2dlckxvZ0xldmVsLCBjaGFyIGRpcmVjdGlvbiwgY29uc3QgY2hhciogZGF0 YSwgZ3BvaW50ZXIpCkBAIC0xNDAsNiArMTQxLDggQEAgU291cE5ldHdvcmtTZXNzaW9uOjpTb3Vw TmV0d29ya1Nlc3Npb24oU291cENvb2tpZUphciogY29va2llSmFyKQogICAgICAgICBTT1VQX1NF U1NJT05fU1NMX1NUUklDVCwgRkFMU0UsCiAgICAgICAgIG51bGxwdHIpOwogCisgICAgc2V0dXBD dXN0b21Qcm90b2NvbHMoKTsKKwogICAgIGlmICghZ0luaXRpYWxBY2NlcHRMYW5ndWFnZXMuaXNO dWxsKCkpCiAgICAgICAgIHNldEFjY2VwdExhbmd1YWdlcyhnSW5pdGlhbEFjY2VwdExhbmd1YWdl cyk7CiAKQEAgLTI4OSw2ICsyOTIsMTkgQEAgdm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OnNldEFj Y2VwdExhbmd1YWdlcyhjb25zdCBDU3RyaW5nJiBsYW5ndWFnZXMpCiAgICAgZ19vYmplY3Rfc2V0 KG1fc291cFNlc3Npb24uZ2V0KCksICJhY2NlcHQtbGFuZ3VhZ2UiLCBsYW5ndWFnZXMuZGF0YSgp LCBudWxscHRyKTsKIH0KIAordm9pZCBTb3VwTmV0d29ya1Nlc3Npb246OnNldEN1c3RvbVByb3Rv Y29sUmVxdWVzdFR5cGUoR1R5cGUgcmVxdWVzdFR5cGUpCit7CisgICAgQVNTRVJUKGdfdHlwZV9p c19hKHJlcXVlc3RUeXBlLCBTT1VQX1RZUEVfUkVRVUVTVCkpOworICAgIGdDdXN0b21Qcm90b2Nv bFJlcXVlc3RUeXBlID0gcmVxdWVzdFR5cGU7Cit9CisKK3ZvaWQgU291cE5ldHdvcmtTZXNzaW9u OjpzZXR1cEN1c3RvbVByb3RvY29scygpCit7CisgICAgaWYgKCFnX3R5cGVfaXNfYShnQ3VzdG9t UHJvdG9jb2xSZXF1ZXN0VHlwZSwgU09VUF9UWVBFX1JFUVVFU1QpKQorICAgICAgICByZXR1cm47 CisgICAgc291cF9zZXNzaW9uX2FkZF9mZWF0dXJlX2J5X3R5cGUobV9zb3VwU2Vzc2lvbi5nZXQo KSwgZ0N1c3RvbVByb3RvY29sUmVxdWVzdFR5cGUpOworfQorCiB2b2lkIFNvdXBOZXR3b3JrU2Vz c2lvbjo6c2V0U2hvdWxkSWdub3JlVExTRXJyb3JzKGJvb2wgaWdub3JlVExTRXJyb3JzKQogewog ICAgIGdJZ25vcmVUTFNFcnJvcnMgPSBpZ25vcmVUTFNFcnJvcnM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNzaW9uLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNzaW9uLmgK aW5kZXggOWYyZThjZTNlY2UuLjQ2NjhmNjlkNWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5ldHdvcmtTZXNzaW9uLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5oCkBAIC0z Miw2ICszMiw3IEBACiAjaW5jbHVkZSA8d3RmL2dsaWIvR1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0 Zi90ZXh0L1dURlN0cmluZy5oPgogCit0eXBlZGVmIHNpemVfdCBHVHlwZTsKIHR5cGVkZWYgc3Ry dWN0IF9Tb3VwQ2FjaGUgU291cENhY2hlOwogdHlwZWRlZiBzdHJ1Y3QgX1NvdXBDb29raWVKYXIg U291cENvb2tpZUphcjsKIHR5cGVkZWYgc3RydWN0IF9Tb3VwTWVzc2FnZSBTb3VwTWVzc2FnZTsK QEAgLTcwLDYgKzcxLDkgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIGNoZWNrVExTRXJyb3Jz KFNvdXBSZXF1ZXN0KiwgU291cE1lc3NhZ2UqLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNvbnN0IFJl c291cmNlRXJyb3ImKT4mJik7CiAgICAgc3RhdGljIHZvaWQgYWxsb3dTcGVjaWZpY0hUVFBTQ2Vy dGlmaWNhdGVGb3JIb3N0KGNvbnN0IENlcnRpZmljYXRlSW5mbyYsIGNvbnN0IFN0cmluZyYgaG9z dCk7CiAKKyAgICBzdGF0aWMgdm9pZCBzZXRDdXN0b21Qcm90b2NvbFJlcXVlc3RUeXBlKEdUeXBl KTsKKyAgICB2b2lkIHNldHVwQ3VzdG9tUHJvdG9jb2xzKCk7CisKIHByaXZhdGU6CiAgICAgdm9p ZCBzZXR1cExvZ2dlcigpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmI4YTQ3MjAyNzcuLjBhNDU4ZDhmNDcy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTctMDEtMjAgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtTT1VQXSBDdXN0b20gcHJv dG9jb2xzIGRvbid0IHdvcmsgaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyMzYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBvbmx5IHJlZ2lzdGVyIHRoZW0g aW4gdGhlIGRlZmF1bHQgc2Vzc2lvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0N1c3Rv bVByb3RvY29scy9zb3VwL0N1c3RvbVByb3RvY29sTWFuYWdlclNvdXAuY3BwOgorICAgICAgICAo V2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnJlZ2lzdGVyUHJvdG9jb2xDbGFzcyk6IFNl dCB0aGUgV0VCS0lUX1RZUEVfU09VUF9SRVFVRVNUX0dFTkVSSUMgYXMgdHlwZSBmb3IKKyAgICAg ICAgY3VzdG9tIHByb3RvY29scywgYW5kIHNldHVwIGN1c3RvbSBwcm90b2NvbHMgaW4gYWxsIGV4 aXN0aW5nIHNlc3Npb25zLgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6 OnJlZ2lzdGVyU2NoZW1lKTogVXNlIGdfdHlwZV9jbGFzc19wZWVrIGluc3RlYWQgb2YgZ190eXBl X2NsYXNzX3JlZiBzaW5jZSB3ZSBrbm93CisgICAgICAgIHRoZSBjbGFzcyB3YXMgYWxyZWFkeSBj cmVhdGVkIGluIHJlZ2lzdGVyUHJvdG9jb2xDbGFzcygpLgorCisyMDE3LTAxLTIwICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBVbnJldmlld2Vk LiBVcGRhdGUgT3B0aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi4xNS4zIHJlbGVhc2UuCiAK ICAgICAgICAgKiBndGsvTkVXUzogQWRkIHJlbGVhc2Ugbm90ZXMgZm9yIDIuMTUuMy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9zb3Vw L0N1c3RvbVByb3RvY29sTWFuYWdlclNvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291cC5jcHAK aW5kZXggMTNhMDI4YTQyYjcuLjE0YWQxMzBiM2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFn ZXJTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90 b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFnZXJTb3VwLmNwcApAQCAtNzcsNiArNzcsMTEg QEAgcHJpdmF0ZToKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpyZWdpc3RlclByb3RvY29s Q2xhc3MoKQogewogICAgIHN0YXRpY19jYXN0PFdlYktpdFNvdXBSZXF1ZXN0R2VuZXJpY0NsYXNz Kj4oZ190eXBlX2NsYXNzX3JlZihXRUJLSVRfVFlQRV9TT1VQX1JFUVVFU1RfR0VORVJJQykpLT5j bGllbnQgPSAmQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0Q2xpZW50OjpzaW5nbGV0b24oKTsKKyAgICBT b3VwTmV0d29ya1Nlc3Npb246OnNldEN1c3RvbVByb3RvY29sUmVxdWVzdFR5cGUoV0VCS0lUX1RZ UEVfU09VUF9SRVFVRVNUX0dFTkVSSUMpOworICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6Zm9y RWFjaChbXShjb25zdCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24pIHsK KyAgICAgICAgaWYgKGF1dG8qIHNvdXBTZXNzaW9uID0gc2Vzc2lvbi5zb3VwTmV0d29ya1Nlc3Np b24oKSkKKyAgICAgICAgICAgIHNvdXBTZXNzaW9uLT5zZXR1cEN1c3RvbVByb3RvY29scygpOwor ICAgIH0pOwogfQogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6cmVnaXN0ZXJTY2hlbWUo Y29uc3QgU3RyaW5nJiBzY2hlbWUpCkBAIC04OSw5ICs5NCw5IEBAIHZvaWQgQ3VzdG9tUHJvdG9j b2xNYW5hZ2VyOjpyZWdpc3RlclNjaGVtZShjb25zdCBTdHJpbmcmIHNjaGVtZSkKICAgICBnX3B0 cl9hcnJheV9hZGQobV9yZWdpc3RlcmVkU2NoZW1lcy5nZXQoKSwgZ19zdHJkdXAoc2NoZW1lLnV0 ZjgoKS5kYXRhKCkpKTsKICAgICBnX3B0cl9hcnJheV9hZGQobV9yZWdpc3RlcmVkU2NoZW1lcy5n ZXQoKSwgbnVsbHB0cik7CiAKLSAgICBhdXRvKiBnZW5lcmljUmVxdWVzdENsYXNzID0gc3RhdGlj X2Nhc3Q8U291cFJlcXVlc3RDbGFzcyo+KGdfdHlwZV9jbGFzc19yZWYoV0VCS0lUX1RZUEVfU09V UF9SRVFVRVNUX0dFTkVSSUMpKTsKKyAgICBhdXRvKiBnZW5lcmljUmVxdWVzdENsYXNzID0gc3Rh dGljX2Nhc3Q8U291cFJlcXVlc3RDbGFzcyo+KGdfdHlwZV9jbGFzc19wZWVrKFdFQktJVF9UWVBF X1NPVVBfUkVRVUVTVF9HRU5FUklDKSk7CisgICAgQVNTRVJUKGdlbmVyaWNSZXF1ZXN0Q2xhc3Mp OwogICAgIGdlbmVyaWNSZXF1ZXN0Q2xhc3MtPnNjaGVtZXMgPSBjb25zdF9jYXN0PGNvbnN0IGNo YXIqKj4ocmVpbnRlcnByZXRfY2FzdDxjaGFyKio+KG1fcmVnaXN0ZXJlZFNjaGVtZXMtPnBkYXRh KSk7Ci0gICAgc291cF9zZXNzaW9uX2FkZF9mZWF0dXJlX2J5X3R5cGUoTmV0d29ya1N0b3JhZ2VT ZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNlc3Npb24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vz c2lvbigpLnNvdXBTZXNzaW9uKCksIFdFQktJVF9UWVBFX1NPVVBfUkVRVUVTVF9HRU5FUklDKTsK IH0KIAogdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnVucmVnaXN0ZXJTY2hlbWUoY29uc3Qg U3RyaW5nJikK 299509 2017-01-23 00:24:56 -0800 2017-01-25 01:52:45 -0800 Updated patch wk2-custom-protocols-private.diff text/plain 6572 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZTQyZjBjMzkxMS4uOGJiOThhNjRiMTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNy0wMS0yMyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1NPVVBdIEN1c3RvbSBwcm90b2NvbHMgZG9uJ3Qgd29yayBp biBwcml2YXRlIGJyb3dzaW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzIzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBzdGF0aWMgbWV0aG9kIHRvIHNldCB0aGUgZ2xvYmFsIGN1c3Rv bSBwcm90b2NvbHMgcmVxdWVzdCB0eXBlIGFuZCBzZXR1cCBtZXRob2QgdG8gYWRkIHRoZSBmZWF0 dXJlIHRvIHRoZSBzZXNzaW9uLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Nv dXBOZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nlc3Np b246OlNvdXBOZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpTb3VwTmV0d29ya1Nl c3Npb246OnNldEN1c3RvbVByb3RvY29sUmVxdWVzdFR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6 U291cE5ldHdvcmtTZXNzaW9uOjpzZXR1cEN1c3RvbVByb3RvY29scyk6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5oOgorCiAyMDE3LTAxLTIyICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBEYXRh YmFzZSBmaWxlIG5vdCByZW1vdmVkIGZvciBvcmlnaW5zIGFmdGVyIGRlbGV0aW5nIGFsbCBkYXRh YmFzZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9T b3VwTmV0d29ya1Nlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5jcHAKaW5kZXggMjZkYjdmMjdkMGEuLmVmNmMzYmY2ZDlh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU291cE5l dHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvU291cE5ldHdvcmtTZXNzaW9uLmNwcApAQCAtNDgsNiArNDgsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiBzdGF0aWMgYm9vbCBnSWdub3JlVExTRXJyb3JzOwogc3RhdGljIENTdHJpbmcgZ0lu aXRpYWxBY2NlcHRMYW5ndWFnZXM7CiBzdGF0aWMgU291cE5ldHdvcmtQcm94eVNldHRpbmdzIGdQ cm94eVNldHRpbmdzOworc3RhdGljIEdUeXBlIGdDdXN0b21Qcm90b2NvbFJlcXVlc3RUeXBlOwog CiAjaWYgIUxPR19ESVNBQkxFRAogaW5saW5lIHN0YXRpYyB2b2lkIHNvdXBMb2dQcmludGVyKFNv dXBMb2dnZXIqLCBTb3VwTG9nZ2VyTG9nTGV2ZWwsIGNoYXIgZGlyZWN0aW9uLCBjb25zdCBjaGFy KiBkYXRhLCBncG9pbnRlcikKQEAgLTE0MCw2ICsxNDEsOCBAQCBTb3VwTmV0d29ya1Nlc3Npb246 OlNvdXBOZXR3b3JrU2Vzc2lvbihTb3VwQ29va2llSmFyKiBjb29raWVKYXIpCiAgICAgICAgIFNP VVBfU0VTU0lPTl9TU0xfU1RSSUNULCBGQUxTRSwKICAgICAgICAgbnVsbHB0cik7CiAKKyAgICBz ZXR1cEN1c3RvbVByb3RvY29scygpOworCiAgICAgaWYgKCFnSW5pdGlhbEFjY2VwdExhbmd1YWdl cy5pc051bGwoKSkKICAgICAgICAgc2V0QWNjZXB0TGFuZ3VhZ2VzKGdJbml0aWFsQWNjZXB0TGFu Z3VhZ2VzKTsKIApAQCAtMjg5LDYgKzI5MiwyNCBAQCB2b2lkIFNvdXBOZXR3b3JrU2Vzc2lvbjo6 c2V0QWNjZXB0TGFuZ3VhZ2VzKGNvbnN0IENTdHJpbmcmIGxhbmd1YWdlcykKICAgICBnX29iamVj dF9zZXQobV9zb3VwU2Vzc2lvbi5nZXQoKSwgImFjY2VwdC1sYW5ndWFnZSIsIGxhbmd1YWdlcy5k YXRhKCksIG51bGxwdHIpOwogfQogCit2b2lkIFNvdXBOZXR3b3JrU2Vzc2lvbjo6c2V0Q3VzdG9t UHJvdG9jb2xSZXF1ZXN0VHlwZShHVHlwZSByZXF1ZXN0VHlwZSkKK3sKKyAgICBBU1NFUlQoZ190 eXBlX2lzX2EocmVxdWVzdFR5cGUsIFNPVVBfVFlQRV9SRVFVRVNUKSk7CisgICAgZ0N1c3RvbVBy b3RvY29sUmVxdWVzdFR5cGUgPSByZXF1ZXN0VHlwZTsKK30KKwordm9pZCBTb3VwTmV0d29ya1Nl c3Npb246OnNldHVwQ3VzdG9tUHJvdG9jb2xzKCkKK3sKKyAgICBpZiAoIWdfdHlwZV9pc19hKGdD dXN0b21Qcm90b2NvbFJlcXVlc3RUeXBlLCBTT1VQX1RZUEVfUkVRVUVTVCkpCisgICAgICAgIHJl dHVybjsKKworICAgIGF1dG8qIHJlcXVlc3RDbGFzcyA9IHN0YXRpY19jYXN0PFNvdXBSZXF1ZXN0 Q2xhc3MqPihnX3R5cGVfY2xhc3NfcGVlayhnQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0VHlwZSkpOwor ICAgIGlmICghcmVxdWVzdENsYXNzIHx8ICFyZXF1ZXN0Q2xhc3MtPnNjaGVtZXMpCisgICAgICAg IHJldHVybjsKKworICAgIHNvdXBfc2Vzc2lvbl9hZGRfZmVhdHVyZV9ieV90eXBlKG1fc291cFNl c3Npb24uZ2V0KCksIGdDdXN0b21Qcm90b2NvbFJlcXVlc3RUeXBlKTsKK30KKwogdm9pZCBTb3Vw TmV0d29ya1Nlc3Npb246OnNldFNob3VsZElnbm9yZVRMU0Vycm9ycyhib29sIGlnbm9yZVRMU0Vy cm9ycykKIHsKICAgICBnSWdub3JlVExTRXJyb3JzID0gaWdub3JlVExTRXJyb3JzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vz c2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3Jr U2Vzc2lvbi5oCmluZGV4IDlmMmU4Y2UzZWNlLi40NjY4ZjY5ZDVmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvdXBOZXR3b3JrU2Vzc2lvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Tb3VwTmV0d29ya1Nlc3Np b24uaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHd0Zi9nbGliL0dSZWZQdHIuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAordHlwZWRlZiBzaXplX3QgR1R5cGU7CiB0 eXBlZGVmIHN0cnVjdCBfU291cENhY2hlIFNvdXBDYWNoZTsKIHR5cGVkZWYgc3RydWN0IF9Tb3Vw Q29va2llSmFyIFNvdXBDb29raWVKYXI7CiB0eXBlZGVmIHN0cnVjdCBfU291cE1lc3NhZ2UgU291 cE1lc3NhZ2U7CkBAIC03MCw2ICs3MSw5IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBjaGVj a1RMU0Vycm9ycyhTb3VwUmVxdWVzdCosIFNvdXBNZXNzYWdlKiwgc3RkOjpmdW5jdGlvbjx2b2lk IChjb25zdCBSZXNvdXJjZUVycm9yJik+JiYpOwogICAgIHN0YXRpYyB2b2lkIGFsbG93U3BlY2lm aWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChjb25zdCBDZXJ0aWZpY2F0ZUluZm8mLCBjb25zdCBT dHJpbmcmIGhvc3QpOwogCisgICAgc3RhdGljIHZvaWQgc2V0Q3VzdG9tUHJvdG9jb2xSZXF1ZXN0 VHlwZShHVHlwZSk7CisgICAgdm9pZCBzZXR1cEN1c3RvbVByb3RvY29scygpOworCiBwcml2YXRl OgogICAgIHZvaWQgc2V0dXBMb2dnZXIoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGIzYjkwZDEwM2QwLi5l ZjYxNjAxNjIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAxLTIzICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g Q3VzdG9tIHByb3RvY29scyBkb24ndCB3b3JrIGluIHByaXZhdGUgYnJvd3NpbmcgbW9kZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MjM2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugb25seSByZWdp c3RlciB0aGVtIGluIHRoZSBkZWZhdWx0IHNlc3Npb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9DdXN0b21Qcm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFnZXJTb3VwLmNwcDoK KyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpyZWdpc3RlclByb3RvY29s Q2xhc3MpOiBTZXQgdGhlIFdFQktJVF9UWVBFX1NPVVBfUkVRVUVTVF9HRU5FUklDIGFzIHR5cGUg Zm9yCisgICAgICAgIGN1c3RvbSBwcm90b2NvbHMuCisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVBy b3RvY29sTWFuYWdlcjo6cmVnaXN0ZXJTY2hlbWUpOiBVc2UgZ190eXBlX2NsYXNzX3BlZWsgaW5z dGVhZCBvZiBnX3R5cGVfY2xhc3NfcmVmIHNpbmNlIHdlIGtub3cKKyAgICAgICAgdGhlIGNsYXNz IHdhcyBhbHJlYWR5IGNyZWF0ZWQgaW4gcmVnaXN0ZXJQcm90b2NvbENsYXNzKCkuIFNldHVwIGN1 c3RvbSBwcm90b2NvbHMgaW4gYWxsIGV4aXN0aW5nIHNlc3Npb25zLgorCiAyMDE3LTAxLTIwICBE YXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgUGFzc1JlZlB0 ciBmcm9tICJwYWdlIiBkaXJlY3Rvcnkgb2YgV2ViQ29yZSwgYWxzbyBkZXBsb3kgcmVmZXJlbmNl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9j b2xzL3NvdXAvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFnZXJT b3VwLmNwcAppbmRleCAxM2EwMjhhNDJiNy4uNDNhMDNiOGNiOGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9zb3VwL0N1c3RvbVByb3Rv Y29sTWFuYWdlclNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1 c3RvbVByb3RvY29scy9zb3VwL0N1c3RvbVByb3RvY29sTWFuYWdlclNvdXAuY3BwCkBAIC03Nyw2 ICs3Nyw3IEBAIHByaXZhdGU6CiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6cmVnaXN0ZXJQ cm90b2NvbENsYXNzKCkKIHsKICAgICBzdGF0aWNfY2FzdDxXZWJLaXRTb3VwUmVxdWVzdEdlbmVy aWNDbGFzcyo+KGdfdHlwZV9jbGFzc19yZWYoV0VCS0lUX1RZUEVfU09VUF9SRVFVRVNUX0dFTkVS SUMpKS0+Y2xpZW50ID0gJkN1c3RvbVByb3RvY29sUmVxdWVzdENsaWVudDo6c2luZ2xldG9uKCk7 CisgICAgU291cE5ldHdvcmtTZXNzaW9uOjpzZXRDdXN0b21Qcm90b2NvbFJlcXVlc3RUeXBlKFdF QktJVF9UWVBFX1NPVVBfUkVRVUVTVF9HRU5FUklDKTsKIH0KIAogdm9pZCBDdXN0b21Qcm90b2Nv bE1hbmFnZXI6OnJlZ2lzdGVyU2NoZW1lKGNvbnN0IFN0cmluZyYgc2NoZW1lKQpAQCAtODksOSAr OTAsMTMgQEAgdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnJlZ2lzdGVyU2NoZW1lKGNvbnN0 IFN0cmluZyYgc2NoZW1lKQogICAgIGdfcHRyX2FycmF5X2FkZChtX3JlZ2lzdGVyZWRTY2hlbWVz LmdldCgpLCBnX3N0cmR1cChzY2hlbWUudXRmOCgpLmRhdGEoKSkpOwogICAgIGdfcHRyX2FycmF5 X2FkZChtX3JlZ2lzdGVyZWRTY2hlbWVzLmdldCgpLCBudWxscHRyKTsKIAotICAgIGF1dG8qIGdl bmVyaWNSZXF1ZXN0Q2xhc3MgPSBzdGF0aWNfY2FzdDxTb3VwUmVxdWVzdENsYXNzKj4oZ190eXBl X2NsYXNzX3JlZihXRUJLSVRfVFlQRV9TT1VQX1JFUVVFU1RfR0VORVJJQykpOworICAgIGF1dG8q IGdlbmVyaWNSZXF1ZXN0Q2xhc3MgPSBzdGF0aWNfY2FzdDxTb3VwUmVxdWVzdENsYXNzKj4oZ190 eXBlX2NsYXNzX3BlZWsoV0VCS0lUX1RZUEVfU09VUF9SRVFVRVNUX0dFTkVSSUMpKTsKKyAgICBB U1NFUlQoZ2VuZXJpY1JlcXVlc3RDbGFzcyk7CiAgICAgZ2VuZXJpY1JlcXVlc3RDbGFzcy0+c2No ZW1lcyA9IGNvbnN0X2Nhc3Q8Y29uc3QgY2hhcioqPihyZWludGVycHJldF9jYXN0PGNoYXIqKj4o bV9yZWdpc3RlcmVkU2NoZW1lcy0+cGRhdGEpKTsKLSAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1 cmVfYnlfdHlwZShOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigp LmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuc291cFNlc3Npb24oKSwgV0VCS0lUX1RZ UEVfU09VUF9SRVFVRVNUX0dFTkVSSUMpOworICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6Zm9y RWFjaChbXShjb25zdCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24pIHsK KyAgICAgICAgaWYgKGF1dG8qIHNvdXBTZXNzaW9uID0gc2Vzc2lvbi5zb3VwTmV0d29ya1Nlc3Np b24oKSkKKyAgICAgICAgICAgIHNvdXBTZXNzaW9uLT5zZXR1cEN1c3RvbVByb3RvY29scygpOwor ICAgIH0pOwogfQogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6dW5yZWdpc3RlclNjaGVt ZShjb25zdCBTdHJpbmcmKQo=