57083 2011-03-24 23:13:01 -0700 [Qt] QNetworkReplyHandler refactoring: redirect signal 2013-02-22 02:54:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED WONTFIX Qt P3 Normal --- 57075 1 luiz luiz benjamin cmarcelo hausmann jturcotte kenneth kling menard oldest_to_newest 373336 0 luiz 2011-03-24 23:13:01 -0700 Creating a new signal name 'redirected' to be sent by QNetworkReplyWrapper to QNetworkReplyHandler. The rule for this signal is that if it is sent then no other signal will be sent. Then redirections may be handled completely in its own. The other methods of QNetworkReplyHandler should not take care of redirections and the flag m_redirected is no longer needed. 373344 1 86894 luiz 2011-03-24 23:25:01 -0700 Created attachment 86894 patch please review. 374477 2 jturcotte 2011-03-28 07:37:35 -0700 - qDebug could be removed in this patch instead of removing it in the cleanup patch. - redirected() and redirect() are doing repeated logic and have confusing name. It would be nice to merge them or to give them more defining names and purpose. 86894 2011-03-24 23:25:01 -0700 2011-03-24 23:25:01 -0700 patch 0001-Qt-QNetworkReplyHandler-refactoring-redirect-signal.patch text/plain 12524 luiz RnJvbSA1ODA3YWEzOTRjNDE4NTYwYzZkMDFjOTMxN2IwNzYxOWE1NDc5Yjk3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IEZyaSwgMjUgTWFyIDIwMTEgMDM6MjM6NDQgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIFFOZXR3b3JrUmVwbHlIYW5kbGVyIHJlZmFjdG9yaW5nOiByZWRpcmVjdCBzaWdu YWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzA4MwoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpDcmVhdGluZyBhIG5ldyBzaWduYWwgbmFtZSAncmVkaXJl Y3RlZCcgdG8gYmUgc2VudCBieSBRTmV0d29ya1JlcGx5V3JhcHBlciB0byBRTmV0d29ya1JlcGx5 SGFuZGxlci4KClRoZSBydWxlIGZvciB0aGlzIHNpZ25hbCBpcyB0aGF0IGlmIGl0IGlzIHNlbnQg dGhlbiBubyBvdGhlciBzaWduYWwgd2lsbCBiZSBzZW50LiBUaGVuIHJlZGlyZWN0aW9ucwptYXkg YmUgaGFuZGxlZCBjb21wbGV0ZWx5IGluIGl0cyBvd24uIFRoZSBvdGhlciBtZXRob2RzIG9mIFFO ZXR3b3JrUmVwbHlIYW5kbGVyIHNob3VsZCBub3QgdGFrZSBjYXJlCm9mIHJlZGlyZWN0aW9ucyBh bmQgdGhlIGZsYWcgbV9yZWRpcmVjdGVkIGlzIG5vIGxvbmdlciBuZWVkZWQuCgoqIHBsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwOgooV2ViQ29yZTo6UU5ldHdvcmtS ZXBseVdyYXBwZXI6OnJlY2VpdmVNZXRhRGF0YSk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFu ZGxlcjo6cmVzZXRTdGF0ZSk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVhZEh0 dHBIZWFkZXJzKToKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmaW5pc2gpOgooV2Vi Q29yZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZUlmTmVlZGVkKToKKFdlYkNv cmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZWRpcmVjdCk6CihXZWJDb3JlOjpRTmV0d29ya1Jl cGx5SGFuZGxlcjo6cmVkaXJlY3RlZCk6CihXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6 Zm9yd2FyZERhdGEpOgoqIHBsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIu aDoKKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyU2lnbmFsUXVldWU6OnJlZGlyZWN0ZWQp OgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAyNSArKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuY3BwICAgfCAgMTExICsrKysrKysrKysrLS0tLS0tLS0tCiAuLi4vcGxhdGZvcm0vbmV0d29y ay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oICAgICB8ICAgMTEgKystCiAzIGZpbGVzIGNoYW5n ZWQsIDk3IGluc2VydGlvbnMoKyksIDUwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNDFi MWNkLi4zN2NiMWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMjQgIEx1 aXogQWdvc3RpbmkgIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRTmV0d29ya1JlcGx5SGFu ZGxlciByZWZhY3RvcmluZzogcmVkaXJlY3Qgc2lnbmFsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzA4MworCisgICAgICAgIENyZWF0aW5nIGEgbmV3 IHNpZ25hbCBuYW1lICdyZWRpcmVjdGVkJyB0byBiZSBzZW50IGJ5IFFOZXR3b3JrUmVwbHlXcmFw cGVyIHRvIFFOZXR3b3JrUmVwbHlIYW5kbGVyLgorCisgICAgICAgIFRoZSBydWxlIGZvciB0aGlz IHNpZ25hbCBpcyB0aGF0IGlmIGl0IGlzIHNlbnQgdGhlbiBubyBvdGhlciBzaWduYWwgd2lsbCBi ZSBzZW50LiBUaGVuIHJlZGlyZWN0aW9ucworICAgICAgICBtYXkgYmUgaGFuZGxlZCBjb21wbGV0 ZWx5IGluIGl0cyBvd24uIFRoZSBvdGhlciBtZXRob2RzIG9mIFFOZXR3b3JrUmVwbHlIYW5kbGVy IHNob3VsZCBub3QgdGFrZSBjYXJlCisgICAgICAgIG9mIHJlZGlyZWN0aW9ucyBhbmQgdGhlIGZs YWcgbV9yZWRpcmVjdGVkIGlzIG5vIGxvbmdlciBuZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlFOZXR3b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEpOgorICAgICAgICAoV2ViQ29y ZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlc2V0U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 UU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlYWRIdHRwSGVhZGVycyk6CisgICAgICAgIChXZWJDb3Jl OjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6ZmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3 b3JrUmVwbHlIYW5kbGVyOjpzZW5kUmVzcG9uc2VJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3Jl OjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UU5l dHdvcmtSZXBseUhhbmRsZXI6OnJlZGlyZWN0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UU5ldHdv cmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3Jr L3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1Jl cGx5SGFuZGxlclNpZ25hbFF1ZXVlOjpyZWRpcmVjdGVkKToKKwogMjAxMS0wMy0yNSAgTHVpeiBB Z29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKaW5kZXggYWE1Mzc3OS4u ZmVhMjcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9R TmV0d29ya1JlcGx5SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAKQEAgLTE5MSwxMiArMTkxLDkgQEAgdm9p ZCBRTmV0d29ya1JlcGx5V3JhcHBlcjo6cmVjZWl2ZU1ldGFEYXRhKCkKIHsKICAgICByZXNldENv bm5lY3Rpb25zKCk7CiAKLSAgICBRTmV0d29ya1JlcGx5SGFuZGxlclNpZ25hbFF1ZXVlOjpMb2Nr IGxvY2sobV9xdWV1ZSk7Ci0KICAgICBtX3JlZGlyZWN0VXJsID0gbV9yZXBseS0+YXR0cmlidXRl KFFOZXR3b3JrUmVxdWVzdDo6UmVkaXJlY3Rpb25UYXJnZXRBdHRyaWJ1dGUpLnRvVXJsKCk7CiAg ICAgaWYgKG1fcmVkaXJlY3RVcmwuaXNWYWxpZCgpKSB7Ci0gICAgICAgIG1fcXVldWUtPm1ldGFE YXRhQ2hhbmdlZCgpOwotICAgICAgICBtX3F1ZXVlLT5maW5pc2hlZCgpOworICAgICAgICBtX3F1 ZXVlLT5yZWRpcmVjdGVkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTIwNCw2ICsy MDEsOCBAQCB2b2lkIFFOZXR3b3JrUmVwbHlXcmFwcGVyOjpyZWNlaXZlTWV0YURhdGEoKQogICAg IG1fZW5jb2RpbmcgPSBleHRyYWN0Q2hhcnNldEZyb21NZWRpYVR5cGUoY29udGVudFR5cGUpOwog ICAgIG1fb2ZmaWNpYWxNaW1lVHlwZSA9IGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5cGUoY29u dGVudFR5cGUpOwogCisgICAgUU5ldHdvcmtSZXBseUhhbmRsZXJTaWduYWxRdWV1ZTo6TG9jayBs b2NrKG1fcXVldWUpOworCiAgICAgbV9xdWV1ZS0+bWV0YURhdGFDaGFuZ2VkKCk7CiAKICAgICBp ZiAobV9yZXBseS0+Ynl0ZXNBdmFpbGFibGUoKSkKQEAgLTMxNiw3ICszMTUsNiBAQCBRTmV0d29y a1JlcGx5SGFuZGxlcjo6UU5ldHdvcmtSZXBseUhhbmRsZXIoUmVzb3VyY2VIYW5kbGUqIGhhbmRs ZSwgTG9hZFR5cGUgbG9hZAogCiB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpyZXNldFN0YXRl KCkKIHsKLSAgICBtX3JlZGlyZWN0ZWQgPSBmYWxzZTsKICAgICBtX3Jlc3BvbnNlU2VudCA9IGZh bHNlOwogICAgIG1fcmVzcG9uc2VDb250YWluc0RhdGEgPSBmYWxzZTsKICAgICBtX2hhc1N0YXJ0 ZWQgPSBmYWxzZTsKQEAgLTM2MSw2ICszNTksMjQgQEAgc3RhdGljIGJvb2wgc2hvdWxkSWdub3Jl SHR0cEVycm9yKFFOZXR3b3JrUmVwbHkqIHJlcGx5LCBib29sIHJlY2VpdmVkRGF0YSkKICAgICBy ZXR1cm4gZmFsc2U7CiB9CiAKK3ZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlYWRIdHRwSGVh ZGVycyhjb25zdCBLVVJMJiB1cmwsIFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQoreworICAg IFN0cmluZyBzdWdnZXN0ZWRGaWxlbmFtZSA9IGZpbGVuYW1lRnJvbUhUVFBDb250ZW50RGlzcG9z aXRpb24oUVN0cmluZzo6ZnJvbUFzY2lpKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5yYXdIZWFk ZXIoIkNvbnRlbnQtRGlzcG9zaXRpb24iKSkpOworCisgICAgaWYgKCFzdWdnZXN0ZWRGaWxlbmFt ZS5pc0VtcHR5KCkpCisgICAgICAgIHJlc3BvbnNlLnNldFN1Z2dlc3RlZEZpbGVuYW1lKHN1Z2dl c3RlZEZpbGVuYW1lKTsKKyAgICBlbHNlCisgICAgICAgIHJlc3BvbnNlLnNldFN1Z2dlc3RlZEZp bGVuYW1lKHVybC5sYXN0UGF0aENvbXBvbmVudCgpKTsKKworICAgIGludCBzdGF0dXNDb2RlID0g bV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6Okh0dHBT dGF0dXNDb2RlQXR0cmlidXRlKS50b0ludCgpOworICAgIHJlc3BvbnNlLnNldEhUVFBTdGF0dXND b2RlKHN0YXR1c0NvZGUpOworICAgIHJlc3BvbnNlLnNldEhUVFBTdGF0dXNUZXh0KG1fcmVwbHlX cmFwcGVyLT5yZXBseSgpLT5hdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpIdHRwUmVhc29uUGhy YXNlQXR0cmlidXRlKS50b0J5dGVBcnJheSgpLmNvbnN0RGF0YSgpKTsKKworICAgIC8vIEFkZCBy ZW1haW5pbmcgaGVhZGVycy4KKyAgICBmb3JlYWNoIChjb25zdCBRTmV0d29ya1JlcGx5OjpSYXdI ZWFkZXJQYWlyJiBwYWlyLCBtX3JlcGx5V3JhcHBlci0+cmVwbHkoKS0+cmF3SGVhZGVyUGFpcnMo KSkKKyAgICAgICAgcmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKFFTdHJpbmc6OmZyb21Bc2Np aShwYWlyLmZpcnN0KSwgUVN0cmluZzo6ZnJvbUFzY2lpKHBhaXIuc2Vjb25kKSk7Cit9CisKIHZv aWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZpbmlzaCgpCiB7CiAgICAgQVNTRVJUKG1faGFzU3Rh cnRlZCk7CkBAIC0zODAsMTIgKzM5Niw2IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZp bmlzaCgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobV9yZWRpcmVjdGVkKSB7 Ci0gICAgICAgIHJlc2V0U3RhdGUoKTsKLSAgICAgICAgc3RhcnQoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQogICAgIGlmICghbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmVycm9yKCkgfHwg c2hvdWxkSWdub3JlSHR0cEVycm9yKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLCBtX3Jlc3BvbnNl Q29udGFpbnNEYXRhKSkKICAgICAgICAgY2xpZW50LT5kaWRGaW5pc2hMb2FkaW5nKG1fcmVzb3Vy Y2VIYW5kbGUsIDApOwogICAgIGVsc2UgewpAQCAtNDI4LDkgKzQzOCw3IEBAIHZvaWQgUU5ldHdv cmtSZXBseUhhbmRsZXI6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkKICAgICBpZiAoIWNsaWVudCkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgV1RGOjpTdHJpbmcgY29udGVudFR5cGUgPSBtX3JlcGx5 V3JhcHBlci0+cmVwbHkoKS0+aGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFk ZXIpLnRvU3RyaW5nKCk7Ci0gICAgV1RGOjpTdHJpbmcgZW5jb2RpbmcgPSBleHRyYWN0Q2hhcnNl dEZyb21NZWRpYVR5cGUoY29udGVudFR5cGUpOwotICAgIFdURjo6U3RyaW5nIG1pbWVUeXBlID0g ZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShjb250ZW50VHlwZSk7CisgICAgUVN0cmluZyBt aW1lVHlwZSA9IG1fcmVwbHlXcmFwcGVyLT5vZmZpY2lhbE1pbWVUeXBlKCk7CiAKICAgICBpZiAo bWltZVR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIGxldCdzIHRyeSB0byBndWVzcyBmcm9t IHRoZSBleHRlbnNpb24KQEAgLTQzOCw0NCArNDQ2LDIyIEBAIHZvaWQgUU5ldHdvcmtSZXBseUhh bmRsZXI6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkKICAgICB9CiAKICAgICBLVVJMIHVybChtX3Jl cGx5V3JhcHBlci0+cmVwbHkoKS0+dXJsKCkpOwotICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9u c2UodXJsLCBtaW1lVHlwZS5sb3dlcigpLAorICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2Uo dXJsLCBtaW1lVHlwZS50b0xvd2VyKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt X3JlcGx5V3JhcHBlci0+cmVwbHkoKS0+aGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudExl bmd0aEhlYWRlcikudG9Mb25nTG9uZygpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZW5jb2RpbmcsIFN0cmluZygpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVw bHlXcmFwcGVyLT5lbmNvZGluZygpLCBTdHJpbmcoKSk7CiAKICAgICBpZiAodXJsLmlzTG9jYWxG aWxlKCkpIHsKICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UobV9yZXNvdXJjZUhh bmRsZSwgcmVzcG9uc2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gVGhlIHN0 YXR1cyBjb2RlIGlzIGVxdWFsIHRvIDAgZm9yIHByb3RvY29scyBub3QgaW4gdGhlIEhUVFAgZmFt aWx5LgotICAgIGludCBzdGF0dXNDb2RlID0gbV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmF0dHJp YnV0ZShRTmV0d29ya1JlcXVlc3Q6Okh0dHBTdGF0dXNDb2RlQXR0cmlidXRlKS50b0ludCgpOwot Ci0gICAgaWYgKHVybC5wcm90b2NvbEluSFRUUEZhbWlseSgpKSB7Ci0gICAgICAgIFN0cmluZyBz dWdnZXN0ZWRGaWxlbmFtZSA9IGZpbGVuYW1lRnJvbUhUVFBDb250ZW50RGlzcG9zaXRpb24oUVN0 cmluZzo6ZnJvbUFzY2lpKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5yYXdIZWFkZXIoIkNvbnRl bnQtRGlzcG9zaXRpb24iKSkpOwotCi0gICAgICAgIGlmICghc3VnZ2VzdGVkRmlsZW5hbWUuaXNF bXB0eSgpKQotICAgICAgICAgICAgcmVzcG9uc2Uuc2V0U3VnZ2VzdGVkRmlsZW5hbWUoc3VnZ2Vz dGVkRmlsZW5hbWUpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXNwb25zZS5zZXRTdWdn ZXN0ZWRGaWxlbmFtZSh1cmwubGFzdFBhdGhDb21wb25lbnQoKSk7Ci0KLSAgICAgICAgcmVzcG9u c2Uuc2V0SFRUUFN0YXR1c0NvZGUoc3RhdHVzQ29kZSk7Ci0gICAgICAgIHJlc3BvbnNlLnNldEhU VFBTdGF0dXNUZXh0KG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5hdHRyaWJ1dGUoUU5ldHdvcmtS ZXF1ZXN0OjpIdHRwUmVhc29uUGhyYXNlQXR0cmlidXRlKS50b0J5dGVBcnJheSgpLmNvbnN0RGF0 YSgpKTsKLQotICAgICAgICAvLyBBZGQgcmVtYWluaW5nIGhlYWRlcnMuCi0gICAgICAgIGZvcmVh Y2ggKGNvbnN0IFFOZXR3b3JrUmVwbHk6OlJhd0hlYWRlclBhaXImIHBhaXIsIG1fcmVwbHlXcmFw cGVyLT5yZXBseSgpLT5yYXdIZWFkZXJQYWlycygpKQotICAgICAgICAgICAgcmVzcG9uc2Uuc2V0 SFRUUEhlYWRlckZpZWxkKFFTdHJpbmc6OmZyb21Bc2NpaShwYWlyLmZpcnN0KSwgUVN0cmluZzo6 ZnJvbUFzY2lpKHBhaXIuc2Vjb25kKSk7Ci0gICAgfQotCi0gICAgUVVybCByZWRpcmVjdGlvbiA9 IG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5hdHRyaWJ1dGUoUU5ldHdvcmtSZXF1ZXN0OjpSZWRp cmVjdGlvblRhcmdldEF0dHJpYnV0ZSkudG9VcmwoKTsKLSAgICBpZiAocmVkaXJlY3Rpb24uaXNW YWxpZCgpKSB7Ci0gICAgICAgIHJlZGlyZWN0KHJlc3BvbnNlLCByZWRpcmVjdGlvbik7Ci0gICAg ICAgIHJldHVybjsKLSAgICB9CisgICAgaWYgKHVybC5wcm90b2NvbEluSFRUUEZhbWlseSgpKQor ICAgICAgICByZWFkSHR0cEhlYWRlcnModXJsLCByZXNwb25zZSk7CiAKICAgICBjbGllbnQtPmRp ZFJlY2VpdmVSZXNwb25zZShtX3Jlc291cmNlSGFuZGxlLCByZXNwb25zZSk7CiB9CiAKLXZvaWQg UU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlZGlyZWN0KFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNl LCBjb25zdCBRVXJsJiByZWRpcmVjdGlvbikKK2Jvb2wgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJl ZGlyZWN0KFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBRVXJsJiByZWRpcmVjdGlv bikKIHsKICAgICBRVXJsIG5ld1VybCA9IG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT51cmwoKS5y ZXNvbHZlZChyZWRpcmVjdGlvbik7CiAKQEAgLTQ5MCw5ICs0NzYsOCBAQCB2b2lkIFFOZXR3b3Jr UmVwbHlIYW5kbGVyOjpyZWRpcmVjdChSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgY29uc3Qg UVVybCYgcmVkaQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5ld1VybC50b1N0cmluZygp LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRpb246OnRyYW5zbGF0 ZSgiUVdlYlBhZ2UiLCAiUmVkaXJlY3Rpb24gbGltaXQgcmVhY2hlZCIpKTsKICAgICAgICAgY2xp ZW50LT5kaWRGYWlsKG1fcmVzb3VyY2VIYW5kbGUsIGVycm9yKTsKLSAgICAgICAgcmV0dXJuOwor ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIG1fcmVkaXJlY3RlZCA9IHRydWU7CiAK ICAgICAvLyAgU3RhdHVzIENvZGUgMzAxIChNb3ZlZCBQZXJtYW5lbnRseSksIDMwMiAoTW92ZWQg VGVtcG9yYXJpbHkpLCAzMDMgKFNlZSBPdGhlcik6CiAgICAgLy8gICAgLSBJZiBvcmlnaW5hbCBy ZXF1ZXN0IGlzIFBPU1QgY29udmVydCB0byBHRVQgYW5kIHJlZGlyZWN0IGF1dG9tYXRpY2FsbHkK QEAgLTUxMSwxMyArNDk2LDQ3IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OnJlZGlyZWN0 KFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBRVXJsJiByZWRpCiAKICAgICBjbGll bnQtPndpbGxTZW5kUmVxdWVzdChtX3Jlc291cmNlSGFuZGxlLCBuZXdSZXF1ZXN0LCByZXNwb25z ZSk7CiAgICAgaWYgKHdhc0Fib3J0ZWQoKSkgLy8gTmV0d29yayBlcnJvciBjYW5jZWxsZWQgdGhl IHJlcXVlc3QuCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg UU9iamVjdCogb3JpZ2luYXRpbmdPYmplY3QgPSAwOwogICAgIGlmIChtX3Jlc291cmNlSGFuZGxl LT5nZXRJbnRlcm5hbCgpLT5tX2NvbnRleHQpCiAgICAgICAgIG9yaWdpbmF0aW5nT2JqZWN0ID0g bV9yZXNvdXJjZUhhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9jb250ZXh0LT5vcmlnaW5hdGluZ09i amVjdCgpOwogCiAgICAgbV9yZXF1ZXN0ID0gbmV3UmVxdWVzdC50b05ldHdvcmtSZXF1ZXN0KG9y aWdpbmF0aW5nT2JqZWN0KTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBRTmV0d29ya1Jl cGx5SGFuZGxlcjo6cmVkaXJlY3RlZCgpCit7CisgICAgcURlYnVnKCkgPDwgInJlZGlyZWN0ZWQ6 ICIgPDwgbV9yZWRpcmVjdGlvblRyaWVzOworCisgICAgQVNTRVJUKG1faGFzU3RhcnRlZCk7CisK KyAgICBpZiAoIW1fcmVwbHlXcmFwcGVyIHx8ICFtX3JlcGx5V3JhcHBlci0+cmVwbHkoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgaWYgKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT5lcnJvcigp ICYmICFzaG91bGRJZ25vcmVIdHRwRXJyb3IobV9yZXBseVdyYXBwZXItPnJlcGx5KCksIG1fcmVz cG9uc2VDb250YWluc0RhdGEpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAod2FzQWJvcnRl ZCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSZXNvdXJjZUhhbmRsZUNsaWVudCogY2xpZW50 ID0gbV9yZXNvdXJjZUhhbmRsZS0+Y2xpZW50KCk7CisgICAgaWYgKCFjbGllbnQpCisgICAgICAg IHJldHVybjsKKworICAgIEtVUkwgdXJsKG1fcmVwbHlXcmFwcGVyLT5yZXBseSgpLT51cmwoKSk7 CisgICAgUmVzb3VyY2VSZXNwb25zZSByZXNwb25zZSh1cmwsIG1fcmVwbHlXcmFwcGVyLT5vZmZp Y2lhbE1pbWVUeXBlKCkudG9Mb3dlcigpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bV9yZXBseVdyYXBwZXItPnJlcGx5KCktPmhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRM ZW5ndGhIZWFkZXIpLnRvTG9uZ0xvbmcoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fcmVwbHlXcmFwcGVyLT5lbmNvZGluZygpLCBTdHJpbmcoKSk7CisKKyAgICBpZiAodXJsLnBy b3RvY29sSW5IVFRQRmFtaWx5KCkpCisgICAgICAgIHJlYWRIdHRwSGVhZGVycyh1cmwsIHJlc3Bv bnNlKTsKKworICAgIGJvb2wgcmVzdGFydCA9ICByZWRpcmVjdChyZXNwb25zZSwgbV9yZXBseVdy YXBwZXItPnJlZGlyZWN0VXJsKCkpOworICAgIHJlc2V0U3RhdGUoKTsKKyAgICBpZiAocmVzdGFy dCkKKyAgICAgICAgbV9zaWduYWxRdWV1ZS5wdXNoKCZRTmV0d29ya1JlcGx5SGFuZGxlcjo6c3Rh cnQpOwogfQogCiB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpmb3J3YXJkRGF0YSgpCkBAIC01 MjksMTAgKzU0OCw2IEBAIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKCkK IAogICAgIHNlbmRSZXNwb25zZUlmTmVlZGVkKCk7CiAKLSAgICAvLyBkb24ndCBlbWl0IHRoZSAi RG9jdW1lbnQgaGFzIG1vdmVkIGhlcmUiIHR5cGUgb2YgSFRNTAotICAgIGlmIChtX3JlZGlyZWN0 ZWQpCi0gICAgICAgIHJldHVybjsKLQogICAgIGlmICh3YXNBYm9ydGVkKCkpCiAgICAgICAgIHJl dHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9R TmV0d29ya1JlcGx5SGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9x dC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCmluZGV4IDljMzdlMGUuLjliNDc1NmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVw bHlIYW5kbGVyLmgKQEAgLTk2LDYgKzk2LDcgQEAgcHVibGljOgogICAgIHZvaWQgZmluaXNoZWQo KTsKICAgICB2b2lkIG1ldGFEYXRhQ2hhbmdlZCgpOwogICAgIHZvaWQgcmVhZHlSZWFkKCk7Cisg ICAgdm9pZCByZWRpcmVjdGVkKCk7CiAKIHByaXZhdGU6CiAgICAgUU5ldHdvcmtSZXBseUhhbmRs ZXIqIG1fcmVwbHlIYW5kbGVyOwpAQCAtMTI4LDE4ICsxMjksMTkgQEAgcHVibGljIHNsb3RzOgog ICAgIHZvaWQgc2VuZFJlc3BvbnNlSWZOZWVkZWQoKTsKICAgICB2b2lkIGZvcndhcmREYXRhKCk7 CiAgICAgdm9pZCB1cGxvYWRQcm9ncmVzcyhxaW50NjQgYnl0ZXNTZW50LCBxaW50NjQgYnl0ZXNU b3RhbCk7CisgICAgdm9pZCByZWRpcmVjdGVkKCk7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBzdGFy dCgpOwogICAgIHZvaWQgcmVzZXRTdGF0ZSgpOwogICAgIFN0cmluZyBodHRwTWV0aG9kKCkgY29u c3Q7Ci0gICAgdm9pZCByZWRpcmVjdChSZXNvdXJjZVJlc3BvbnNlJiwgY29uc3QgUVVybCYpOwor ICAgIGJvb2wgcmVkaXJlY3QoUmVzb3VyY2VSZXNwb25zZSYsIGNvbnN0IFFVcmwmKTsKICAgICBi b29sIHdhc0Fib3J0ZWQoKSBjb25zdCB7IHJldHVybiAhbV9yZXNvdXJjZUhhbmRsZTsgfQogICAg IFFOZXR3b3JrUmVwbHkqIHNlbmROZXR3b3JrUmVxdWVzdCgpOworICAgIHZvaWQgcmVhZEh0dHBI ZWFkZXJzKGNvbnN0IEtVUkwmLCBSZXNvdXJjZVJlc3BvbnNlJik7CiAKICAgICBRTmV0d29ya1Jl cGx5V3JhcHBlciogbV9yZXBseVdyYXBwZXI7CiAgICAgUmVzb3VyY2VIYW5kbGUqIG1fcmVzb3Vy Y2VIYW5kbGU7Ci0gICAgYm9vbCBtX3JlZGlyZWN0ZWQ7CiAgICAgYm9vbCBtX3Jlc3BvbnNlU2Vu dDsKICAgICBib29sIG1fcmVzcG9uc2VDb250YWluc0RhdGE7CiAgICAgTG9hZFR5cGUgbV9sb2Fk VHlwZTsKQEAgLTE5OSw2ICsyMDEsMTEgQEAgaW5saW5lIHZvaWQgUU5ldHdvcmtSZXBseUhhbmRs ZXJTaWduYWxRdWV1ZTo6bWV0YURhdGFDaGFuZ2VkKCkKICAgICBwdXNoKCZRTmV0d29ya1JlcGx5 SGFuZGxlcjo6c2VuZFJlc3BvbnNlSWZOZWVkZWQpOwogfQogCitpbmxpbmUgdm9pZCBRTmV0d29y a1JlcGx5SGFuZGxlclNpZ25hbFF1ZXVlOjpyZWRpcmVjdGVkKCkKK3sKKyAgICBwdXNoKCZRTmV0 d29ya1JlcGx5SGFuZGxlcjo6cmVkaXJlY3RlZCk7Cit9CisKIGlubGluZSB2b2lkIFFOZXR3b3Jr UmVwbHlIYW5kbGVyU2lnbmFsUXVldWU6OnJlYWR5UmVhZCgpCiB7CiAgICAgcHVzaCgmUU5ldHdv cmtSZXBseUhhbmRsZXI6OmZvcndhcmREYXRhKTsKLS0gCjEuNy4xCgo=