193707 2019-01-22 21:22:54 -0800 [SOUP] Clean up NetworkStorageSession 2019-02-05 08:03:29 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro achristensen bugs-noreply cgarcia commit-queue machucovjorge mcatanzaro webkit-bug-importer oldest_to_newest 1497214 0 mcatanzaro 2019-01-22 21:22:54 -0800 After r240292 there are many cleanups we should do to NetworkStorageSession 1497224 1 359850 mcatanzaro 2019-01-22 21:37:05 -0800 Created attachment 359850 Patch 1497366 2 359850 commit-queue 2019-01-23 09:24:25 -0800 Comment on attachment 359850 Patch Clearing flags on attachment: 359850 Committed r240340: <https://trac.webkit.org/changeset/240340> 1497367 3 commit-queue 2019-01-23 09:24:26 -0800 All reviewed patches have been landed. Closing bug. 359850 2019-01-22 21:37:05 -0800 2019-01-23 09:24:25 -0800 Patch bug-193707-20190122233704.patch text/plain 15531 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjU5MWE0MzVlY2QyOTA0 YTczZGM1NjhiYWI1NzgxOTQyYTdlNzNlZS4uMmZlODY5ZmU1OWE0ZDhlYjAyNTUyM2QxMDQ1ZWM3 YjlmODgwNmRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAxLTIyICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0g Q2xlYW4gdXAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiBub3cgYWx3YXlz IGhhcyBhIFNvdXBOZXR3b3JrU2Vzc2lvbiwgc28gd2UgY2FuIHJlbW92ZSBhIGxvdCBvZgorICAg ICAgICBjb21wbGV4aXR5IHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZC4gZ2V0T3JDcmVhdGVTb3Vw TmV0d29ya1Nlc3Npb24gY2FuIGdvIGF3YXkgYmVjYXVzZSB3ZQorICAgICAgICBrbm93IHRoZSBz ZXNzaW9uIGhhcyBhbHdheXMgYWxyZWFkeSBiZWVuIGNyZWF0ZWQuIFRoZSBzb3VwTmV0d29ya1Nl c3Npb24gZ2V0dGVyIGNhbiBub3cKKyAgICAgICAgcmV0dXJuIGEgcmVmZXJlbmNlIHJhdGhlciB0 aGFuIGEgcG9pbnRlciwgYmVjYXVzZSBpdCB3aWxsIG5ldmVyIGJlIE5VTEwgZXhjZXB0IGFmdGVy IGl0IGhhcworICAgICAgICBiZWVuIGNsZWFyZWQgd2l0aCBjbGVhclNvdXBOZXR3b3JrU2Vzc2lv biAocmVuYW1lZCksIGFuZCB0aGF0IHNob3VsZCBvbmx5IGhhcHBlbiBpbW1lZGlhdGVseQorICAg ICAgICBiZWZvcmUgcHJvY2VzcyB0ZXJtaW5hdGlvbiBhZnRlciBub3RoaW5nIGVsc2UgaXMgdXNp bmcgaXQuIENvb2tpZSBqYXIgc3luY2luZyBjYW4gYWxzbyBnbworICAgICAgICBhd2F5OyB0aGUg TmV0d29ya1N0b3JhZ2VTZXNzaW9uIGNhbiBub3cgcmVseSBvbiB0aGUgU291cE5ldHdvcmtTZXNz aW9uIHRvIGV4aXN0IGFuZCBqdXN0CisgICAgICAgIHVzZSBpdHMgY29va2llIGphci4KKworICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg6CisgICAgICAg IChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNvdXBOZXR3b3JrU2Vzc2lvbiBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1Jlc29sdmVR dWV1ZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE5TUmVzb2x2ZVF1ZXVlU291cDo6dXBk YXRlSXNVc2luZ1Byb3h5KToKKyAgICAgICAgKFdlYkNvcmU6OkROU1Jlc29sdmVRdWV1ZVNvdXA6 OnBsYXRmb3JtUmVzb2x2ZSk6CisgICAgICAgIChXZWJDb3JlOjpETlNSZXNvbHZlUXVldWVTb3Vw OjpyZXNvbHZlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0b3Jh Z2VTZXNzaW9uU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Np b246Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3Rv cmFnZVNlc3Npb246On5OZXR3b3JrU3RvcmFnZVNlc3Npb24pOgorICAgICAgICAoV2ViQ29yZTo6 TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzb3VwTmV0d29ya1Nlc3Npb24gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjbGVhclNvdXBOZXR3b3JrU2Vzc2lv bik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZVN0b3Jh Z2UgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRD b29raWVTdG9yYWdlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 Z2V0T3JDcmVhdGVTb3VwTmV0d29ya1Nlc3Npb24gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjbGVhclNvdXBOZXR3b3JrU2Vzc2lvbkFu ZENvb2tpZVN0b3JhZ2UpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291 cC9Tb2NrZXRTdHJlYW1IYW5kbGVJbXBsU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTb2Nr ZXRTdHJlYW1IYW5kbGVJbXBsOjpjcmVhdGUpOgorCiAyMDE5LTAxLTIyICBEZXZpbiBSb3Vzc28g IDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OndpbGxFdmFsdWF0ZVNjcmlwdCBzaG91bGQgaW5jbHVkZSBjb2x1bW4g bnVtYmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCmluZGV4IGFkM2JkMTAyNDUzZGZkYTZiNmM1OWIyZTRlMmFiNzZjMTZiNGFm ZjIuLjhhYTUwZDlmNGE2MmRmNzY4OTM1ZDBhYmQ2YjViYWMyMTcyZjkxNDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTktMDEtMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFy b0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtTT1VQXSBDbGVhbiB1cCBOZXR3b3JrU3RvcmFnZVNl c3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MzcwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl c3RvcmUgYW4gaW1wb3J0YW50IGNhbGwgdG8gY2xlYXJTb3VwTmV0d29ya1Nlc3Npb24gdGhhdCB3 YXMgcmVtb3ZlZCBpbiByMjQwMjkyLiBBbHNvLAorICAgICAgICBhZGFwdCB0byBOZXR3b3JrU3Rv cmFnZVNlc3Npb25zIEFQSSBjaGFuZ2VzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ3Vz dG9tUHJvdG9jb2xzL3NvdXAvTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291cC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjo6cmVnaXN0ZXJTY2hl bWUpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Byb2Nlc3NNYWluU291 cC5jcHA6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1NvdXAu Y3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6dXNlclByZWZlcnJlZExhbmd1 YWdlc0NoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6c2V0TmV0d29y a1Byb3h5U2V0dGluZ3MpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nl c3Npb25Tb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Tb3VwOjpzb3Vw U2Vzc2lvbiBjb25zdCk6CisKIDIwMTktMDEtMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBmaXggR1RL L1dQRSBib3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05l dHdvcmtTdG9yYWdlU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9O ZXR3b3JrU3RvcmFnZVNlc3Npb24uaAppbmRleCA0NTdlNDM1ZTQzNWM2NmRiMzU4YzEwMDU2OTMy ZjJkOWMxZWU3YmI2Li4wNzg5Njg3NDI2MmUyMTE0NmY0YWQwMjZhMmQ2ZGU1MmM4MzdmNGUxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdl U2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0 b3JhZ2VTZXNzaW9uLmgKQEAgLTk3LDkgKzk3LDggQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQ T1JUIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbihQQUw6OlNlc3Npb25JRCwgc3RkOjp1bmlxdWVfcHRy PFNvdXBOZXR3b3JrU2Vzc2lvbj4mJik7CiAgICAgfk5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpOwog Ci0gICAgU291cE5ldHdvcmtTZXNzaW9uKiBzb3VwTmV0d29ya1Nlc3Npb24oKSBjb25zdCB7IHJl dHVybiBtX3Nlc3Npb24uZ2V0KCk7IH07Ci0gICAgU291cE5ldHdvcmtTZXNzaW9uJiBnZXRPckNy ZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpIGNvbnN0OwotICAgIHZvaWQgY2xlYXJTb3VwTmV0d29y a1Nlc3Npb25BbmRDb29raWVTdG9yYWdlKCk7CisgICAgU291cE5ldHdvcmtTZXNzaW9uJiBzb3Vw TmV0d29ya1Nlc3Npb24oKSBjb25zdDsKKyAgICB2b2lkIGNsZWFyU291cE5ldHdvcmtTZXNzaW9u KCk7CiAgICAgU291cENvb2tpZUphciogY29va2llU3RvcmFnZSgpIGNvbnN0OwogICAgIHZvaWQg c2V0Q29va2llU3RvcmFnZShTb3VwQ29va2llSmFyKik7CiAgICAgdm9pZCBzZXRDb29raWVPYnNl cnZlckhhbmRsZXIoRnVuY3Rpb248dm9pZCAoKT4mJik7CkBAIC0xNjgsNyArMTY3LDYgQEAgcHJp dmF0ZToKICAgICBzdGF0aWMgdm9pZCBjb29raWVzRGlkQ2hhbmdlKE5ldHdvcmtTdG9yYWdlU2Vz c2lvbiopOwogCiAgICAgbXV0YWJsZSBzdGQ6OnVuaXF1ZV9wdHI8U291cE5ldHdvcmtTZXNzaW9u PiBtX3Nlc3Npb247Ci0gICAgR1JlZlB0cjxTb3VwQ29va2llSmFyPiBtX2Nvb2tpZVN0b3JhZ2U7 CiAgICAgRnVuY3Rpb248dm9pZCAoKT4gbV9jb29raWVPYnNlcnZlckhhbmRsZXI7CiAjZWxpZiBV U0UoQ1VSTCkKICAgICBSZWZQdHI8TmV0d29ya2luZ0NvbnRleHQ+IG1fY29udGV4dDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9ETlNSZXNvbHZlUXVl dWVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9ETlNSZXNv bHZlUXVldWVTb3VwLmNwcAppbmRleCBlZDJjNGViNWI4ZGFjYzA1NzJlMzFiOWM0NjdhZGE5MGE3 MzRkNzFjLi5mMzk5ODJjY2Y0NmMyYzhjZDIwMDI5ZTMzZWE4ZDg4MmFjOTQzZWU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvRE5TUmVzb2x2ZVF1ZXVl U291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1Jl c29sdmVRdWV1ZVNvdXAuY3BwCkBAIC05Miw3ICs5Miw3IEBAIHZvaWQgRE5TUmVzb2x2ZVF1ZXVl U291cDo6c2V0R2xvYmFsRGVmYXVsdE5ldHdvcmtTdG9yYWdlU2Vzc2lvbkFjY2Vzc29yKEZ1bmN0 aW9uCiB2b2lkIEROU1Jlc29sdmVRdWV1ZVNvdXA6OnVwZGF0ZUlzVXNpbmdQcm94eSgpCiB7CiAg ICAgR1JlZlB0cjxHUHJveHlSZXNvbHZlcj4gcmVzb2x2ZXI7Ci0gICAgZ19vYmplY3RfZ2V0KGds b2JhbERlZmF1bHROZXR3b3JrU3RvcmFnZVNlc3Npb25BY2Nlc3NvcigpKCkuZ2V0T3JDcmVhdGVT b3VwTmV0d29ya1Nlc3Npb24oKS5zb3VwU2Vzc2lvbigpLCAicHJveHktcmVzb2x2ZXIiLCAmcmVz b2x2ZXIub3V0UHRyKCksIG51bGxwdHIpOworICAgIGdfb2JqZWN0X2dldChnbG9iYWxEZWZhdWx0 TmV0d29ya1N0b3JhZ2VTZXNzaW9uQWNjZXNzb3IoKSgpLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNv dXBTZXNzaW9uKCksICJwcm94eS1yZXNvbHZlciIsICZyZXNvbHZlci5vdXRQdHIoKSwgbnVsbHB0 cik7CiAgICAgQVNTRVJUKHJlc29sdmVyKTsKIAogICAgIGdfcHJveHlfcmVzb2x2ZXJfbG9va3Vw X2FzeW5jKHJlc29sdmVyLmdldCgpLCAiaHR0cDovL2V4YW1wbGUuY29tLyIsIG51bGxwdHIsIHBy b3h5UmVzb2x2ZWRGb3JIdHRwVXJpQ2FsbGJhY2ssICZtX2lzVXNpbmdQcm94eSk7CkBAIC0xNzUs NyArMTc1LDcgQEAgdm9pZCBETlNSZXNvbHZlUXVldWVTb3VwOjpwbGF0Zm9ybVJlc29sdmUoY29u c3QgU3RyaW5nJiBob3N0bmFtZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCi0g ICAgc291cF9zZXNzaW9uX3ByZWZldGNoX2RucyhnbG9iYWxEZWZhdWx0TmV0d29ya1N0b3JhZ2VT ZXNzaW9uQWNjZXNzb3IoKSgpLmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuc291cFNl c3Npb24oKSwgaG9zdG5hbWUudXRmOCgpLmRhdGEoKSwgbnVsbHB0ciwgcmVzb2x2ZWRDYWxsYmFj aywgbnVsbHB0cik7CisgICAgc291cF9zZXNzaW9uX3ByZWZldGNoX2RucyhnbG9iYWxEZWZhdWx0 TmV0d29ya1N0b3JhZ2VTZXNzaW9uQWNjZXNzb3IoKSgpLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNv dXBTZXNzaW9uKCksIGhvc3RuYW1lLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIsIHJlc29sdmVkQ2Fs bGJhY2ssIG51bGxwdHIpOwogfQogCiB2b2lkIEROU1Jlc29sdmVRdWV1ZVNvdXA6OnJlc29sdmUo Y29uc3QgU3RyaW5nJiBob3N0bmFtZSwgdWludDY0X3QgaWRlbnRpZmllciwgRE5TQ29tcGxldGlv bkhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlcikKQEAgLTE4NCw3ICsxODQsNyBAQCB2b2lkIERO U1Jlc29sdmVRdWV1ZVNvdXA6OnJlc29sdmUoY29uc3QgU3RyaW5nJiBob3N0bmFtZSwgdWludDY0 X3QgaWRlbnRpZmllciwgRAogCiAgICAgYXV0byBhZGRyZXNzID0gYWRvcHRHUmVmKHNvdXBfYWRk cmVzc19uZXcoaG9zdG5hbWUudXRmOCgpLmRhdGEoKSwgMCkpOwogICAgIGF1dG8gY2FuY2VsbGFi bGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXcoKSk7Ci0gICAgc291cF9hZGRyZXNzX3Jl c29sdmVfYXN5bmMoYWRkcmVzcy5nZXQoKSwgc291cF9zZXNzaW9uX2dldF9hc3luY19jb250ZXh0 KFdlYkNvcmU6Omdsb2JhbERlZmF1bHROZXR3b3JrU3RvcmFnZVNlc3Npb25BY2Nlc3NvcigpKCku Z2V0T3JDcmVhdGVTb3VwTmV0d29ya1Nlc3Npb24oKS5zb3VwU2Vzc2lvbigpKSwgY2FuY2VsbGFi bGUuZ2V0KCksIHJlc29sdmVkV2l0aE9ic2VydmVyQ2FsbGJhY2ssIHRoaXMpOworICAgIHNvdXBf YWRkcmVzc19yZXNvbHZlX2FzeW5jKGFkZHJlc3MuZ2V0KCksIHNvdXBfc2Vzc2lvbl9nZXRfYXN5 bmNfY29udGV4dChXZWJDb3JlOjpnbG9iYWxEZWZhdWx0TmV0d29ya1N0b3JhZ2VTZXNzaW9uQWNj ZXNzb3IoKSgpLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCkpLCBjYW5jZWxsYWJs ZS5nZXQoKSwgcmVzb2x2ZWRXaXRoT2JzZXJ2ZXJDYWxsYmFjaywgdGhpcyk7CiAKICAgICBnX29i amVjdF9zZXRfZGF0YShHX09CSkVDVChhZGRyZXNzLmdldCgpKSwgImlkZW50aWZpZXIiLCBHVUlO VF9UT19QT0lOVEVSKGlkZW50aWZpZXIpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL05ldHdvcmtTdG9yYWdlU2Vzc2lvblNvdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL05ldHdvcmtTdG9yYWdlU2Vzc2lvblNv dXAuY3BwCmluZGV4IGU3NTExM2E2Y2M4ZTAwMWJlMWNhNWI2MDY5NzlmNzZhODE4Mzg4ODAuLjNk YWUxYjA0NTFjZTUxM2Y3MWM0NTE3YjFiZjZhN2JkM2VkNDAwNmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9OZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3Vw LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0 b3JhZ2VTZXNzaW9uU291cC5jcHAKQEAgLTU3LDI2ICs1NywzMCBAQCBOZXR3b3JrU3RvcmFnZVNl c3Npb246Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIHN0 ZDo6dW5pcQogICAgIDogbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQogICAgICwgbV9zZXNzaW9uKFdU Rk1vdmUoc2Vzc2lvbikpCiB7Ci0gICAgc2V0Q29va2llU3RvcmFnZShtX3Nlc3Npb24gPyBtX3Nl c3Npb24tPmNvb2tpZUphcigpIDogbnVsbHB0cik7CisgICAgQVNTRVJUKG1fc2Vzc2lvbi0+Y29v a2llSmFyKCkpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3Nlc3Npb24tPmNvb2tp ZUphcigpLCAiY2hhbmdlZCIsIEdfQ0FMTEJBQ0soY29va2llc0RpZENoYW5nZSksIHRoaXMpOwog fQogCiBOZXR3b3JrU3RvcmFnZVNlc3Npb246On5OZXR3b3JrU3RvcmFnZVNlc3Npb24oKQogewot ICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hlZChtX2Nvb2tpZVN0b3JhZ2Uu Z2V0KCksIEdfU0lHTkFMX01BVENIX0RBVEEsIDAsIDAsIG51bGxwdHIsIG51bGxwdHIsIHRoaXMp OworICAgIGNsZWFyU291cE5ldHdvcmtTZXNzaW9uKCk7CiB9CiAKLVNvdXBOZXR3b3JrU2Vzc2lv biYgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpnZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigp IGNvbnN0CitTb3VwTmV0d29ya1Nlc3Npb24mIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c291cE5l dHdvcmtTZXNzaW9uKCkgY29uc3QKIHsKLSAgICBpZiAoIW1fc2Vzc2lvbikKLSAgICAgICAgbV9z ZXNzaW9uID0gc3RkOjptYWtlX3VuaXF1ZTxTb3VwTmV0d29ya1Nlc3Npb24+KG1fc2Vzc2lvbklE LCBtX2Nvb2tpZVN0b3JhZ2UuZ2V0KCkpOwotICAgIHJldHVybiAqbV9zZXNzaW9uOwotfQorICAg IEFTU0VSVChtX3Nlc3Npb24pOworICAgIHJldHVybiAqbV9zZXNzaW9uLmdldCgpOworfTsKIAot dm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNsZWFyU291cE5ldHdvcmtTZXNzaW9uQW5kQ29v a2llU3RvcmFnZSgpCit2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6Y2xlYXJTb3VwTmV0d29y a1Nlc3Npb24oKQogeworICAgIGlmIChtX3Nlc3Npb24pIHsKKyAgICAgICAgQVNTRVJUKG1fc2Vz c2lvbi0+Y29va2llSmFyKCkpOworICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0 X21hdGNoZWQobV9zZXNzaW9uLT5jb29raWVKYXIoKSwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwg MCwgbnVsbHB0ciwgbnVsbHB0ciwgdGhpcyk7CisgICAgfQorCiAgICAgbV9zZXNzaW9uID0gbnVs bHB0cjsKICAgICBtX2Nvb2tpZU9ic2VydmVySGFuZGxlciA9IG51bGxwdHI7Ci0gICAgbV9jb29r aWVTdG9yYWdlID0gbnVsbHB0cjsKIH0KIAogdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNv b2tpZXNEaWRDaGFuZ2UoTmV0d29ya1N0b3JhZ2VTZXNzaW9uKiBzZXNzaW9uKQpAQCAtODcsMjUg KzkxLDIzIEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVzRGlkQ2hhbmdlKE5l dHdvcmtTdG9yYWdlU2Vzc2lvbiogc2Vzc2lvbikKIAogU291cENvb2tpZUphciogTmV0d29ya1N0 b3JhZ2VTZXNzaW9uOjpjb29raWVTdG9yYWdlKCkgY29uc3QKIHsKLSAgICBSRUxFQVNFX0FTU0VS VCghbV9zZXNzaW9uIHx8IG1fc2Vzc2lvbi0+Y29va2llSmFyKCkgPT0gbV9jb29raWVTdG9yYWdl LmdldCgpKTsKLSAgICByZXR1cm4gbV9jb29raWVTdG9yYWdlLmdldCgpOworICAgIEFTU0VSVCht X3Nlc3Npb24pOworICAgIEFTU0VSVChtX3Nlc3Npb24tPmNvb2tpZUphcigpKTsKKyAgICByZXR1 cm4gbV9zZXNzaW9uLT5jb29raWVKYXIoKTsKIH0KIAogdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Np b246OnNldENvb2tpZVN0b3JhZ2UoU291cENvb2tpZUphciogamFyKQogewotICAgIGlmIChtX2Nv b2tpZVN0b3JhZ2UpCi0gICAgICAgIGdfc2lnbmFsX2hhbmRsZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hl ZChtX2Nvb2tpZVN0b3JhZ2UuZ2V0KCksIEdfU0lHTkFMX01BVENIX0RBVEEsIDAsIDAsIG51bGxw dHIsIG51bGxwdHIsIHRoaXMpOwotCi0gICAgLy8gV2UgYWx3YXlzIGhhdmUgYSB2YWxpZCBjb29r aWVTdG9yYWdlLgotICAgIGlmIChqYXIpCi0gICAgICAgIG1fY29va2llU3RvcmFnZSA9IGphcjsK LSAgICBlbHNlIHsKLSAgICAgICAgbV9jb29raWVTdG9yYWdlID0gYWRvcHRHUmVmKHNvdXBfY29v a2llX2phcl9uZXcoKSk7Ci0gICAgICAgIHNvdXBfY29va2llX2phcl9zZXRfYWNjZXB0X3BvbGlj eShtX2Nvb2tpZVN0b3JhZ2UuZ2V0KCksIFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRfTk9fVEhJUkRf UEFSVFkpOwotICAgIH0KLSAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9jb29raWVTdG9y YWdlLmdldCgpLCAiY2hhbmdlZCIsIEdfQ0FMTEJBQ0soY29va2llc0RpZENoYW5nZSksIHRoaXMp OwotICAgIGlmIChtX3Nlc3Npb24gJiYgbV9zZXNzaW9uLT5jb29raWVKYXIoKSAhPSBtX2Nvb2tp ZVN0b3JhZ2UuZ2V0KCkpCi0gICAgICAgIG1fc2Vzc2lvbi0+c2V0Q29va2llSmFyKG1fY29va2ll U3RvcmFnZS5nZXQoKSk7CisgICAgQVNTRVJUKGphcik7CisgICAgQVNTRVJUKG1fc2Vzc2lvbik7 CisgICAgQVNTRVJUKG1fc2Vzc2lvbi0+Y29va2llSmFyKCkpOworCisgICAgaWYgKG1fc2Vzc2lv bi0+Y29va2llSmFyKCkgPT0gamFyKQorICAgICAgICByZXR1cm47CisKKyAgICBnX3NpZ25hbF9o YW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobV9zZXNzaW9uLT5jb29raWVKYXIoKSwgR19TSUdO QUxfTUFUQ0hfREFUQSwgMCwgMCwgbnVsbHB0ciwgbnVsbHB0ciwgdGhpcyk7CisgICAgbV9zZXNz aW9uLT5zZXRDb29raWVKYXIoamFyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9z ZXNzaW9uLT5jb29raWVKYXIoKSwgImNoYW5nZWQiLCBHX0NBTExCQUNLKGNvb2tpZXNEaWRDaGFu Z2UpLCB0aGlzKTsKIH0KIAogdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZU9i c2VydmVySGFuZGxlcihGdW5jdGlvbjx2b2lkICgpPiYmIGhhbmRsZXIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3RyZWFtSGFuZGxlSW1w bFNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1NvY2tldFN0 cmVhbUhhbmRsZUltcGxTb3VwLmNwcAppbmRleCAyYzRhN2VkN2JiZWZhZTdjMDNiYWM1NjEyZDVi MzIwY2JlODMzMjUzLi5lZDc4ZTRkZGQ1OTU4NmE4OWJhNzgxMjZlOTQxNWJkZTE4NjdhN2VlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvU29ja2V0U3Ry ZWFtSGFuZGxlSW1wbFNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9Tb2NrZXRTdHJlYW1IYW5kbGVJbXBsU291cC5jcHAKQEAgLTkzLDcgKzkzLDcgQEAg UmVmPFNvY2tldFN0cmVhbUhhbmRsZUltcGw+IFNvY2tldFN0cmVhbUhhbmRsZUltcGw6OmNyZWF0 ZShjb25zdCBVUkwmIHVybCwgU29ja2UKIAogICAgIGF1dG8gdXJpID0gdXJsVG9Tb3VwVVJJKHVy bCk7CiAgICAgUmVmPFNvY2tldFN0cmVhbUhhbmRsZT4gcHJvdGVjdGVkU29ja2V0U3RyZWFtSGFu ZGxlID0gc29ja2V0LmNvcHlSZWYoKTsKLSAgICBzb3VwX3Nlc3Npb25fY29ubmVjdF9hc3luYyhu ZXR3b3JrU3RvcmFnZVNlc3Npb24tPmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuc291 cFNlc3Npb24oKSwgdXJpLmdldCgpLCBzb2NrZXQtPm1fY2FuY2VsbGFibGUuZ2V0KCksCisgICAg c291cF9zZXNzaW9uX2Nvbm5lY3RfYXN5bmMobmV0d29ya1N0b3JhZ2VTZXNzaW9uLT5zb3VwTmV0 d29ya1Nlc3Npb24oKS5zb3VwU2Vzc2lvbigpLCB1cmkuZ2V0KCksIHNvY2tldC0+bV9jYW5jZWxs YWJsZS5nZXQoKSwKICAgICAgICAgdXJsLnByb3RvY29sSXMoIndzcyIpID8gcmVpbnRlcnByZXRf Y2FzdDxTb3VwU2Vzc2lvbkNvbm5lY3RQcm9ncmVzc0NhbGxiYWNrPihjb25uZWN0UHJvZ3Jlc3ND YWxsYmFjaykgOiBudWxscHRyLAogICAgICAgICByZWludGVycHJldF9jYXN0PEdBc3luY1JlYWR5 Q2FsbGJhY2s+KGNvbm5lY3RlZENhbGxiYWNrKSwgJnByb3RlY3RlZFNvY2tldFN0cmVhbUhhbmRs ZS5sZWFrUmVmKCkpOwogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291 cC5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9zb3Vw L0xlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlclNvdXAuY3BwCmluZGV4IGM1ODViZjc5NTVmNWU2 YmMzMjEyYmE2MjgzNmFkZjY3MzFmM2UzMmEuLjgwMDc1MWYyYWJkYjAxNjAwYWUwZDM2MTNhODY3 MGE4MzRhMzUyY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3Vz dG9tUHJvdG9jb2xzL3NvdXAvTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291cC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvc291cC9MZWdh Y3lDdXN0b21Qcm90b2NvbE1hbmFnZXJTb3VwLmNwcApAQCAtMTAzLDggKzEwMyw3IEBAIHZvaWQg TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpyZWdpc3RlclNjaGVtZShjb25zdCBTdHJpbmcm IHNjaGVtZSkKICAgICBBU1NFUlQoZ2VuZXJpY1JlcXVlc3RDbGFzcyk7CiAgICAgZ2VuZXJpY1Jl cXVlc3RDbGFzcy0+c2NoZW1lcyA9IGNvbnN0X2Nhc3Q8Y29uc3QgY2hhcioqPihyZWludGVycHJl dF9jYXN0PGNoYXIqKj4obV9yZWdpc3RlcmVkU2NoZW1lcy0+cGRhdGEpKTsKICAgICBsYXN0Q3Jl YXRlZE5ldHdvcmtQcm9jZXNzKCktPmZvckVhY2hOZXR3b3JrU3RvcmFnZVNlc3Npb24oW10oY29u c3QgYXV0byYgc2Vzc2lvbikgewotICAgICAgICBpZiAoYXV0byogc291cFNlc3Npb24gPSBzZXNz aW9uLnNvdXBOZXR3b3JrU2Vzc2lvbigpKQotICAgICAgICAgICAgc291cFNlc3Npb24tPnNldHVw Q3VzdG9tUHJvdG9jb2xzKCk7CisgICAgICAgIHNlc3Npb24uc291cE5ldHdvcmtTZXNzaW9uKCku c2V0dXBDdXN0b21Qcm90b2NvbHMoKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzTWFpblNvdXAuY3BwIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzTWFpblNvdXAu Y3BwCmluZGV4IDBjNWYxOWY3YWY0MzhkMjE4MTU2OWIxYjdkMDU4MDUzZDU1YmU0M2UuLmY3NmJh NzkxYWUyOWU4NjY4OTNhOTczZDA4Y2ZjMmExMjdlZTZlNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc01haW5Tb3VwLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Byb2Nlc3NNYWluU291 cC5jcHAKQEAgLTM3LDYgKzM3LDkgQEAgY2xhc3MgTmV0d29ya1Byb2Nlc3NNYWluIGZpbmFsOiBw dWJsaWMgQ2hpbGRQcm9jZXNzTWFpbkJhc2UgewogcHVibGljOgogICAgIHZvaWQgcGxhdGZvcm1G aW5hbGl6ZSgpIG92ZXJyaWRlCiAgICAgeworICAgICAgICAvLyBOZWVkZWQgdG8gZGVzdHJveSB0 aGUgU291cFNlc3Npb24gYW5kIFNvdXBDb29raWVKYXIsIGUuZy4gdG8gYXZvaWQKKyAgICAgICAg Ly8gbGVha2luZyBTUUxpdGUgdGVtcG9yYXJ5IGpvdXJuYWxpbmcgZmlsZXMuCisgICAgICAgIE5l dHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5kZWZhdWx0U3RvcmFnZVNlc3Npb24oKS5jbGVhclNv dXBOZXR3b3JrU2Vzc2lvbigpOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrUHJvY2Vzc1NvdXAuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzU291cC5jcHAKaW5kZXggYzdj ZTFkMjdhMDAxYmZlZGRlZDI2MjI0ZTg3MzdhY2I0MDljYjliYy4uMzdiZDZjMjdlYWIwODBhOGJj NDI4MWJhNTAxMDhlNjU2MzU1YjNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtQcm9jZXNzU291cC5jcHAKQEAgLTk2LDggKzk2LDcg QEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6dXNlclByZWZlcnJlZExhbmd1YWdlc0NoYW5nZWQoY29u c3QgVmVjdG9yPFN0cmluZz4mIGxhbmd1YWcKICAgICBhdXRvIGFjY2VwdExhbmd1YWdlcyA9IGJ1 aWxkQWNjZXB0TGFuZ3VhZ2VzKGxhbmd1YWdlcyk7CiAgICAgU291cE5ldHdvcmtTZXNzaW9uOjpz ZXRJbml0aWFsQWNjZXB0TGFuZ3VhZ2VzKGFjY2VwdExhbmd1YWdlcyk7CiAgICAgZm9yRWFjaE5l dHdvcmtTdG9yYWdlU2Vzc2lvbihbJmFjY2VwdExhbmd1YWdlc10oY29uc3QgYXV0byYgc2Vzc2lv bikgewotICAgICAgICBpZiAoYXV0byogc291cFNlc3Npb24gPSBzZXNzaW9uLnNvdXBOZXR3b3Jr U2Vzc2lvbigpKQotICAgICAgICAgICAgc291cFNlc3Npb24tPnNldEFjY2VwdExhbmd1YWdlcyhh Y2NlcHRMYW5ndWFnZXMpOworICAgICAgICBzZXNzaW9uLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNl dEFjY2VwdExhbmd1YWdlcyhhY2NlcHRMYW5ndWFnZXMpOwogICAgIH0pOwogfQogCkBAIC0xNjks OCArMTY4LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6c2V0TmV0d29ya1Byb3h5U2V0dGluZ3Mo Y29uc3QgU291cE5ldHdvcmtQcm94eVNldHRpbmdzJiBzZXQKIHsKICAgICBTb3VwTmV0d29ya1Nl c3Npb246OnNldFByb3h5U2V0dGluZ3Moc2V0dGluZ3MpOwogICAgIGZvckVhY2hOZXR3b3JrU3Rv cmFnZVNlc3Npb24oW10oY29uc3QgYXV0byYgc2Vzc2lvbikgewotICAgICAgICBpZiAoYXV0byog c291cFNlc3Npb24gPSBzZXNzaW9uLnNvdXBOZXR3b3JrU2Vzc2lvbigpKQotICAgICAgICAgICAg c291cFNlc3Npb24tPnNldHVwUHJveHkoKTsKKyAgICAgICAgc2Vzc2lvbi5zb3VwTmV0d29ya1Nl c3Npb24oKS5zZXR1cFByb3h5KCk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3BwIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9uU291cC5jcHAKaW5kZXgg NjBmY2E4N2I2MDM0YzI1ODFlNTdlODJkY2E4NmZmNTRlYWE5YzBlNi4uNTlkZTlmNTA0Yjg4ZGE5 NjQyNTBlNWQ5MDhlNDliMDU0N2FlODBjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9uU291cC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdvcmtTZXNzaW9uU291cC5jcHAKQEAgLTUyLDcgKzUy LDcgQEAgTmV0d29ya1Nlc3Npb25Tb3VwOjp+TmV0d29ya1Nlc3Npb25Tb3VwKCkKIAogU291cFNl c3Npb24qIE5ldHdvcmtTZXNzaW9uU291cDo6c291cFNlc3Npb24oKSBjb25zdAogewotICAgIHJl dHVybiBuZXR3b3JrU3RvcmFnZVNlc3Npb24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lv bigpLnNvdXBTZXNzaW9uKCk7CisgICAgcmV0dXJuIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpLnNv dXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCk7CiB9CiAKIHZvaWQgTmV0d29ya1Nlc3Np b25Tb3VwOjpjbGVhckNyZWRlbnRpYWxzKCkK