176386 2017-09-05 11:23:03 -0700 Use a single network storage session for stateless connections 2018-01-17 11:25:36 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=177393 https://bugs.webkit.org/show_bug.cgi?id=177394 InRadar P2 Normal --- 175232 1 bfulgham bfulgham achristensen bfulgham rniwa webkit-bug-importer wilander oldest_to_newest 1345536 0 bfulgham 2017-09-05 11:23:03 -0700 In Bug 175232 I added a third "cookieless" network storage session. Instead, we should just use a single "stateless" session for credential-less and cookie-less connections. This is being done as a separate path because it affects more code paths than the change I was completing in Bug 175232. 1345560 1 webkit-bug-importer 2017-09-05 12:24:56 -0700 <rdar://problem/34262148> 1345566 2 319923 bfulgham 2017-09-05 12:30:58 -0700 Created attachment 319923 Patch 1345600 3 319923 achristensen 2017-09-05 13:08:12 -0700 Comment on attachment 319923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=319923&action=review > Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm:611 > + // FIXME(176386): Use a single storage session for credentialless and cookieless transactions. This comment is done now. 1345631 4 bfulgham 2017-09-05 13:41:34 -0700 Committed r221632: <http://trac.webkit.org/changeset/221632> 1351857 5 wilander 2017-09-22 15:53:39 -0700 This change caused regressions. See https://bugs.webkit.org/show_bug.cgi?id=177393. 1352298 6 bfulgham 2017-09-25 12:02:44 -0700 *** Bug 177448 has been marked as a duplicate of this bug. *** 1390123 7 wilander 2018-01-17 11:25:17 -0800 This patch's intended change was finally achieved by https://bugs.webkit.org/show_bug.cgi?id=177394. 319923 2017-09-05 12:30:58 -0700 2017-09-05 13:08:12 -0700 Patch bug-176386-20170905123057.patch text/plain 9370 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjE2MjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE3LTA5LTA1ICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBhIHNpbmdsZSBuZXR3b3Jr IHN0b3JhZ2Ugc2Vzc2lvbiBmb3Igc3RhdGVsZXNzIGNvbm5lY3Rpb25zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzYzODYKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzM0MjYyMTQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENoYW5nZSB0aGUgbmFtZSBvZiAnbV9kYXRhVGFza01hcFdpdGhvdXRDcmVk ZW50aWFscycgdG8gJ21fZGF0YVRhc2tNYXBXaXRob3V0U3RhdGUnCisgICAgICAgIHRvIHJlZmxl Y3QgdGhhdCB0aGUgZGF0YSB0YXNrcyBkbyBub3QgaW52b2x2ZSBjcmVkZW50aWFsIG9yIGNvb2tp ZSBzdG9yYWdlLiBEaXR0byBmb3IKKyAgICAgICAgdGhlIGNoYW5nZSBmcm9tICdtX3Nlc3Npb25X SXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UnIHRvICdtX3N0YXRlbGVzc1Nlc3Npb24nLgorCisgICAg ICAgIFRoaXMgdXBkYXRlIHNob3VsZCBub3QgY2hhbmdlIGJlaGF2aW9yLCB1bmxlc3Mgc29tZSBz dGF0ZWxlc3Mgc2Vzc2lvbnMgd2VyZSBkZXBlbmRpbmcKKyAgICAgICAgb24gY29va2llcyB0byBi ZSBwZXJzaXN0ZW50ICh3aGljaCB3b3VsZCBiZSBhIGJ1ZyEpCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0RhdGFUYXNrQ29jb2E6Ok5ldHdvcmtEYXRhVGFza0NvY29hKTogVXBkYXRlIGZvciBu ZXcgdmFyaWFibGUgbmFtZXMuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFza0NvY29h Ojp+TmV0d29ya0RhdGFUYXNrQ29jb2EpOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nl c3Npb25Db2NvYTo6TmV0d29ya1Nlc3Npb25Db2NvYSk6IFVwZGF0ZSB0aGUgY29uZmlndXJhdGlv biB0byBibG9jaworICAgICAgICBjb29raWVzIGFzIHdlbGwuCisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtTZXNzaW9uQ29jb2E6OmludmFsaWRhdGVBbmRDYW5jZWwpOiBVcGRhdGUgZm9yIG5ldyBu YW1lcy4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Db2NvYTo6Y2xlYXJDcmVkZW50 aWFscyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNvY29hOjpkYXRh VGFza0ZvcklkZW50aWZpZXIpOiBEaXR0by4KKwogMjAxNy0wOS0wNSAgWW91c3VrZSBLaW1vdG8g IDx5b3VzdWtlLmtpbW90b0Bzb255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIEFkZCBOZXR3 b3JrIFByb2Nlc3MgZmlsZXMgZm9yIHdpbmNhaXJvIHdlYmtpdApJbmRleDogU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0Nv Y29hLm1tCShyZXZpc2lvbiAyMjE2MTUpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEs NSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTYtMjAxNyBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTExNiw5ICsxMTYs OSBAQCBOZXR3b3JrRGF0YVRhc2tDb2NvYTo6TmV0d29ya0RhdGFUYXNrQ29jCiAgICAgICAgIEFT U0VSVCghY29jb2FTZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRoQ3JlZGVudGlhbHMuY29udGFpbnMo W21fdGFzayB0YXNrSWRlbnRpZmllcl0pKTsKICAgICAgICAgY29jb2FTZXNzaW9uLm1fZGF0YVRh c2tNYXBXaXRoQ3JlZGVudGlhbHMuYWRkKFttX3Rhc2sgdGFza0lkZW50aWZpZXJdLCB0aGlzKTsK ICAgICB9IGVsc2UgewotICAgICAgICBtX3Rhc2sgPSBbY29jb2FTZXNzaW9uLm1fc2Vzc2lvbldp dGhvdXRDcmVkZW50aWFsU3RvcmFnZSBkYXRhVGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdF07Ci0g ICAgICAgIEFTU0VSVCghY29jb2FTZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlh bHMuY29udGFpbnMoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pKTsKLSAgICAgICAgY29jb2FTZXNz aW9uLm1fZGF0YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlhbHMuYWRkKFttX3Rhc2sgdGFza0lkZW50 aWZpZXJdLCB0aGlzKTsKKyAgICAgICAgbV90YXNrID0gW2NvY29hU2Vzc2lvbi5tX3N0YXRlbGVz c1Nlc3Npb24gZGF0YVRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3RdOworICAgICAgICBBU1NFUlQo IWNvY29hU2Vzc2lvbi5tX2RhdGFUYXNrTWFwV2l0aG91dFN0YXRlLmNvbnRhaW5zKFttX3Rhc2sg dGFza0lkZW50aWZpZXJdKSk7CisgICAgICAgIGNvY29hU2Vzc2lvbi5tX2RhdGFUYXNrTWFwV2l0 aG91dFN0YXRlLmFkZChbbV90YXNrIHRhc2tJZGVudGlmaWVyXSwgdGhpcyk7CiAgICAgfQogICAg IExPRyhOZXR3b3JrU2Vzc2lvbiwgIiVsbHUgQ3JlYXRpbmcgTmV0d29ya0RhdGFUYXNrIHdpdGgg VVJMICVzIiwgW21fdGFzayB0YXNrSWRlbnRpZmllcl0sIG5zUmVxdWVzdC5VUkwuYWJzb2x1dGVT dHJpbmcuVVRGOFN0cmluZyk7CiAKQEAgLTE0NCw4ICsxNDQsOCBAQCBOZXR3b3JrRGF0YVRhc2tD b2NvYTo6fk5ldHdvcmtEYXRhVGFza0NvCiAgICAgICAgIEFTU0VSVChjb2NvYVNlc3Npb24ubV9k YXRhVGFza01hcFdpdGhDcmVkZW50aWFscy5nZXQoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pID09 IHRoaXMpOwogICAgICAgICBjb2NvYVNlc3Npb24ubV9kYXRhVGFza01hcFdpdGhDcmVkZW50aWFs cy5yZW1vdmUoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pOwogICAgIH0gZWxzZSB7Ci0gICAgICAg IEFTU0VSVChjb2NvYVNlc3Npb24ubV9kYXRhVGFza01hcFdpdGhvdXRDcmVkZW50aWFscy5nZXQo W21fdGFzayB0YXNrSWRlbnRpZmllcl0pID09IHRoaXMpOwotICAgICAgICBjb2NvYVNlc3Npb24u bV9kYXRhVGFza01hcFdpdGhvdXRDcmVkZW50aWFscy5yZW1vdmUoW21fdGFzayB0YXNrSWRlbnRp Zmllcl0pOworICAgICAgICBBU1NFUlQoY29jb2FTZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRob3V0 U3RhdGUuZ2V0KFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKSA9PSB0aGlzKTsKKyAgICAgICAgY29j b2FTZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRob3V0U3RhdGUucmVtb3ZlKFttX3Rhc2sgdGFza0lk ZW50aWZpZXJdKTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5oCShyZXZpc2lvbiAy MjE2MTUpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmln aHQgKEMpIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0 IChDKSAyMDE2LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03MCwxMyArNzAsMTMgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGNsZWFyQ3JlZGVudGlhbHMoKSBvdmVycmlkZTsKIAogICAgIEhhc2hNYXA8TmV0d29ya0Rh dGFUYXNrQ29jb2E6OlRhc2tJZGVudGlmaWVyLCBOZXR3b3JrRGF0YVRhc2tDb2NvYSo+IG1fZGF0 YVRhc2tNYXBXaXRoQ3JlZGVudGlhbHM7Ci0gICAgSGFzaE1hcDxOZXR3b3JrRGF0YVRhc2tDb2Nv YTo6VGFza0lkZW50aWZpZXIsIE5ldHdvcmtEYXRhVGFza0NvY29hKj4gbV9kYXRhVGFza01hcFdp dGhvdXRDcmVkZW50aWFsczsKKyAgICBIYXNoTWFwPE5ldHdvcmtEYXRhVGFza0NvY29hOjpUYXNr SWRlbnRpZmllciwgTmV0d29ya0RhdGFUYXNrQ29jb2EqPiBtX2RhdGFUYXNrTWFwV2l0aG91dFN0 YXRlOwogICAgIEhhc2hNYXA8TmV0d29ya0RhdGFUYXNrQ29jb2E6OlRhc2tJZGVudGlmaWVyLCBE b3dubG9hZElEPiBtX2Rvd25sb2FkTWFwOwogCiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbj4g bV9zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlOwogICAgIFJldGFpblB0cjxXS05ldHdvcmtT ZXNzaW9uRGVsZWdhdGU+IG1fc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZURlbGVnYXRlOwot ICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb24+IG1fc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3Rv cmFnZTsKLSAgICBSZXRhaW5QdHI8V0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlPiBtX3Nlc3Npb25X aXRob3V0Q3JlZGVudGlhbFN0b3JhZ2VEZWxlZ2F0ZTsKKyAgICBSZXRhaW5QdHI8TlNVUkxTZXNz aW9uPiBtX3N0YXRlbGVzc1Nlc3Npb247CisgICAgUmV0YWluUHRyPFdLTmV0d29ya1Nlc3Npb25E ZWxlZ2F0ZT4gbV9zdGF0ZWxlc3NTZXNzaW9uRGVsZWdhdGU7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHJldmlzaW9uIDIyMTYxNSkKKysrIFNv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQko d29ya2luZyBjb3B5KQpAQCAtNTk4LDExICs1OTgsMTggQEAgTmV0d29ya1Nlc3Npb25Db2NvYTo6 TmV0d29ya1Nlc3Npb25Db2NvYQogICAgIG1fc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZURl bGVnYXRlID0gYWRvcHROUyhbW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBhbGxvY10gaW5pdFdp dGhOZXR3b3JrU2Vzc2lvbjoqdGhpcyB3aXRoQ3JlZGVudGlhbHM6dHJ1ZV0pOwogICAgIG1fc2Vz c2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZSA9IFtOU1VSTFNlc3Npb24gc2Vzc2lvbldpdGhDb25m aWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24gZGVsZWdhdGU6c3RhdGljX2Nhc3Q8aWQ+KG1fc2Vzc2lv bldpdGhDcmVkZW50aWFsU3RvcmFnZURlbGVnYXRlLmdldCgpKSBkZWxlZ2F0ZVF1ZXVlOltOU09w ZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV1dOwogCisgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiQ3Jl YXRlZCBOZXR3b3JrU2Vzc2lvbiB3aXRoIGNvb2tpZUFjY2VwdFBvbGljeSAlbHUiLCBjb25maWd1 cmF0aW9uLkhUVFBDb29raWVTdG9yYWdlLmNvb2tpZUFjY2VwdFBvbGljeSk7CisKICAgICBjb25m aWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID0gbmlsOwogICAgIGNvbmZpZ3VyYXRpb24u X3Nob3VsZFNraXBQcmVmZXJyZWRDbGllbnRDZXJ0aWZpY2F0ZUxvb2t1cCA9IFlFUzsKLSAgICBt X3Nlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2VEZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS05l dHdvcmtTZXNzaW9uRGVsZWdhdGUgYWxsb2NdIGluaXRXaXRoTmV0d29ya1Nlc3Npb246KnRoaXMg d2l0aENyZWRlbnRpYWxzOmZhbHNlXSk7Ci0gICAgbV9zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlID0gW05TVVJMU2Vzc2lvbiBzZXNzaW9uV2l0aENvbmZpZ3VyYXRpb246Y29uZmlndXJh dGlvbiBkZWxlZ2F0ZTpzdGF0aWNfY2FzdDxpZD4obV9zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxT dG9yYWdlRGVsZWdhdGUuZ2V0KCkpIGRlbGVnYXRlUXVldWU6W05TT3BlcmF0aW9uUXVldWUgbWFp blF1ZXVlXV07Ci0gICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiQ3JlYXRlZCBOZXR3b3JrU2Vzc2lv biB3aXRoIGNvb2tpZUFjY2VwdFBvbGljeSAlbHUiLCBjb25maWd1cmF0aW9uLkhUVFBDb29raWVT dG9yYWdlLmNvb2tpZUFjY2VwdFBvbGljeSk7CisgICAgY29uZmlndXJhdGlvbi5IVFRQQ29va2ll U3RvcmFnZSA9IG5pbDsKKyAgICBjb25maWd1cmF0aW9uLkhUVFBDb29raWVBY2NlcHRQb2xpY3kg PSBOU0hUVFBDb29raWVBY2NlcHRQb2xpY3lOZXZlcjsKKworICAgIG1fc3RhdGVsZXNzU2Vzc2lv bkRlbGVnYXRlID0gYWRvcHROUyhbW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBhbGxvY10gaW5p dFdpdGhOZXR3b3JrU2Vzc2lvbjoqdGhpcyB3aXRoQ3JlZGVudGlhbHM6ZmFsc2VdKTsKKyAgICBt X3N0YXRlbGVzc1Nlc3Npb24gPSBbTlNVUkxTZXNzaW9uIHNlc3Npb25XaXRoQ29uZmlndXJhdGlv bjpjb25maWd1cmF0aW9uIGRlbGVnYXRlOnN0YXRpY19jYXN0PGlkPihtX3N0YXRlbGVzc1Nlc3Np b25EZWxlZ2F0ZS5nZXQoKSkgZGVsZWdhdGVRdWV1ZTpbTlNPcGVyYXRpb25RdWV1ZSBtYWluUXVl dWVdXTsKKworICAgIC8vIEZJWE1FKDE3NjM4Nik6IFVzZSBhIHNpbmdsZSBzdG9yYWdlIHNlc3Np b24gZm9yIGNyZWRlbnRpYWxsZXNzIGFuZCBjb29raWVsZXNzIHRyYW5zYWN0aW9ucy4KKwogfQog CiBOZXR3b3JrU2Vzc2lvbkNvY29hOjp+TmV0d29ya1Nlc3Npb25Db2NvYSgpCkBAIC02MTQsMjAg KzYyMSwyMCBAQCB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmludmFsaWRhdGVBbmRDCiAgICAg TmV0d29ya1Nlc3Npb246OmludmFsaWRhdGVBbmRDYW5jZWwoKTsKIAogICAgIFttX3Nlc3Npb25X aXRoQ3JlZGVudGlhbFN0b3JhZ2UgaW52YWxpZGF0ZUFuZENhbmNlbF07Ci0gICAgW21fc2Vzc2lv bldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZSBpbnZhbGlkYXRlQW5kQ2FuY2VsXTsKKyAgICBbbV9z dGF0ZWxlc3NTZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwogICAgIFttX3Nlc3Npb25XaXRo Q3JlZGVudGlhbFN0b3JhZ2VEZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwotICAgIFttX3Nl c3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2VEZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRd OworICAgIFttX3N0YXRlbGVzc1Nlc3Npb25EZWxlZ2F0ZSBzZXNzaW9uSW52YWxpZGF0ZWRdOwog fQogCiB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmNsZWFyQ3JlZGVudGlhbHMoKQogewogI2lm ICFVU0UoQ1JFREVOVElBTF9TVE9SQUdFX1dJVEhfTkVUV09SS19TRVNTSU9OKQogICAgIEFTU0VS VChtX2RhdGFUYXNrTWFwV2l0aENyZWRlbnRpYWxzLmlzRW1wdHkoKSk7Ci0gICAgQVNTRVJUKG1f ZGF0YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlhbHMuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlQobV9k YXRhVGFza01hcFdpdGhvdXRTdGF0ZS5pc0VtcHR5KCkpOwogICAgIEFTU0VSVChtX2Rvd25sb2Fk TWFwLmlzRW1wdHkoKSk7CiAgICAgLy8gRklYTUU6IFVzZSByZXNldFdpdGhDb21wbGV0aW9uSGFu ZGxlciBpbnN0ZWFkLgogICAgIG1fc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFnZSA9IFtOU1VS TFNlc3Npb24gc2Vzc2lvbldpdGhDb25maWd1cmF0aW9uOm1fc2Vzc2lvbldpdGhDcmVkZW50aWFs U3RvcmFnZS5nZXQoKS5jb25maWd1cmF0aW9uIGRlbGVnYXRlOnN0YXRpY19jYXN0PGlkPihtX3Nl c3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2VEZWxlZ2F0ZS5nZXQoKSkgZGVsZWdhdGVRdWV1ZTpb TlNPcGVyYXRpb25RdWV1ZSBtYWluUXVldWVdXTsKLSAgICBtX3Nlc3Npb25XaXRob3V0Q3JlZGVu dGlhbFN0b3JhZ2UgPSBbTlNVUkxTZXNzaW9uIHNlc3Npb25XaXRoQ29uZmlndXJhdGlvbjptX3Nl c3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UuZ2V0KCkuY29uZmlndXJhdGlvbiBkZWxlZ2F0 ZTpzdGF0aWNfY2FzdDxpZD4obV9zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlRGVsZWdh dGUuZ2V0KCkpIGRlbGVnYXRlUXVldWU6W05TT3BlcmF0aW9uUXVldWUgbWFpblF1ZXVlXV07Cisg ICAgbV9zdGF0ZWxlc3NTZXNzaW9uID0gW05TVVJMU2Vzc2lvbiBzZXNzaW9uV2l0aENvbmZpZ3Vy YXRpb246bV9zdGF0ZWxlc3NTZXNzaW9uLmdldCgpLmNvbmZpZ3VyYXRpb24gZGVsZWdhdGU6c3Rh dGljX2Nhc3Q8aWQ+KG1fc3RhdGVsZXNzU2Vzc2lvbkRlbGVnYXRlLmdldCgpKSBkZWxlZ2F0ZVF1 ZXVlOltOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV1dOwogI2VuZGlmCiB9CiAKQEAgLTYzNiw3 ICs2NDMsNyBAQCBOZXR3b3JrRGF0YVRhc2tDb2NvYSogTmV0d29ya1Nlc3Npb25Db2NvCiAgICAg QVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKICAgICBpZiAoc3RvcmVkQ3JlZGVudGlhbHMgPT0g V2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMpCiAgICAg ICAgIHJldHVybiBtX2RhdGFUYXNrTWFwV2l0aENyZWRlbnRpYWxzLmdldCh0YXNrSWRlbnRpZmll cik7Ci0gICAgcmV0dXJuIG1fZGF0YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlhbHMuZ2V0KHRhc2tJ ZGVudGlmaWVyKTsKKyAgICByZXR1cm4gbV9kYXRhVGFza01hcFdpdGhvdXRTdGF0ZS5nZXQodGFz a0lkZW50aWZpZXIpOwogfQogCiB2b2lkIE5ldHdvcmtTZXNzaW9uQ29jb2E6OmFkZERvd25sb2Fk SUQoTmV0d29ya0RhdGFUYXNrQ29jb2E6OlRhc2tJZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyLCBE b3dubG9hZElEIGRvd25sb2FkSUQpCg==