167089 2017-01-16 03:37:53 -0800 [SOUP] Accept-language could be set twice in a row for the default context 2017-01-16 07:35:08 -0800 1 1 1 Unclassified WebKit Platform WebKit Local Build Unspecified Unspecified RESOLVED FIXED Soup P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro zan oldest_to_newest 1267121 0 cgarcia 2017-01-16 03:37:53 -0800 If NetworkStorageSession doesn't have a SoupNetworkSession yet, we are creating it only to set the languages. Since we already set the global value, the languages will be set when the SoupNetworkSession is created later. This is not a big deal for the language property, but it will be for proxies after bug #128674. 1267122 1 298950 cgarcia 2017-01-16 03:43:47 -0800 Created attachment 298950 Patch 1267123 2 cgarcia 2017-01-16 03:51:32 -0800 Committed r210786: <http://trac.webkit.org/changeset/210786> 1267146 3 mcatanzaro 2017-01-16 07:35:08 -0800 It's way too much typing to get the SoupNetworkSession in the normal case where you don't care if you create it or not. :( 298950 2017-01-16 03:43:47 -0800 2017-01-16 03:47:42 -0800 Patch wcore-default-soup-session.diff text/plain 12302 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MWZmZmIzYTAxMi4uN2YyZDU2MDZiZDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNy0wMS0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW1NPVVBdIEFjY2VwdC1sYW5ndWFnZSBjb3VsZCBiZSBzZXQg dHdpY2UgaW5hIHJvdyBmb3IgdGhlIGRlZmF1bHQgY29udGV4dAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MDg5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgTmV0d29ya1N0b3JhZ2VTZXNzaW9uIGRv ZXNuJ3QgaGF2ZSBhIFNvdXBOZXR3b3JrU2Vzc2lvbiB5ZXQsIHdlIGFyZSBjcmVhdGluZyBpdCBv bmx5IHRvIHNldCB0aGUKKyAgICAgICAgbGFuZ3VhZ2VzLiBTaW5jZSB3ZSBhbHJlYWR5IHNldCB0 aGUgZ2xvYmFsIHZhbHVlLCB0aGUgbGFuZ3VhZ2VzIHdpbGwgYmUgc2V0IHdoZW4gdGhlIFNvdXBO ZXR3b3JrU2Vzc2lvbiBpcworICAgICAgICBjcmVhdGVkIGxhdGVyLiBUaGlzIGlzIG5vdCBhIGJp ZyBkZWFsIGZvciB0aGUgbGFuZ3VhZ2UgcHJvcGVydHksIGJ1dCBpdCB3aWxsIGJlIGZvciBwcm94 aWVzIGFmdGVyIGJ1ZyAjMTI4Njc0LgorICAgICAgICBTaW5jZSBOZXR3b3JrU3RvcmFnZVNlc3Np b246OnNvdXBOZXR3b3JrU2Vzc2lvbigpIGl0J3MgYWN0dWFsbHkgZ2V0dGluZyBvciBjcmVhdGlu ZyB0aGUgU291cE5ldHdvcmtTZXNzaW9uLCB0aGlzCisgICAgICAgIHBhdGNoIHJlbmFtZXMgaXQg YXMgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpnZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigp IGFuZCBub3cKKyAgICAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzb3VwTmV0d29ya1Nlc3Np b24oKSByZXR1cm5zIGEgcG9pbnRlciB3aXRob3V0IGNyZWF0aW5nIHRoZSBTb3VwTmV0d29ya1Nl c3Npb24sIHNvIGl0IGNhbgorICAgICAgICBiZSBudWxscHRyLiBUaGlzIGNhbiBub3cgYmUgdXNl ZCB0byBvbmx5IHVzZSB0aGUgZGVmYXVsdCBTb3VwTmV0d29ya1Nlc3Npb24gd2hlbiBpdCBoYXMg YWxyZWFkeSBiZWVuIGNyZWF0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdv cmtTdG9yYWdlU2Vzc2lvbi5oOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNz aW9uOjpzb3VwTmV0d29ya1Nlc3Npb24pOiBVc2UgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpnZXRP ckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9ETlNTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkROU1Jlc29sdmVRdWV1ZTo6dXBk YXRlSXNVc2luZ1Byb3h5KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpETlNSZXNvbHZlUXVl dWU6OnBsYXRmb3JtUmVzb2x2ZSk6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv c291cC9OZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtTdG9yYWdlU2Vzc2lvbjo6Z2V0T3JDcmVhdGVTb3VwTmV0d29ya1Nlc3Npb24pOiBUaGlz IGlzIHRoZSBvbGQgc291cE5ldHdvcmtTZXNzaW9uKCksIG5vdyByZW5hbWVkLgorICAgICAgICAo V2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzb3VwTmV0d29ya1Nlc3Npb24pOiBSZXR1 cm4gYSBwb2ludGVyIHdpdGggdGhlIGN1cnJlbnQgdmFsdWUgb2YgbV9zZXNzaW9uIHRoYXQKKyAg ICAgICAgbm93IGNhbiBiZSBudWxscHRyLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291 cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2Vzc2lvbkZyb21D b250ZXh0KTogVXNlIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6Z2V0T3JDcmVhdGVTb3VwTmV0d29y a1Nlc3Npb24oKS4KKworMjAxNy0wMS0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CisKICAgICAgICAgW1NPVVBdIEZpeCBoYW5kbGluZyBvZiBhY2NlcHQgbGFu Z3VhZ2UgcHJvcGVydHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2Njk2OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaAppbmRleCBiMTIwMWZhMjMwYS4uMTkxNzM1NDYx NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0 b3JhZ2VTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3 b3JrU3RvcmFnZVNlc3Npb24uaApAQCAtNzEsNyArNzEsOCBAQCBwdWJsaWM6CiAgICAgTmV0d29y a1N0b3JhZ2VTZXNzaW9uKFNlc3Npb25JRCwgc3RkOjp1bmlxdWVfcHRyPFNvdXBOZXR3b3JrU2Vz c2lvbj4mJik7CiAgICAgfk5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpOwogCi0gICAgU291cE5ldHdv cmtTZXNzaW9uJiBzb3VwTmV0d29ya1Nlc3Npb24oKSBjb25zdDsKKyAgICBTb3VwTmV0d29ya1Nl c3Npb24qIHNvdXBOZXR3b3JrU2Vzc2lvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbi5nZXQo KTsgfTsKKyAgICBTb3VwTmV0d29ya1Nlc3Npb24mIGdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNz aW9uKCkgY29uc3Q7CiAgICAgU291cENvb2tpZUphciogY29va2llU3RvcmFnZSgpIGNvbnN0Owog ICAgIHZvaWQgZ2V0Q3JlZGVudGlhbEZyb21QZXJzaXN0ZW50U3RvcmFnZShjb25zdCBQcm90ZWN0 aW9uU3BhY2UmLCBGdW5jdGlvbjx2b2lkIChDcmVkZW50aWFsJiYpPiBjb21wbGV0aW9uSGFuZGxl cik7CiAgICAgdm9pZCBzYXZlQ3JlZGVudGlhbFRvUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgUHJv dGVjdGlvblNwYWNlJiwgY29uc3QgQ3JlZGVudGlhbCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1NvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL0ROU1NvdXAuY3BwCmluZGV4IDEwMTNlYWE3MDM3Li5jYTEx NDU3ZGRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L0ROU1NvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9E TlNTb3VwLmNwcApAQCAtNzksNyArNzksNyBAQCBzdGF0aWMgdm9pZCBwcm94eVJlc29sdmVkRm9y SHR0cHNVcmlDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzdQogdm9p ZCBETlNSZXNvbHZlUXVldWU6OnVwZGF0ZUlzVXNpbmdQcm94eSgpCiB7CiAgICAgR1JlZlB0cjxH UHJveHlSZXNvbHZlcj4gcmVzb2x2ZXI7Ci0gICAgZ19vYmplY3RfZ2V0KE5ldHdvcmtTdG9yYWdl U2Vzc2lvbjo6ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCkuc291cE5ldHdvcmtTZXNzaW9uKCkuc291 cFNlc3Npb24oKSwgInByb3h5LXJlc29sdmVyIiwgJnJlc29sdmVyLm91dFB0cigpLCBudWxscHRy KTsKKyAgICBnX29iamVjdF9nZXQoTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFn ZVNlc3Npb24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCks ICJwcm94eS1yZXNvbHZlciIsICZyZXNvbHZlci5vdXRQdHIoKSwgbnVsbHB0cik7CiAgICAgQVNT RVJUKHJlc29sdmVyKTsKIAogICAgIGdfcHJveHlfcmVzb2x2ZXJfbG9va3VwX2FzeW5jKHJlc29s dmVyLmdldCgpLCAiaHR0cDovL2V4YW1wbGUuY29tLyIsIG51bGxwdHIsIHByb3h5UmVzb2x2ZWRG b3JIdHRwVXJpQ2FsbGJhY2ssICZtX2lzVXNpbmdQcm94eSk7CkBAIC05NSw3ICs5NSw3IEBAIHZv aWQgRE5TUmVzb2x2ZVF1ZXVlOjpwbGF0Zm9ybVJlc29sdmUoY29uc3QgU3RyaW5nJiBob3N0bmFt ZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCi0gICAgc291cF9zZXNzaW9uX3By ZWZldGNoX2RucyhOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigp LnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCksIGhvc3RuYW1lLnV0ZjgoKS5kYXRh KCksIG51bGxwdHIsIHJlc29sdmVkQ2FsbGJhY2ssIG51bGxwdHIpOworICAgIHNvdXBfc2Vzc2lv bl9wcmVmZXRjaF9kbnMoTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNlc3Np b24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCksIGhvc3Ru YW1lLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIsIHJlc29sdmVkQ2FsbGJhY2ssIG51bGxwdHIpOwog fQogCiB2b2lkIHByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0b3JhZ2VTZXNz aW9uU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29y a1N0b3JhZ2VTZXNzaW9uU291cC5jcHAKaW5kZXggMThiMDVjZTg0ZTIuLmQ0ODM2Nzk2M2YwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0 b3JhZ2VTZXNzaW9uU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9zb3VwL05ldHdvcmtTdG9yYWdlU2Vzc2lvblNvdXAuY3BwCkBAIC04Niw3ICs4Niw3IEBAIHZv aWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzd2l0Y2hUb05ld1Rlc3RpbmdTZXNzaW9uKCkKICAg ICBkZWZhdWx0U2Vzc2lvbigpID0gc3RkOjptYWtlX3VuaXF1ZTxOZXR3b3JrU3RvcmFnZVNlc3Np b24+KFNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLCBzdGQ6Om1ha2VfdW5pcXVlPFNvdXBO ZXR3b3JrU2Vzc2lvbj4oKSk7CiB9CiAKLVNvdXBOZXR3b3JrU2Vzc2lvbiYgTmV0d29ya1N0b3Jh Z2VTZXNzaW9uOjpzb3VwTmV0d29ya1Nlc3Npb24oKSBjb25zdAorU291cE5ldHdvcmtTZXNzaW9u JiBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkg Y29uc3QKIHsKICAgICBpZiAoIW1fc2Vzc2lvbikKICAgICAgICAgbV9zZXNzaW9uID0gc3RkOjpt YWtlX3VuaXF1ZTxTb3VwTmV0d29ya1Nlc3Npb24+KGNvb2tpZVN0b3JhZ2UoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVT b3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhh bmRsZVNvdXAuY3BwCmluZGV4IDk1YmFjZTU3ODM2Li4wOWQ3YTEzMjcwYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFu ZGxlU291cC5jcHAKQEAgLTgwLDggKzgwLDggQEAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6flJl c291cmNlSGFuZGxlSW50ZXJuYWwoKQogc3RhdGljIFNvdXBTZXNzaW9uKiBzZXNzaW9uRnJvbUNv bnRleHQoTmV0d29ya2luZ0NvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgaWYgKCFjb250ZXh0IHx8 ICFjb250ZXh0LT5pc1ZhbGlkKCkpCi0gICAgICAgIHJldHVybiBOZXR3b3JrU3RvcmFnZVNlc3Np b246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNz aW9uKCk7Ci0gICAgcmV0dXJuIGNvbnRleHQtPnN0b3JhZ2VTZXNzaW9uKCkuc291cE5ldHdvcmtT ZXNzaW9uKCkuc291cFNlc3Npb24oKTsKKyAgICAgICAgcmV0dXJuIE5ldHdvcmtTdG9yYWdlU2Vz c2lvbjo6ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCkuZ2V0T3JDcmVhdGVTb3VwTmV0d29ya1Nlc3Np b24oKS5zb3VwU2Vzc2lvbigpOworICAgIHJldHVybiBjb250ZXh0LT5zdG9yYWdlU2Vzc2lvbigp LmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuc291cFNlc3Npb24oKTsKIH0KIAogUmVz b3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWJiYTAwOTY4MWEu LjBlMDEwZTFiZjk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTctMDEtMTYgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtTT1VQ XSBBY2NlcHQtbGFuZ3VhZ2UgY291bGQgYmUgc2V0IHR3aWNlIGluYSByb3cgZm9yIHRoZSBkZWZh dWx0IGNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NzA4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvQ3VzdG9tUHJvdG9jb2xN YW5hZ2VyU291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6 cmVnaXN0ZXJTY2hlbWUpOiBVc2UgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpnZXRPckNyZWF0ZVNv dXBOZXR3b3JrU2Vzc2lvbigpLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2VmbC9OZXR3b3Jr UHJvY2Vzc01haW5FZmwuY3BwOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29y a1Byb2Nlc3NTb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnVzZXJQ cmVmZXJyZWRMYW5ndWFnZXNDaGFuZ2VkKTogT25seSBzZXQgdGhlIGxhbmd1YWdlcyBpZiBOZXR3 b3JrU3RvcmFnZVNlc3Npb24gaGFzIGEKKyAgICAgICAgU291cE5ldHdvcmtTZXNzaW9uLgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25Tb3VwLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb25Tb3VwOjpzb3VwU2Vzc2lvbik6IFVzZSBOZXR3b3Jr U3RvcmFnZVNlc3Npb246OmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuCisgICAgICAg ICogV2ViUHJvY2Vzcy9Db29raWVzL3NvdXAvV2ViQ29va2llTWFuYWdlclNvdXAuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJDb29raWVNYW5hZ2VyOjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFn ZSk6IERpdHRvLgorICAgICAgICAqIFdlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNw cDoKKworMjAxNy0wMS0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CisKICAgICAgICAgW1NPVVBdIEZpeCBoYW5kbGluZyBvZiBhY2NlcHQgbGFuZ3VhZ2UgcHJv cGVydHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 Njk2OQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Q cm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFnZXJTb3VwLmNwcCBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9zb3VwL0N1c3RvbVByb3RvY29sTWFu YWdlclNvdXAuY3BwCmluZGV4IDcyYjBkYjZkMGRhLi4xM2EwMjhhNDJiNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvQ3VzdG9t UHJvdG9jb2xNYW5hZ2VyU291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyU291cC5jcHAKQEAg LTkxLDcgKzkxLDcgQEAgdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnJlZ2lzdGVyU2NoZW1l KGNvbnN0IFN0cmluZyYgc2NoZW1lKQogCiAgICAgYXV0byogZ2VuZXJpY1JlcXVlc3RDbGFzcyA9 IHN0YXRpY19jYXN0PFNvdXBSZXF1ZXN0Q2xhc3MqPihnX3R5cGVfY2xhc3NfcmVmKFdFQktJVF9U WVBFX1NPVVBfUkVRVUVTVF9HRU5FUklDKSk7CiAgICAgZ2VuZXJpY1JlcXVlc3RDbGFzcy0+c2No ZW1lcyA9IGNvbnN0X2Nhc3Q8Y29uc3QgY2hhcioqPihyZWludGVycHJldF9jYXN0PGNoYXIqKj4o bV9yZWdpc3RlcmVkU2NoZW1lcy0+cGRhdGEpKTsKLSAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1 cmVfYnlfdHlwZShOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigp LnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCksIFdFQktJVF9UWVBFX1NPVVBfUkVR VUVTVF9HRU5FUklDKTsKKyAgICBzb3VwX3Nlc3Npb25fYWRkX2ZlYXR1cmVfYnlfdHlwZShOZXR3 b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpLmdldE9yQ3JlYXRlU291 cE5ldHdvcmtTZXNzaW9uKCkuc291cFNlc3Npb24oKSwgV0VCS0lUX1RZUEVfU09VUF9SRVFVRVNU X0dFTkVSSUMpOwogfQogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6dW5yZWdpc3RlclNj aGVtZShjb25zdCBTdHJpbmcmKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvZWZsL05ldHdvcmtQcm9jZXNzTWFpbkVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9lZmwvTmV0d29ya1Byb2Nlc3NNYWluRWZsLmNwcAppbmRleCA4ZTEwNGE1OGU5 OC4uZjMyY2NmNGVjZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2VmbC9OZXR3b3JrUHJvY2Vzc01haW5FZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2VmbC9OZXR3b3JrUHJvY2Vzc01haW5FZmwuY3BwCkBAIC00OCw3ICs0OCw3IEBA IHB1YmxpYzoKICAgICAgICAgaWYgKCFlY29yZV9tYWluX2xvb3BfZ2xpYl9pbnRlZ3JhdGUoKSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBOZXR3b3JrU3RvcmFnZVNlc3Np b246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpLnNvdXBOZXR3b3JrU2Vzc2lvbigpLnNldHVwSFRU UFByb3h5RnJvbUVudmlyb25tZW50KCk7CisgICAgICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCkuZ2V0T3JDcmVhdGVTb3VwTmV0d29ya1Nlc3Npb24oKS5z ZXR1cEhUVFBQcm94eUZyb21FbnZpcm9ubWVudCgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0 d29ya1Byb2Nlc3NTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAv TmV0d29ya1Byb2Nlc3NTb3VwLmNwcAppbmRleCAxNGU0MDI1ZjlmZC4uOWVkMzNlNDNjYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Byb2Nl c3NTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9zb3VwL05ldHdv cmtQcm9jZXNzU291cC5jcHAKQEAgLTk3LDcgKzk3LDggQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6 dXNlclByZWZlcnJlZExhbmd1YWdlc0NoYW5nZWQoY29uc3QgVmVjdG9yPFN0cmluZz4mIGxhbmd1 YWcKICAgICBhdXRvIGFjY2VwdExhbmd1YWdlcyA9IGJ1aWxkQWNjZXB0TGFuZ3VhZ2VzKGxhbmd1 YWdlcyk7CiAgICAgU291cE5ldHdvcmtTZXNzaW9uOjpzZXRJbml0aWFsQWNjZXB0TGFuZ3VhZ2Vz KGFjY2VwdExhbmd1YWdlcyk7CiAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpmb3JFYWNoKFsm YWNjZXB0TGFuZ3VhZ2VzXShjb25zdCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNl c3Npb24pIHsKLSAgICAgICAgc2Vzc2lvbi5zb3VwTmV0d29ya1Nlc3Npb24oKS5zZXRBY2NlcHRM YW5ndWFnZXMoYWNjZXB0TGFuZ3VhZ2VzKTsKKyAgICAgICAgaWYgKGF1dG8qIHNvdXBTZXNzaW9u ID0gc2Vzc2lvbi5zb3VwTmV0d29ya1Nlc3Npb24oKSkKKyAgICAgICAgICAgIHNvdXBTZXNzaW9u LT5zZXRBY2NlcHRMYW5ndWFnZXMoYWNjZXB0TGFuZ3VhZ2VzKTsKICAgICB9KTsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lv blNvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vz c2lvblNvdXAuY3BwCmluZGV4IGNkZDliNzE3YTI0Li43MWM0YjQ0M2M2OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mvc291cC9OZXR3b3JrU2Vzc2lvblNvdXAuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29ya1Nlc3Npb25T b3VwLmNwcApAQCAtNDUsNyArNDUsNyBAQCBOZXR3b3JrU2Vzc2lvblNvdXA6On5OZXR3b3JrU2Vz c2lvblNvdXAoKQogCiBTb3VwU2Vzc2lvbiogTmV0d29ya1Nlc3Npb25Tb3VwOjpzb3VwU2Vzc2lv bigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpLnNvdXBOZXR3 b3JrU2Vzc2lvbigpLnNvdXBTZXNzaW9uKCk7CisgICAgcmV0dXJuIG5ldHdvcmtTdG9yYWdlU2Vz c2lvbigpLmdldE9yQ3JlYXRlU291cE5ldHdvcmtTZXNzaW9uKCkuc291cFNlc3Npb24oKTsKIH0K IAogdm9pZCBOZXR3b3JrU2Vzc2lvblNvdXA6OmNsZWFyQ3JlZGVudGlhbHMoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Db29raWVzL3NvdXAvV2ViQ29va2llTWFuYWdl clNvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Db29raWVzL3NvdXAvV2ViQ29v a2llTWFuYWdlclNvdXAuY3BwCmluZGV4IDJkZTUyMjE5NjQ5Li5jNThlMDgyOWFiOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Db29raWVzL3NvdXAvV2ViQ29va2llTWFu YWdlclNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQ29va2llcy9zb3Vw L1dlYkNvb2tpZU1hbmFnZXJTb3VwLmNwcApAQCAtNzUsNyArNzUsNyBAQCB2b2lkIFdlYkNvb2tp ZU1hbmFnZXI6OnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3RvcmFn ZVBhdGgsIHVpbgogCiAgICAgYXV0byYgc3RvcmFnZVNlc3Npb24gPSBOZXR3b3JrU3RvcmFnZVNl c3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpOwogICAgIHNvdXBfY29va2llX2phcl9zZXRf YWNjZXB0X3BvbGljeShqYXIuZ2V0KCksIHNvdXBfY29va2llX2phcl9nZXRfYWNjZXB0X3BvbGlj eShzdG9yYWdlU2Vzc2lvbi5jb29raWVTdG9yYWdlKCkpKTsKLSAgICBzdG9yYWdlU2Vzc2lvbi5z b3VwTmV0d29ya1Nlc3Npb24oKS5zZXRDb29raWVKYXIoamFyLmdldCgpKTsKKyAgICBzdG9yYWdl U2Vzc2lvbi5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLnNldENvb2tpZUphcihqYXIu Z2V0KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvZWZsL1dlYlByb2Nlc3NNYWluRWZsLmNwcAppbmRleCAyNDE5M2M4ZDkw Ni4uNzJlNmFmMGRmNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZWZs L1dlYlByb2Nlc3NNYWluRWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2Vm bC9XZWJQcm9jZXNzTWFpbkVmbC5jcHAKQEAgLTk5LDcgKzk5LDcgQEAgcHVibGljOgogICAgICAg ICBpZiAoIWVjb3JlX21haW5fbG9vcF9nbGliX2ludGVncmF0ZSgpKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6ZGVmYXVsdFN0b3Jh Z2VTZXNzaW9uKCkuc291cE5ldHdvcmtTZXNzaW9uKCkuc2V0dXBIVFRQUHJveHlGcm9tRW52aXJv bm1lbnQoKTsKKyAgICAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNl c3Npb24oKS5nZXRPckNyZWF0ZVNvdXBOZXR3b3JrU2Vzc2lvbigpLnNldHVwSFRUUFByb3h5RnJv bUVudmlyb25tZW50KCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAo=