27804 2009-07-29 08:20:46 -0700 [Qt] QWebFrame::requestedUrl method can mis-behave in case of unhandled sslErrors. 2009-08-04 08:39:02 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 tonikitoo tonikitoo hausmann robert oldest_to_newest 135594 0 tonikitoo 2009-07-29 08:20:46 -0700 follow up bug of work done in bug 25867 see https://bugs.webkit.org/show_bug.cgi?id=25867#c19 and bug 27444 for problem description. 135630 1 33724 tonikitoo 2009-07-29 10:59:30 -0700 Created attachment 33724 fix 136268 2 33724 eric 2009-07-31 15:17:49 -0700 Comment on attachment 33724 fix Can we test this? Maybe with an http test? 136731 3 33724 tonikitoo 2009-08-03 12:02:05 -0700 Comment on attachment 33724 fix clearing review. as per eric's suggetion i will add a autotest (not http test) 136985 4 34062 tonikitoo 2009-08-04 07:54:01 -0700 Created attachment 34062 v0.2 - fix + autotest added an autotest for the case. in the autotest, it forces a SSLError to be catch and check if the requestedUrl value matches the expected. 136987 5 34063 tonikitoo 2009-08-04 08:12:27 -0700 Created attachment 34063 v0.3 - fix + autotest same patch as 0.2 but fixed gcc warning and updated to ToT. 136990 6 34063 hausmann 2009-08-04 08:18:15 -0700 Comment on attachment 34063 v0.3 - fix + autotest r=me 136995 7 tonikitoo 2009-08-04 08:39:02 -0700 r46767 thanks simon 33724 2009-07-29 10:59:30 -0700 2009-08-03 12:02:05 -0700 fix BUG_27804_v1.diff text/plain 1659 tonikitoo Y29tbWl0IDkwMGM2MzBhNjQ3ZWZiYjVlOTExZjkwN2E0OGY3MmU5ZDhjODJjZDgKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgV2VkIEp1bCAyOSAxMzo0ODoyOSAyMDA5IC0wNDAwCgogICAgMjAwOS0wNy0yOSAgQW50 b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CiAgICAKICAgICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgICAgICAgICAgW1F0XSBRV2Vi RnJhbWU6OnJlcXVlc3RlZFVybCBtZXRob2QgY2FuIG1pcy1iZWhhdmUgaW4gY2FzZSBvZiB1bmhh bmRsZWQgc3NsRXJyb3JzLgogICAgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjc4MDQKICAgIAogICAgICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgog ICAgICAgICAgICAoUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOgoKZGlmZiAtLWdpdCBhL1dlYktp dC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAppbmRl eCAyM2NiNDczLi5lOTllZGY1IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5j cHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCkBAIC01MzksNyArNTM5LDggQEAg UVVybCBRV2ViRnJhbWU6OnVybCgpIGNvbnN0CiBRVXJsIFFXZWJGcmFtZTo6cmVxdWVzdGVkVXJs KCkgY29uc3QKIHsKICAgICBpZiAoIWQtPmZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRM b2FkZXIoKQotICAgICAgICB8fCAhZC0+ZnJhbWVMb2FkZXJDbGllbnQtPm1fbG9hZFN1Y2NlZWRl ZCkKKyAgICAgICAgfHwgIWQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRTdWNjZWVkZWQKKyAg ICAgICAgJiYgIWQtPmZyYW1lLT5sb2FkZXIoKS0+b3V0Z29pbmdSZWZlcnJlcigpLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIFFVcmwoZC0+ZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVy cmVyKCkpOwogCiAgICAgcmV0dXJuIGQtPmZyYW1lLT5sb2FkZXIoKS0+b3JpZ2luYWxSZXF1ZXN0 KCkudXJsKCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0No YW5nZUxvZwppbmRleCA1ZjMxNDM5Li4wNzZjNmNhIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hh bmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0w Ny0yOSAgQW50b25pbyBHb21lcyAgIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRV2ViRnJh bWU6OnJlcXVlc3RlZFVybCBtZXRob2QgY2FuIG1pcy1iZWhhdmUgaW4gY2FzZSBvZiB1bmhhbmRs ZWQgc3NsRXJyb3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mjc4MDQKKworICAgICAgICAqIEFwaS9xd2ViZnJhbWUuY3BwOgorICAgICAgICAoUVdl YkZyYW1lOjpyZXF1ZXN0ZWRVcmwpOgorCiAyMDA5LTA3LTI5ICBab2x0YW4gSGVyY3plZyAgPHpo ZXJjemVnQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVz bWFubi4K 34062 2009-08-04 07:54:01 -0700 2009-08-04 08:12:27 -0700 v0.2 - fix + autotest BUG_27804_v2.diff text/plain 5060 tonikitoo Y29tbWl0IDg3ZTNmNzMwMzRmYjNhYjFiYjczM2JlOTUzNmM0NzE5OGViOWE1ODcKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgTW9uIEF1ZyAzIDE0OjUzOjMwIDIwMDkgLTA0MDAKCiAgICAyMDA5LTA3LTI5ICBBbnRv bmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KICAgIAogICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogICAgCiAgICAgICAgW1F0XSBRV2ViRnJhbWU6OnJl cXVlc3RlZFVybCBtZXRob2QgY2FuIG1pcy1iZWhhdmUgaW4gY2FzZSBvZiB1bmhhbmRsZWQgc3Ns RXJyb3JzLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzgwNAogICAgCiAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKICAgICAgICAoUVdlYkZyYW1l OjpyZXF1ZXN0ZWRVcmwpOgogICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUu Y3BwOgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCAyM2NiNDczLi4wYzJjM2ZiIDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCkBAIC01MzgsOCArNTM4LDEyIEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogKi8K IFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBjb25zdAogeworICAgIC8vIEluIHRoZSBm b2xsb3dpbmcgZWRnZSBjYXNlcyAod2hlcmUgdGhlIGZhaWxpbmcgZG9jdW1lbnQKKyAgICAvLyBs b2FkZXIgZG9lcyBub3QgZ2V0IGNvbW1pdGVkIGJ5IHRoZSBmcmFtZSBsb2FkZXIpIGl0IGlzCisg ICAgLy8gc2FmZXIgdG8gcmVseSBvbiBvdXRnb2luZ1JlZmVycmVyIHRoYW4gb3JpZ2luYWxSZXF1 ZXN0LgogICAgIGlmICghZC0+ZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigp Ci0gICAgICAgIHx8ICFkLT5mcmFtZUxvYWRlckNsaWVudC0+bV9sb2FkU3VjY2VlZGVkKQorICAg ICAgICB8fCAhZC0+ZnJhbWVMb2FkZXJDbGllbnQtPm1fbG9hZFN1Y2NlZWRlZAorICAgICAgICAm JiAhZC0+ZnJhbWUtPmxvYWRlcigpLT5vdXRnb2luZ1JlZmVycmVyKCkuaXNFbXB0eSgpKQogICAg ICAgICByZXR1cm4gUVVybChkLT5mcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKSk7 CiAKICAgICByZXR1cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51cmwo KTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9n CmluZGV4IDFhZjA0OTMuLmRjMTZiOTggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA3LTI5ICBB bnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFXZWJGcmFtZTo6cmVx dWVzdGVkVXJsIG1ldGhvZCBjYW4gbWlzLWJlaGF2ZSBpbiBjYXNlIG9mIHVuaGFuZGxlZCBzc2xF cnJvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzgwNAorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6 OnJlcXVlc3RlZFVybCk6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUu Y3BwOgorCiAyMDA5LTA4LTAzICBCYWxhenMgS2VsZW1lbiAgPGtlbGVtZW4uYmFsYXpzLjNAc3R1 ZC51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCmluZGV4IDZlYjRjMDIu LjE3ZGVhOTkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJm cmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNw cApAQCAtMzMsNiArMzMsOCBAQAogI2luY2x1ZGUgPFFSZWdFeHA+CiAjaW5jbHVkZSA8UU5ldHdv cmtSZXF1ZXN0PgogI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CisjaW5jbHVkZSA8cXNzbGVycm9y Lmg+CisKIC8vVEVTVEVEX0NMQVNTPQogLy9URVNURURfRklMRVM9CiAKQEAgLTIxNzYsNyArMjE3 OCw5IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKHJlcXVlc3QudXJsKCkgPT0gUVVybCgicXJjOi90 ZXN0MS5odG1sIikpIHsKICAgICAgICAgICAgIHNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6Okxv Y2F0aW9uSGVhZGVyLCBRU3RyaW5nKCJxcmM6L3Rlc3QyLmh0bWwiKSk7CiAgICAgICAgICAgICBz ZXRBdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpSZWRpcmVjdGlvblRhcmdldEF0dHJpYnV0ZSwg UVVybCgicXJjOi90ZXN0Mi5odG1sIikpOwotICAgICAgICB9IGVsc2UKKyAgICAgICAgfSBlbHNl IGlmIChyZXF1ZXN0LnVybCgpID09IFFVcmwoInFyYzovZmFrZS1zc2wtZXJyb3IuaHRtbCIpKQor ICAgICAgICAgICAgc2V0RXJyb3IoUU5ldHdvcmtSZXBseTo6U3NsSGFuZHNoYWtlRmFpbGVkRXJy b3IsIHRyKCJGYWtlIGVycm9yICEiKSk7IC8vIGZvcmNlIGEgc3NsIGVycm9yCisgICAgICAgIGVs c2UgaWYgKHJlcXVlc3QudXJsKCkgPT0gUVVybCgiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikpCiAg ICAgICAgICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5OjpIb3N0Tm90Rm91bmRFcnJvciwgdHIo IkludmFsaWQgVVJMIikpOwogCiAgICAgICAgIG9wZW4oUUlPRGV2aWNlOjpSZWFkT25seSk7CkBA IC0yMjAyLDYgKzIyMDYsOCBAQCBwcml2YXRlIHNsb3RzOgogICAgICAgICAgICAgZW1pdCBlcnJv cih0aGlzLT5lcnJvcigpKTsKICAgICAgICAgZWxzZSBpZiAocmVxdWVzdCgpLnVybCgpID09IFFV cmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKQogICAgICAgICAgICAgZW1pdCBtZXRhRGF0YUNo YW5nZWQoKTsKKyAgICAgICAgZWxzZSBpZiAocmVxdWVzdCgpLnVybCgpID09IFFVcmwoInFyYzov ZmFrZS1zc2wtZXJyb3IuaHRtbCIpKQorICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGVt aXQgcmVhZHlSZWFkKCk7CiAgICAgICAgIGVtaXQgZmluaXNoZWQoKTsKQEAgLTIyMTcsMTAgKzIy MjMsMTYgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgUU5ldHdvcmtSZXBseSog Y3JlYXRlUmVxdWVzdChPcGVyYXRpb24gb3AsIGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYgcmVxdWVz dCwgUUlPRGV2aWNlKiBvdXRnb2luZ0RhdGEpCiAgICAgewotICAgICAgICBpZiAob3AgPT0gUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24KLSAgICAgICAgICAgICYmIChyZXF1ZXN0 LnVybCgpLnRvU3RyaW5nKCkgPT0gInFyYzovdGVzdDEuaHRtbCIKLSAgICAgICAgICAgIHx8ICBy ZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCkgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKQotICAg ICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7CisgICAgICAgIFFT dHJpbmcgdXJsID0gcmVxdWVzdC51cmwoKS50b1N0cmluZygpOworICAgICAgICBpZiAob3AgPT0g UU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpHZXRPcGVyYXRpb24pCisgICAgICAgICAgICBpZiAodXJs ID09ICJxcmM6L3Rlc3QxLmh0bWwiIHx8ICB1cmwgPT0gImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIp CisgICAgICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlUmVwbHkocmVxdWVzdCwgdGhpcyk7Cisg ICAgICAgICAgICBlbHNlIGlmICh1cmwgPT0gInFyYzovZmFrZS1zc2wtZXJyb3IuaHRtbCIpIHsK KyAgICAgICAgICAgICAgICBGYWtlUmVwbHkqIHJlcGx5ID0gbmV3IEZha2VSZXBseShyZXF1ZXN0 LCB0aGlzKTsKKyAgICAgICAgICAgICAgICBRTGlzdDxRU3NsRXJyb3I+IGVycm9yczsKKyAgICAg ICAgICAgICAgICBlbWl0IHNzbEVycm9ycyhyZXBseSwgZXJyb3JzIDw8IFFTc2xFcnJvcihRU3Ns RXJyb3I6OlVuc3BlY2lmaWVkRXJyb3IpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gcmVwbHk7 CisgICAgICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6 Y3JlYXRlUmVxdWVzdChvcCwgcmVxdWVzdCwgb3V0Z29pbmdEYXRhKTsKICAgICB9CkBAIC0yMjUz LDYgKzIyNjUsMTYgQEAgdm9pZCB0c3RfUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKQogICAgIFFD T01QQVJFKHNweS5jb3VudCgpLCAzKTsKICAgICBRQ09NUEFSRShmcmFtZS0+cmVxdWVzdGVkVXJs KCksIFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKTsKICAgICBRQ09NUEFSRShmcmFtZS0+ dXJsKCksIFFVcmwoImh0dHA6Ly9hYmNkZWYuYWJjZGVmLyIpKTsKKworICAgIHFSZWdpc3Rlck1l dGFUeXBlPFFMaXN0PFFTc2xFcnJvcj4gPigiUUxpc3Q8UVNzbEVycm9yPiIpOworICAgIHFSZWdp c3Rlck1ldGFUeXBlPFFOZXR3b3JrUmVwbHkqID4oIlFOZXR3b3JrUmVwbHkqIik7CisKKyAgICBR U2lnbmFsU3B5IHNweTIocGFnZS5uZXR3b3JrQWNjZXNzTWFuYWdlcigpLCBTSUdOQUwoc3NsRXJy b3JzKFFOZXR3b3JrUmVwbHkqLCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JikpKTsKKyAgICBmcmFt ZS0+c2V0VXJsKFFVcmwoInFyYzovZmFrZS1zc2wtZXJyb3IuaHRtbCIpKTsKKyAgICBRVGVzdDo6 cVdhaXQoMjAwKTsKKyAgICBRQ09NUEFSRShzcHkyLmNvdW50KCksIDEpOworICAgIFFDT01QQVJF KGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwgUVVybCgicXJjOi9mYWtlLXNzbC1lcnJvci5odG1sIikp OworICAgIFFDT01QQVJFKGZyYW1lLT51cmwoKSwgUVVybCgicXJjOi9mYWtlLXNzbC1lcnJvci5o dG1sIikpOwogfQogCiB2b2lkIHRzdF9RV2ViRnJhbWU6OnNldEh0bWwoKQo= 34063 2009-08-04 08:12:27 -0700 2009-08-04 08:18:14 -0700 v0.3 - fix + autotest BUG_27804_v3.diff text/plain 5056 tonikitoo Y29tbWl0IGZlNGIxYTFjZmU5M2IyNmEwMTFhODI0MGI3NmEzMzI2Y2RkMGM4YmMKQXV0aG9yOiBB bnRvbmlvIEdvbWVzICh0b25pa2l0b28pIDxhbnRvbmlvLmdvbWVzQG9wZW5ib3NzYS5vcmc+CkRh dGU6ICAgTW9uIEF1ZyAzIDE0OjUzOjMwIDIwMDkgLTA0MDAKCiAgICAyMDA5LTA3LTI5ICBBbnRv bmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KICAgIAogICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogICAgCiAgICAgICAgW1F0XSBRV2ViRnJhbWU6OnJl cXVlc3RlZFVybCBtZXRob2QgY2FuIG1pcy1iZWhhdmUgaW4gY2FzZSBvZiB1bmhhbmRsZWQgc3Ns RXJyb3JzLgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NzgwNAogICAgCiAgICAgICAgKiBBcGkvcXdlYmZyYW1lLmNwcDoKICAgICAgICAoUVdlYkZyYW1l OjpyZXF1ZXN0ZWRVcmwpOgogICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUu Y3BwOgoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCAyM2NiNDczLi5jODU3ZGYyIDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCkBAIC01MzgsOCArNTM4LDEyIEBAIFFVcmwgUVdlYkZyYW1lOjp1cmwoKSBjb25zdAogKi8K IFFVcmwgUVdlYkZyYW1lOjpyZXF1ZXN0ZWRVcmwoKSBjb25zdAogeworICAgIC8vIEluIHRoZSBm b2xsb3dpbmcgZWRnZSBjYXNlcyAod2hlcmUgdGhlIGZhaWxpbmcgZG9jdW1lbnQKKyAgICAvLyBs b2FkZXIgZG9lcyBub3QgZ2V0IGNvbW1pdGVkIGJ5IHRoZSBmcmFtZSBsb2FkZXIpIGl0IGlzCisg ICAgLy8gc2FmZXIgdG8gcmVseSBvbiBvdXRnb2luZ1JlZmVycmVyIHRoYW4gb3JpZ2luYWxSZXF1 ZXN0LgogICAgIGlmICghZC0+ZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigp Ci0gICAgICAgIHx8ICFkLT5mcmFtZUxvYWRlckNsaWVudC0+bV9sb2FkU3VjY2VlZGVkKQorICAg ICAgICB8fCAoIWQtPmZyYW1lTG9hZGVyQ2xpZW50LT5tX2xvYWRTdWNjZWVkZWQKKyAgICAgICAg JiYgICFkLT5mcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIoKS5pc0VtcHR5KCkpKQog ICAgICAgICByZXR1cm4gUVVybChkLT5mcmFtZS0+bG9hZGVyKCktPm91dGdvaW5nUmVmZXJyZXIo KSk7CiAKICAgICByZXR1cm4gZC0+ZnJhbWUtPmxvYWRlcigpLT5vcmlnaW5hbFJlcXVlc3QoKS51 cmwoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IDFhYWNjZGEuLjJiMjA5ZDggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA3LTI5 ICBBbnRvbmlvIEdvbWVzICAgPGFudG9uaW8uZ29tZXNAb3BlbmJvc3NhLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFFXZWJGcmFtZTo6 cmVxdWVzdGVkVXJsIG1ldGhvZCBjYW4gbWlzLWJlaGF2ZSBpbiBjYXNlIG9mIHVuaGFuZGxlZCBz c2xFcnJvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNzgwNAorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJh bWU6OnJlcXVlc3RlZFVybCk6CisgICAgICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJh bWUuY3BwOgorCiAyMDA5LTA4LTA0ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb3IgQXJuZSBWZXN0YsO4LgpkaWZmIC0t Z2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcCBiL1dlYktp dC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKaW5kZXggNmViNGMwMi4uMTdk ZWE5OSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1l LmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCkBA IC0zMyw2ICszMyw4IEBACiAjaW5jbHVkZSA8UVJlZ0V4cD4KICNpbmNsdWRlIDxRTmV0d29ya1Jl cXVlc3Q+CiAjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4KKyNpbmNsdWRlIDxxc3NsZXJyb3IuaD4K KwogLy9URVNURURfQ0xBU1M9CiAvL1RFU1RFRF9GSUxFUz0KIApAQCAtMjE3Niw3ICsyMTc4LDkg QEAgcHVibGljOgogICAgICAgICBpZiAocmVxdWVzdC51cmwoKSA9PSBRVXJsKCJxcmM6L3Rlc3Qx Lmh0bWwiKSkgewogICAgICAgICAgICAgc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6TG9jYXRp b25IZWFkZXIsIFFTdHJpbmcoInFyYzovdGVzdDIuaHRtbCIpKTsKICAgICAgICAgICAgIHNldEF0 dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OlJlZGlyZWN0aW9uVGFyZ2V0QXR0cmlidXRlLCBRVXJs KCJxcmM6L3Rlc3QyLmh0bWwiKSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICB9IGVsc2UgaWYg KHJlcXVlc3QudXJsKCkgPT0gUVVybCgicXJjOi9mYWtlLXNzbC1lcnJvci5odG1sIikpCisgICAg ICAgICAgICBzZXRFcnJvcihRTmV0d29ya1JlcGx5OjpTc2xIYW5kc2hha2VGYWlsZWRFcnJvciwg dHIoIkZha2UgZXJyb3IgISIpKTsgLy8gZm9yY2UgYSBzc2wgZXJyb3IKKyAgICAgICAgZWxzZSBp ZiAocmVxdWVzdC51cmwoKSA9PSBRVXJsKCJodHRwOi8vYWJjZGVmLmFiY2RlZi8iKSkKICAgICAg ICAgICAgIHNldEVycm9yKFFOZXR3b3JrUmVwbHk6Okhvc3ROb3RGb3VuZEVycm9yLCB0cigiSW52 YWxpZCBVUkwiKSk7CiAKICAgICAgICAgb3BlbihRSU9EZXZpY2U6OlJlYWRPbmx5KTsKQEAgLTIy MDIsNiArMjIwNiw4IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgICAgICAgICBlbWl0IGVycm9yKHRo aXMtPmVycm9yKCkpOwogICAgICAgICBlbHNlIGlmIChyZXF1ZXN0KCkudXJsKCkgPT0gUVVybCgi aHR0cDovL2FiY2RlZi5hYmNkZWYvIikpCiAgICAgICAgICAgICBlbWl0IG1ldGFEYXRhQ2hhbmdl ZCgpOworICAgICAgICBlbHNlIGlmIChyZXF1ZXN0KCkudXJsKCkgPT0gUVVybCgicXJjOi9mYWtl LXNzbC1lcnJvci5odG1sIikpCisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgZW1pdCBy ZWFkeVJlYWQoKTsKICAgICAgICAgZW1pdCBmaW5pc2hlZCgpOwpAQCAtMjIxNywxMCArMjIyMywx NiBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBRTmV0d29ya1JlcGx5KiBjcmVh dGVSZXF1ZXN0KE9wZXJhdGlvbiBvcCwgY29uc3QgUU5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0LCBR SU9EZXZpY2UqIG91dGdvaW5nRGF0YSkKICAgICB7Ci0gICAgICAgIGlmIChvcCA9PSBRTmV0d29y a0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbgotICAgICAgICAgICAgJiYgKHJlcXVlc3QudXJs KCkudG9TdHJpbmcoKSA9PSAicXJjOi90ZXN0MS5odG1sIgotICAgICAgICAgICAgfHwgIHJlcXVl c3QudXJsKCkudG9TdHJpbmcoKSA9PSAiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikpCi0gICAgICAg ICAgICByZXR1cm4gbmV3IEZha2VSZXBseShyZXF1ZXN0LCB0aGlzKTsKKyAgICAgICAgUVN0cmlu ZyB1cmwgPSByZXF1ZXN0LnVybCgpLnRvU3RyaW5nKCk7CisgICAgICAgIGlmIChvcCA9PSBRTmV0 d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbikKKyAgICAgICAgICAgIGlmICh1cmwgPT0g InFyYzovdGVzdDEuaHRtbCIgfHwgIHVybCA9PSAiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikKKyAg ICAgICAgICAgICAgICByZXR1cm4gbmV3IEZha2VSZXBseShyZXF1ZXN0LCB0aGlzKTsKKyAgICAg ICAgICAgIGVsc2UgaWYgKHVybCA9PSAicXJjOi9mYWtlLXNzbC1lcnJvci5odG1sIikgeworICAg ICAgICAgICAgICAgIEZha2VSZXBseSogcmVwbHkgPSBuZXcgRmFrZVJlcGx5KHJlcXVlc3QsIHRo aXMpOworICAgICAgICAgICAgICAgIFFMaXN0PFFTc2xFcnJvcj4gZXJyb3JzOworICAgICAgICAg ICAgICAgIGVtaXQgc3NsRXJyb3JzKHJlcGx5LCBlcnJvcnMgPDwgUVNzbEVycm9yKFFTc2xFcnJv cjo6VW5zcGVjaWZpZWRFcnJvcikpOworICAgICAgICAgICAgICAgIHJldHVybiByZXBseTsKKyAg ICAgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpjcmVh dGVSZXF1ZXN0KG9wLCByZXF1ZXN0LCBvdXRnb2luZ0RhdGEpOwogICAgIH0KQEAgLTIyNTMsNiAr MjI2NSwxNiBAQCB2b2lkIHRzdF9RV2ViRnJhbWU6OnJlcXVlc3RlZFVybCgpCiAgICAgUUNPTVBB UkUoc3B5LmNvdW50KCksIDMpOwogICAgIFFDT01QQVJFKGZyYW1lLT5yZXF1ZXN0ZWRVcmwoKSwg UVVybCgiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikpOwogICAgIFFDT01QQVJFKGZyYW1lLT51cmwo KSwgUVVybCgiaHR0cDovL2FiY2RlZi5hYmNkZWYvIikpOworCisgICAgcVJlZ2lzdGVyTWV0YVR5 cGU8UUxpc3Q8UVNzbEVycm9yPiA+KCJRTGlzdDxRU3NsRXJyb3I+Iik7CisgICAgcVJlZ2lzdGVy TWV0YVR5cGU8UU5ldHdvcmtSZXBseSogPigiUU5ldHdvcmtSZXBseSoiKTsKKworICAgIFFTaWdu YWxTcHkgc3B5MihwYWdlLm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCksIFNJR05BTChzc2xFcnJvcnMo UU5ldHdvcmtSZXBseSosIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mKSkpOworICAgIGZyYW1lLT5z ZXRVcmwoUVVybCgicXJjOi9mYWtlLXNzbC1lcnJvci5odG1sIikpOworICAgIFFUZXN0OjpxV2Fp dCgyMDApOworICAgIFFDT01QQVJFKHNweTIuY291bnQoKSwgMSk7CisgICAgUUNPTVBBUkUoZnJh bWUtPnJlcXVlc3RlZFVybCgpLCBRVXJsKCJxcmM6L2Zha2Utc3NsLWVycm9yLmh0bWwiKSk7Cisg ICAgUUNPTVBBUkUoZnJhbWUtPnVybCgpLCBRVXJsKCJxcmM6L2Zha2Utc3NsLWVycm9yLmh0bWwi KSk7CiB9CiAKIHZvaWQgdHN0X1FXZWJGcmFtZTo6c2V0SHRtbCgpCg==