23171 2009-01-07 12:32:45 -0800 Cannot set different LocalStorage paths to different page groups. 2009-01-13 09:59:08 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned hausmann oldest_to_newest 104749 0 yael 2009-01-07 12:32:45 -0800 WebKit Qt API does not have API for setting page groups and does not allow setting different LocalStorage paths for different page groups, 104751 1 26501 yael 2009-01-07 12:34:57 -0800 Created attachment 26501 Add API for setting page group per page and allowing setting different LocalStorage paths to different page groups. 105517 2 26672 hausmann 2009-01-13 09:55:35 -0800 Created attachment 26672 Alternate patch with private API Reworked patch from Yael with private Qt API. 105518 3 hausmann 2009-01-13 09:59:08 -0800 Landed in r39863 26501 2009-01-07 12:34:57 -0800 2009-01-13 09:55:35 -0800 Add API for setting page group per page and allowing setting different LocalStorage paths to different page groups. pagegroup.patch text/plain 5588 yael SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCShyZXZpc2lv biAzOTY4MSkKKysrIFdlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC05Nyw2ICs5Nyw3IEBACiAgICAgdm9pZCBtb2RpZmllZCgpOwogICAg IHZvaWQgY29udGV4dE1lbnVDcmFzaCgpOwogICAgIHZvaWQgZGF0YWJhc2UoKTsKKyAgICB2b2lk IG11bHRpcGxlUGFnZUdyb3Vwc0FuZExvY2FsU3RvcmFnZSgpOwogICAgIHZvaWQgY3JlYXRlUGx1 Z2luKCk7CiAgICAgdm9pZCBkZXN0cm95UGx1Z2luKCk7CiAgICAgdm9pZCBjcmVhdGVWaWV3bGVz c1BsdWdpbigpOwpAQCAtNDE0LDYgKzQxNSw0NiBAQAogICAgIFFUZXN0OjpxV2FpdCgxMDAwKTsK IH0KIAordm9pZCB0c3RfUVdlYlBhZ2U6Om11bHRpcGxlUGFnZUdyb3Vwc0FuZExvY2FsU3RvcmFn ZSgpCit7CisgICAgUURpciBkaXIoUURpcjo6Y3VycmVudFBhdGgoKSk7CisgICAgZGlyLm1rZGly KCJwYXRoMSIpOworICAgIGRpci5ta2RpcigicGF0aDIiKTsKKyAgICAKKyAgICBRV2ViVmlldyB2 aWV3MTsKKyAgICBRV2ViVmlldyB2aWV3MjsKKyAgICAKKyAgICB2aWV3MS5wYWdlKCktPnNldHRp bmdzKCktPnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChRRGlyOjp0b05hdGl2ZVNlcGFyYXRv cnMoUURpcjo6Y3VycmVudFBhdGgoKSArICIvcGF0aDEiKSk7CisgICAgdmlldzEucGFnZSgpLT5z ZXRHcm91cE5hbWUoImdyb3VwMSIpOworICAgIHZpZXcyLnBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0 TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKFFEaXI6OnRvTmF0aXZlU2VwYXJhdG9ycyhRRGlyOjpj dXJyZW50UGF0aCgpICsgIi9wYXRoMiIpKTsKKyAgICB2aWV3Mi5wYWdlKCktPnNldEdyb3VwTmFt ZSgiZ3JvdXAyIik7CisgICAgUUNPTVBBUkUodmlldzEucGFnZSgpLT5ncm91cE5hbWUoKSwgUVN0 cmluZygiZ3JvdXAxIikpOworICAgIFFDT01QQVJFKHZpZXcyLnBhZ2UoKS0+Z3JvdXBOYW1lKCks IFFTdHJpbmcoImdyb3VwMiIpKTsKKyAgICAKKworICAgIHZpZXcxLnNldEh0bWwoUVN0cmluZygi PGh0bWw+PGJvZHk+IDwvYm9keT48L2h0bWw+IiksIFFVcmwoImh0dHA6Ly93d3cubXlleGFtcGxl LmNvbSIpKTsKKyAgICB2aWV3Mi5zZXRIdG1sKFFTdHJpbmcoIjxodG1sPjxib2R5PiA8L2JvZHk+ PC9odG1sPiIpLCBRVXJsKCJodHRwOi8vd3d3Lm15ZXhhbXBsZS5jb20iKSk7CisgICAgCisgICAg dmlldzEucGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJsb2NhbFN0b3Jh Z2UudGVzdD0ndmFsdWUxJzsiKTsKKyAgICB2aWV3Mi5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmFs dWF0ZUphdmFTY3JpcHQoImxvY2FsU3RvcmFnZS50ZXN0PSd2YWx1ZTInOyIpOworICAgIAorICAg IHZpZXcxLnNldEh0bWwoUVN0cmluZygiPGh0bWw+PGJvZHk+IDwvYm9keT48L2h0bWw+IiksIFFV cmwoImh0dHA6Ly93d3cubXlleGFtcGxlLmNvbSIpKTsKKyAgICB2aWV3Mi5zZXRIdG1sKFFTdHJp bmcoIjxodG1sPjxib2R5PiA8L2JvZHk+PC9odG1sPiIpLCBRVXJsKCJodHRwOi8vd3d3Lm15ZXhh bXBsZS5jb20iKSk7CisKKyAgICBRVmFyaWFudCBzMSA9IHZpZXcxLnBhZ2UoKS0+bWFpbkZyYW1l KCktPmV2YWx1YXRlSmF2YVNjcmlwdCgibG9jYWxTdG9yYWdlLnRlc3QiKTsKKyAgICBRQ09NUEFS RShzMS50b1N0cmluZygpLCBRU3RyaW5nKCJ2YWx1ZTEiKSk7CisKKyAgICBRVmFyaWFudCBzMiA9 IHZpZXcyLnBhZ2UoKS0+bWFpbkZyYW1lKCktPmV2YWx1YXRlSmF2YVNjcmlwdCgibG9jYWxTdG9y YWdlLnRlc3QiKTsKKyAgICBRQ09NUEFSRShzMi50b1N0cmluZygpLCBRU3RyaW5nKCJ2YWx1ZTIi KSk7CisgICAgCisgICAgUVRlc3Q6OnFXYWl0KDEwMDApOworICAgIAorICAgIFFGaWxlOjpyZW1v dmUoUURpcjo6dG9OYXRpdmVTZXBhcmF0b3JzKFFEaXI6OmN1cnJlbnRQYXRoKCkgKyAiL3BhdGgx L2h0dHBfd3d3Lm15ZXhhbXBsZS5jb21fMC5sb2NhbHN0b3JhZ2UiKSk7CisgICAgUUZpbGU6OnJl bW92ZShRRGlyOjp0b05hdGl2ZVNlcGFyYXRvcnMoUURpcjo6Y3VycmVudFBhdGgoKSArICIvcGF0 aDIvaHR0cF93d3cubXlleGFtcGxlLmNvbV8wLmxvY2Fsc3RvcmFnZSIpKTsKKyAgICBkaXIucm1k aXIoUURpcjo6dG9OYXRpdmVTZXBhcmF0b3JzKCIuL3BhdGgxIikpOworICAgIGRpci5ybWRpcihR RGlyOjp0b05hdGl2ZVNlcGFyYXRvcnMoIi4vcGF0aDIiKSk7Cit9CisKIGNsYXNzIFBsdWdpblBh Z2UgOiBwdWJsaWMgUVdlYlBhZ2UKIHsKIHB1YmxpYzoKSW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5nZUxvZwkocmV2aXNpb24gMzk2ODMpCisr KyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIw MDktMDEtMDcgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBBbGxvdyBzZXR0aW5nIGRpZmZl cmVudCBMb2NhbFN0b3JhZ2UgcGF0aCBmb3IgZGlmZmVyZW50IHBhZ2UgZ3JvdXBzLgorCisgICAg ICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlOjpzZXRHcm91cE5hbWUp OgorICAgICAgICAoUVdlYlBhZ2U6Omdyb3VwTmFtZSk6CisgICAgICAgICogQXBpL3F3ZWJwYWdl Lmg6CisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgIChRV2ViU2V0dGlu Z3M6OnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCk6CisgICAgICAgIChRV2ViU2V0dGluZ3M6 OmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCk6CisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvdHN0 X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6bXVsdGlwbGVQYWdlR3JvdXBz QW5kTG9jYWxTdG9yYWdlKToKKwogMjAwOS0wMS0wNyAgQWRhbSBUcmVhdCAgPGFkYW0udHJlYXRA dG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb3JnZSBTdGFpa29zLgpJ bmRleDogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9B cGkvcXdlYnBhZ2UuaAkocmV2aXNpb24gMzk2ODEpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2OCw2ICsyNjgsOSBAQAogCiAgICAgdmlydHVhbCBib29s IGV4dGVuc2lvbihFeHRlbnNpb24gZXh0ZW5zaW9uLCBjb25zdCBFeHRlbnNpb25PcHRpb24gKm9w dGlvbiA9IDAsIEV4dGVuc2lvblJldHVybiAqb3V0cHV0ID0gMCk7CiAgICAgdmlydHVhbCBib29s IHN1cHBvcnRzRXh0ZW5zaW9uKEV4dGVuc2lvbiBleHRlbnNpb24pIGNvbnN0OworICAgIAorICAg IHZvaWQgc2V0R3JvdXBOYW1lKGNvbnN0IFFTdHJpbmcmIG5hbWUpOworICAgIFFTdHJpbmcgZ3Jv dXBOYW1lKCkgY29uc3Q7CiAKIFFfU0lHTkFMUzoKICAgICB2b2lkIGxvYWRTdGFydGVkKCk7Cklu ZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiAzOTY4MSkKKysrIFdlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzE2LDggKzcxNiw3IEBACiAq Lwogdm9pZCBRV2ViU2V0dGluZ3M6OnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChjb25zdCBR U3RyaW5nJiBwYXRoKQogewotICAgIFFXZWJTZXR0aW5nc1ByaXZhdGUgKmdsb2JhbCA9IFFXZWJT ZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ZDsKLSAgICBnbG9iYWwtPmxvY2FsU3RvcmFnZURh dGFiYXNlUGF0aCA9IHBhdGg7CisgICAgZC0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoID0gcGF0 aDsKICAgICBkLT5hcHBseSgpOwogfQogCkBAIC03MjksNiArNzI4LDUgQEAKICovCiBRU3RyaW5n IFFXZWJTZXR0aW5nczo6bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCkgY29uc3QKIHsKLSAgICBR V2ViU2V0dGluZ3NQcml2YXRlICpnbG9iYWwgPSBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdz KCktPmQ7Ci0gICAgcmV0dXJuIGdsb2JhbC0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoOworICAg IHJldHVybiBkLT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGg7CiB9CkluZGV4OiBXZWJLaXQvcXQv QXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNw cAkocmV2aXNpb24gMzk2ODEpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjExMSw2ICsyMTExLDMyIEBACiB9CiAKIC8qIQorICAgIFxjbGFzcyBRV2Vi UGFnZTo6c2V0R3JvdXBOYW1lCisgICAgXHNpbmNlIDQuNQorICAgIFBhZ2VHcm91cCBpcyBhIHdh eSB0byBzZXBhcmF0ZSBkaWZmZXJlbnQgcGFnZXMgaW4gdGhlIHNhbWUgcHJvY2VzcyBmb3IgZGlm ZmVyZW50IHB1cnBvc2VzLgorICAgIEFuIGV4YW1wbGUgd291bGQgYmUgdG8gc2VwYXJhdGUgYSBX ZWJLaXQgYmFzZWQgYXBwbGljYXRpb24gZnJvbSBpdHMgV2ViS2l0IGJhc2VkIGhlbHAgc3lzdGVt LAorICAgIHdoaWxlIGJvdGggYXJlIHJ1bm5pbmcgaW4gdGhlIHNhbWUgcHJvY2Vzcy4KKworICAg IFxzYSBRV2ViUGFnZTo6Z3JvdXBOYW1lKCkKKyovCit2b2lkIFFXZWJQYWdlOjpzZXRHcm91cE5h bWUoY29uc3QgUVN0cmluZyYgbmFtZSkKK3sKKyAgICBkLT5wYWdlLT5zZXRHcm91cE5hbWUobmFt ZSk7Cit9CisKKy8qIQorICAgIFxjbGFzcyBRV2ViUGFnZTo6Z3JvdXBOYW1lCisgICAgXHNpbmNl IDQuNQorICAgIFJldHVybiAgdGhlIG5hbWUgb2YgdGhlIFBhZ2VHcm91cCBhc3NvY2lhdGVkIHdp dGggdGhpcyBwYWdlLgorCisgICAgXHNhIFFXZWJQYWdlOjpzZXRHcm91cE5hbWUoKQorKi8KK1FT dHJpbmcgUVdlYlBhZ2U6Omdyb3VwTmFtZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPnBhZ2Ut Pmdyb3VwTmFtZSgpOworfQorCisvKiEKICAgICBGaW5kcyB0aGUgbmV4dCBvY2N1cnJlbmNlIG9m IHRoZSBzdHJpbmcsIFxhIHN1YlN0cmluZywgaW4gdGhlIHBhZ2UsIHVzaW5nIHRoZSBnaXZlbiBc YSBvcHRpb25zLgogICAgIFJldHVybnMgdHJ1ZSBvZiBcYSBzdWJTdHJpbmcgd2FzIGZvdW5kIGFu ZCBzZWxlY3RzIHRoZSBtYXRjaCB2aXN1YWxseTsgb3RoZXJ3aXNlIHJldHVybnMgZmFsc2UuCiAq Lwo= 26672 2009-01-13 09:55:35 -0800 2009-01-13 09:56:55 -0800 Alternate patch with private API patch.txt text/plain 8116 hausmann ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKaW5kZXggNDUzNTVlYS4uYzdlZGQ4MyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTEw Miw2ICsxMDIsMTYgQEAgdm9pZCBRV0VCS0lUX0VYUE9SVCBxdF9kcnRfcnVuKGJvb2wgYikKICAg ICBRV2ViUGFnZVByaXZhdGU6OmRydFJ1biA9IGI7CiB9CiAKK3ZvaWQgUVdFQktJVF9FWFBPUlQg cXRfd2VicGFnZV9zZXRHcm91cE5hbWUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJpbmcmIGdy b3VwTmFtZSkKK3sKKyAgICBwYWdlLT5oYW5kbGUoKS0+cGFnZS0+c2V0R3JvdXBOYW1lKGdyb3Vw TmFtZSk7Cit9CisKK1FTdHJpbmcgUVdFQktJVF9FWFBPUlQgcXRfd2VicGFnZV9ncm91cE5hbWUo UVdlYlBhZ2UqIHBhZ2UpCit7CisgICAgcmV0dXJuIHBhZ2UtPmhhbmRsZSgpLT5wYWdlLT5ncm91 cE5hbWUoKTsKK30KKwogLy8gTG9va3VwIHRhYmxlIG1hcHBpbmcgUVdlYlBhZ2U6OldlYkFjdGlv bnMgdG8gdGhlIGFzc29jaWF0ZWQgRWRpdG9yIGNvbW1hbmRzCiBzdGF0aWMgY29uc3QgY2hhciog ZWRpdG9yQ29tbWFuZFdlYkFjdGlvbnNbXSA9IAogewpAQCAtMjY1MSw1ICsyNjYxLDkgQEAgcXVp bnQ2NCBRV2ViUGFnZTo6Ynl0ZXNSZWNlaXZlZCgpIGNvbnN0IHsKICAgVGhpcyBzaWduYWwgaXMg ZW1pdHRlZCB3aGVuIHRoZSBsb2FkIG9mIFxhIGZyYW1lIGlzIGZpbmlzaGVkIGFuZCB0aGUgYXBw bGljYXRpb24gbWF5IG5vdyB1cGRhdGUgaXRzIHN0YXRlIGFjY29yZGluZ2x5LgogKi8KIAorLyoh CisgIFxmbiBRV2ViUGFnZVByaXZhdGUqIFFXZWJQYWdlOjpoYW5kbGUoKSBjb25zdAorICBcaW50 ZXJuYWwKKyovCiAKICNpbmNsdWRlICJtb2NfcXdlYnBhZ2UuY3BwIgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCmluZGV4IGRi NTJiODUuLmMxMjMxNDEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKQEAgLTI2OSw2ICsyNjksOCBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBib29sIGV4dGVuc2lvbihFeHRlbnNpb24gZXh0ZW5zaW9uLCBjb25zdCBFeHRl bnNpb25PcHRpb24gKm9wdGlvbiA9IDAsIEV4dGVuc2lvblJldHVybiAqb3V0cHV0ID0gMCk7CiAg ICAgdmlydHVhbCBib29sIHN1cHBvcnRzRXh0ZW5zaW9uKEV4dGVuc2lvbiBleHRlbnNpb24pIGNv bnN0OwogCisgICAgaW5saW5lIFFXZWJQYWdlUHJpdmF0ZSogaGFuZGxlKCkgY29uc3QgeyByZXR1 cm4gZDsgfQorCiBRX1NJR05BTFM6CiAgICAgdm9pZCBsb2FkU3RhcnRlZCgpOwogICAgIHZvaWQg bG9hZFByb2dyZXNzKGludCBwcm9ncmVzcyk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3 ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKaW5kZXggNWE3 YjJiOS4uZTY4NTRlYSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3Bw CisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApAQCAtNzI5LDcgKzcyOSw3IEBA IFFTdHJpbmcgUVdlYlNldHRpbmdzOjpvZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZVBhdGgoKQog I2VuZGlmCiB9CiAKLS8qIQorLyoKICAgICBcc2luY2UgNC41CiAKICAgICBTZXRzIHRoZSBwYXRo IGZvciBIVE1MNSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlcyB0byBcYSBwYXRoLgpAQCAtNzQwLDE0 ICs3NDAsMTUgQEAgUVN0cmluZyBRV2ViU2V0dGluZ3M6Om9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlUGF0aCgpCiAKICAgICBcc2EgbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCkKICovCi12b2lk IFFXZWJTZXR0aW5nczo6c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKGNvbnN0IFFTdHJpbmcm IHBhdGgpCisKK3ZvaWQgUVdFQktJVF9FWFBPUlQgcXRfd2Vic2V0dGluZ3Nfc2V0TG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoKFFXZWJTZXR0aW5ncyogc2V0dGluZ3MsIGNvbnN0IFFTdHJpbmcmIHBh dGgpCiB7Ci0gICAgUVdlYlNldHRpbmdzUHJpdmF0ZSAqZ2xvYmFsID0gUVdlYlNldHRpbmdzOjpn bG9iYWxTZXR0aW5ncygpLT5kOwotICAgIGdsb2JhbC0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRo ID0gcGF0aDsKKyAgICBRV2ViU2V0dGluZ3NQcml2YXRlICpkID0gc2V0dGluZ3MtPmhhbmRsZSgp OworICAgIGQtPmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCA9IHBhdGg7CiAgICAgZC0+YXBwbHko KTsKIH0KIAotLyohCisvKgogICAgIFxzaW5jZSA0LjUKIAogICAgIFJldHVybnMgdGhlIHBhdGgg Zm9yIEhUTUw1IGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2VzCkBAIC03NTUsOCArNzU2LDEyIEBAIHZv aWQgUVdlYlNldHRpbmdzOjpzZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoY29uc3QgUVN0cmlu ZyYgcGF0aCkKIAogICAgIFxzYSBzZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKQogKi8KLVFT dHJpbmcgUVdlYlNldHRpbmdzOjpsb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKSBjb25zdAorUVN0 cmluZyBRV0VCS0lUX0VYUE9SVCBxdF93ZWJzZXR0aW5nc19sb2NhbFN0b3JhZ2VEYXRhYmFzZVBh dGgoUVdlYlNldHRpbmdzKiBzZXR0aW5ncykKIHsKLSAgICBRV2ViU2V0dGluZ3NQcml2YXRlICpn bG9iYWwgPSBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPmQ7Ci0gICAgcmV0dXJuIGds b2JhbC0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoOworICAgIHJldHVybiBzZXR0aW5ncy0+aGFu ZGxlKCktPmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aDsKIH0KKworLyohCisgICAgXGZuIFFXZWJT ZXR0aW5nc1ByaXZhdGUqIFFXZWJTZXR0aW5nczo6aGFuZGxlKCkgY29uc3QKKyAgICBcaW50ZXJu YWwKKyovCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oIGIvV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAppbmRleCBlOTkwMWJkLi40MjUxZmJiIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnNl dHRpbmdzLmgKQEAgLTExNSw4ICsxMTUsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0 T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVQYXRoKGNvbnN0IFFTdHJpbmcmIHBhdGgpOwogICAg IHN0YXRpYyBRU3RyaW5nIG9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlUGF0aCgpOwogCi0gICAg dm9pZCBzZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoY29uc3QgUVN0cmluZyYgcGF0aCk7Ci0g ICAgUVN0cmluZyBsb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKSBjb25zdDsKKyAgICBpbmxpbmUg UVdlYlNldHRpbmdzUHJpdmF0ZSogaGFuZGxlKCkgY29uc3QgeyByZXR1cm4gZDsgfQogCiBwcml2 YXRlOgogICAgIGZyaWVuZCBjbGFzcyBRV2ViUGFnZVByaXZhdGU7CmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBmOTg0NDhkLi5lYmM3 ODNkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAwOS0wMS0xMyAgU2ltb24gSGF1c21hbm4gIDxzaW1v bi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MTcxCisKKyAgICAgICAgQmFzZWQgb24gcGF0Y2ggYnkgWWFlbCBBaGFyb24gIDx5YWVsLmFoYXJv bkBub2tpYS5jb20+CisKKyAgICAgICAgTWFrZSB0aGUgUVdlYlNldHRpbmdzIGZ1bmN0aW9ucyBm b3Igc2V0dGluZyB0aGUgcGF0aCBmb3IgdGhlIGxvY2FsCisgICAgICAgIHN0b3JhZ2UgZGF0YWJh c2UgcHJpdmF0ZSBRdFdlYmtpdCBBUEksIGluY2x1ZGluZyB0aGUgYWJpbGl0eSB0bworICAgICAg ICBhc3NvY2lhdGVkIGEgUVdlYlBhZ2Ugd2l0aCBhIG5hbWVkIHBhZ2UgZ3JvdXAuCisKKyAgICAg ICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAocXRfd2VicGFnZV9zZXRHcm91cE5hbWUp OiBBZGRlZC4KKyAgICAgICAgKHF0X3dlYnBhZ2VfZ3JvdXBOYW1lKTogQWRkZWQuCisgICAgICAg ICogQXBpL3F3ZWJwYWdlLmg6CisgICAgICAgIChFeHRlbnNpb25PcHRpb246OmhhbmRsZSk6IEFk ZGVkIGludGVybmFsIGhlbHBlciBmdW5jdGlvbi4KKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdz LmNwcDoKKyAgICAgICAgKHF0X3dlYnNldHRpbmdzX3NldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0 aCk6IE1hZGUgcHJpdmF0ZSBBUEkuCisgICAgICAgIChxdF93ZWJzZXR0aW5nc19sb2NhbFN0b3Jh Z2VEYXRhYmFzZVBhdGgpOiBNYWRlIHByaXZhdGUgQVBJLgorICAgICAgICAqIEFwaS9xd2Vic2V0 dGluZ3MuaDoKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAg ICAgICAodHN0X1FXZWJQYWdlOjpkYXRhYmFzZSk6IFNtYWxsIGNsZWFudXAuCisgICAgICAgICh0 c3RfUVdlYlBhZ2U6Om11bHRpcGxlUGFnZUdyb3Vwc0FuZExvY2FsU3RvcmFnZSk6IE5ldyB0ZXN0 IGZvciB0aGUKKyAgICAgICAgcGFnZSBncm91cCBoYW5kbGluZywgd3JpdHRlbiBieSBZYWVsLgor CiAyMDA5LTAxLTEyICBUb3IgQXJuZSBWZXN0YsO4ICA8dGF2ZXN0Ym9AdHJvbGx0ZWNoLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L3Rlc3RzL3F3 ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggNDEzOTUwZS4uM2YwZjZhZSAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKQEAgLTEwMCw2ICsxMDAsNyBAQCBw cml2YXRlIHNsb3RzOgogICAgIHZvaWQgY3JlYXRlUGx1Z2luKCk7CiAgICAgdm9pZCBkZXN0cm95 UGx1Z2luKCk7CiAgICAgdm9pZCBjcmVhdGVWaWV3bGVzc1BsdWdpbigpOworICAgIHZvaWQgbXVs dGlwbGVQYWdlR3JvdXBzQW5kTG9jYWxTdG9yYWdlKCk7CiAKIHByaXZhdGU6CiAKQEAgLTM3MCwx MiArMzcxLDYgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OmRhdGFiYXNlKCkKICAgICBRV2ViU2V0dGlu Z3M6OnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKDEwMjQgKiAxMDI0KTsKICAgICBRVkVS SUZZKFFXZWJTZXR0aW5nczo6b2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSA9PSAxMDI0ICog MTAyNCk7CiAKLSAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldE9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlUGF0aChwYXRoKTsKLSAgICBRVkVSSUZZKG1fcGFnZS0+c2V0dGluZ3MoKS0+b2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGVQYXRoKCkgPT0gcGF0aCk7Ci0KLSAgICBtX3BhZ2UtPnNldHRp bmdzKCktPnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChwYXRoKTsKLSAgICBRVkVSSUZZKG1f cGFnZS0+c2V0dGluZ3MoKS0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCkgPT0gcGF0aCk7Ci0K ICAgICBRU3RyaW5nIGRiRmlsZU5hbWUgPSBwYXRoICsgIkRhdGFiYXNlcy5kYiI7CiAKICAgICBp ZiAoUUZpbGU6OmV4aXN0cyhkYkZpbGVOYW1lKSkKQEAgLTU5NSw1ICs1OTAsNTAgQEAgdm9pZCB0 c3RfUVdlYlBhZ2U6OmNyZWF0ZVZpZXdsZXNzUGx1Z2luKCkKICAgICBkZWxldGUgcGFnZTsKIH0K IAorLy8gaW1wb3J0IHByaXZhdGUgQVBJCit2b2lkIFFXRUJLSVRfRVhQT1JUIHF0X3dlYnBhZ2Vf c2V0R3JvdXBOYW1lKFFXZWJQYWdlKiBwYWdlLCBjb25zdCBRU3RyaW5nJiBncm91cE5hbWUpOwor UVN0cmluZyBRV0VCS0lUX0VYUE9SVCBxdF93ZWJwYWdlX2dyb3VwTmFtZShRV2ViUGFnZSogcGFn ZSk7Cit2b2lkIFFXRUJLSVRfRVhQT1JUIHF0X3dlYnNldHRpbmdzX3NldExvY2FsU3RvcmFnZURh dGFiYXNlUGF0aChRV2ViU2V0dGluZ3MqIHNldHRpbmdzLCBjb25zdCBRU3RyaW5nJiBwYXRoKTsK Kwordm9pZCB0c3RfUVdlYlBhZ2U6Om11bHRpcGxlUGFnZUdyb3Vwc0FuZExvY2FsU3RvcmFnZSgp Cit7CisgICAgUURpciBkaXIoUURpcjo6Y3VycmVudFBhdGgoKSk7CisgICAgZGlyLm1rZGlyKCJw YXRoMSIpOworICAgIGRpci5ta2RpcigicGF0aDIiKTsKKworICAgIFFXZWJWaWV3IHZpZXcxOwor ICAgIFFXZWJWaWV3IHZpZXcyOworCisgICAgcXRfd2Vic2V0dGluZ3Nfc2V0TG9jYWxTdG9yYWdl RGF0YWJhc2VQYXRoKHZpZXcxLnBhZ2UoKS0+c2V0dGluZ3MoKSwgUURpcjo6dG9OYXRpdmVTZXBh cmF0b3JzKFFEaXI6OmN1cnJlbnRQYXRoKCkgKyAiL3BhdGgxIikpOworICAgIHF0X3dlYnBhZ2Vf c2V0R3JvdXBOYW1lKHZpZXcxLnBhZ2UoKSwgImdyb3VwMSIpOworICAgIHF0X3dlYnNldHRpbmdz X3NldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCh2aWV3Mi5wYWdlKCktPnNldHRpbmdzKCksIFFE aXI6OnRvTmF0aXZlU2VwYXJhdG9ycyhRRGlyOjpjdXJyZW50UGF0aCgpICsgIi9wYXRoMiIpKTsK KyAgICBxdF93ZWJwYWdlX3NldEdyb3VwTmFtZSh2aWV3Mi5wYWdlKCksICJncm91cDIiKTsKKyAg ICBRQ09NUEFSRShxdF93ZWJwYWdlX2dyb3VwTmFtZSh2aWV3MS5wYWdlKCkpLCBRU3RyaW5nKCJn cm91cDEiKSk7CisgICAgUUNPTVBBUkUocXRfd2VicGFnZV9ncm91cE5hbWUodmlldzIucGFnZSgp KSwgUVN0cmluZygiZ3JvdXAyIikpOworCisKKyAgICB2aWV3MS5zZXRIdG1sKFFTdHJpbmcoIjxo dG1sPjxib2R5PiA8L2JvZHk+PC9odG1sPiIpLCBRVXJsKCJodHRwOi8vd3d3Lm15ZXhhbXBsZS5j b20iKSk7CisgICAgdmlldzIuc2V0SHRtbChRU3RyaW5nKCI8aHRtbD48Ym9keT4gPC9ib2R5Pjwv aHRtbD4iKSwgUVVybCgiaHR0cDovL3d3dy5teWV4YW1wbGUuY29tIikpOworCisgICAgdmlldzEu cGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJsb2NhbFN0b3JhZ2UudGVz dD0ndmFsdWUxJzsiKTsKKyAgICB2aWV3Mi5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmFsdWF0ZUph dmFTY3JpcHQoImxvY2FsU3RvcmFnZS50ZXN0PSd2YWx1ZTInOyIpOworCisgICAgdmlldzEuc2V0 SHRtbChRU3RyaW5nKCI8aHRtbD48Ym9keT4gPC9ib2R5PjwvaHRtbD4iKSwgUVVybCgiaHR0cDov L3d3dy5teWV4YW1wbGUuY29tIikpOworICAgIHZpZXcyLnNldEh0bWwoUVN0cmluZygiPGh0bWw+ PGJvZHk+IDwvYm9keT48L2h0bWw+IiksIFFVcmwoImh0dHA6Ly93d3cubXlleGFtcGxlLmNvbSIp KTsKKworICAgIFFWYXJpYW50IHMxID0gdmlldzEucGFnZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVh dGVKYXZhU2NyaXB0KCJsb2NhbFN0b3JhZ2UudGVzdCIpOworICAgIFFDT01QQVJFKHMxLnRvU3Ry aW5nKCksIFFTdHJpbmcoInZhbHVlMSIpKTsKKworICAgIFFWYXJpYW50IHMyID0gdmlldzIucGFn ZSgpLT5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJsb2NhbFN0b3JhZ2UudGVzdCIp OworICAgIFFDT01QQVJFKHMyLnRvU3RyaW5nKCksIFFTdHJpbmcoInZhbHVlMiIpKTsKKworICAg IFFUZXN0OjpxV2FpdCgxMDAwKTsKKworICAgIFFGaWxlOjpyZW1vdmUoUURpcjo6dG9OYXRpdmVT ZXBhcmF0b3JzKFFEaXI6OmN1cnJlbnRQYXRoKCkgKyAiL3BhdGgxL2h0dHBfd3d3Lm15ZXhhbXBs ZS5jb21fMC5sb2NhbHN0b3JhZ2UiKSk7CisgICAgUUZpbGU6OnJlbW92ZShRRGlyOjp0b05hdGl2 ZVNlcGFyYXRvcnMoUURpcjo6Y3VycmVudFBhdGgoKSArICIvcGF0aDIvaHR0cF93d3cubXlleGFt cGxlLmNvbV8wLmxvY2Fsc3RvcmFnZSIpKTsKKyAgICBkaXIucm1kaXIoUURpcjo6dG9OYXRpdmVT ZXBhcmF0b3JzKCIuL3BhdGgxIikpOworICAgIGRpci5ybWRpcihRRGlyOjp0b05hdGl2ZVNlcGFy YXRvcnMoIi4vcGF0aDIiKSk7Cit9CisKIFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQogI2luY2x1 ZGUgInRzdF9xd2VicGFnZS5tb2MiCg==