99082 2012-10-11 10:07:49 -0700 [BlackBerry] Credentials for HTTPS urls are saved in the HTTP protection space 2012-10-11 10:53:24 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 740081 0 otcheung 2012-10-11 10:07:49 -0700 Protectionspace for secure and non-secure protocols are being saved to the same map in credential manager. 740089 1 168247 otcheung 2012-10-11 10:11:09 -0700 Created attachment 168247 Patch 740118 2 168247 rwlbuis 2012-10-11 10:33:23 -0700 Comment on attachment 168247 Patch LGTM. 740137 3 168247 webkit.review.bot 2012-10-11 10:53:21 -0700 Comment on attachment 168247 Patch Clearing flags on attachment: 168247 Committed r131082: <http://trac.webkit.org/changeset/131082> 740138 4 webkit.review.bot 2012-10-11 10:53:24 -0700 All reviewed patches have been landed. Closing bug. 168247 2012-10-11 10:11:09 -0700 2012-10-11 10:53:21 -0700 Patch bug-99082-20121011131006.patch text/plain 8739 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI5M2M1NTJhZTMyODYx YzA5MThiYzFmN2Q5MThkMzVhYzAzYTQ0YS4uZDczMzAxNGIyMTFiYWIzNjkxODBiOTFjZWZkYTg4 YTI5Mzg3OWNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTEwLTExICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IENyZWRlbnRpYWxzIGZvciBIVFRQUyB1cmxzIGFyZSBzYXZlZCBpbiB0aGUgSFRUUCBwcm90ZWN0 aW9uIHNwYWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05OTA4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZGluZyBzdXBwb3J0IGZvciBzZWN1cmUgUHJvdGVjdGlvblNwYWNlcyBpbiBDcmVkZW50aWFs cworICAgICAgICB0byBwcmV2ZW50IGNyZWRlbnRpYWxzIGZyb20gYmVpbmcgb3ZlcndyaXR0ZW4v dXNlZCB3aGVuIHRoZSB1c2VyCisgICAgICAgIGFjY2Vzc2VzIGJvdGggdmVyc2lvbnMgb2YgdGhl IHNhbWUgdXJsLgorCisgICAgICAgIFBSIDE5OTQ1NworCisgICAgICAgIFRoZSBpc3N1ZSB3YXMg dGhlIHNlY3VyZS9ub24tc2VjdXJlIHZlcnNpb24gb2YgdGhlIHNhbWUgcHJvdG9jb2wKKyAgICAg ICAgd2VyZSB1c2luZyB0aGUgc2FtZSBQcm90ZWN0aW9uU3BhY2UgZW51bSBpbiB0aGUgbmV0d29y ayBzdGFjay4gV2hlbgorICAgICAgICB0aGUgY3JlZGVudGlhbHMgYXJlIHNhdmVkLCBpdCB3aWxs IG92ZXJ3cml0ZSBlYWNoIG90aGVyIHNpbmNlIHRoZQorICAgICAgICBwcm90ZWN0aW9uIG9iamVj dCBpcyBpZGVudGljYWwuCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byB1c2UgdGhlIFdlYktpdCBw cm92aWRlZCBzZWN1cmUgZW51bXMgd2hlbiB0aGUgcHJvdGNvbCBpcyBzZWN1cmUuCisKKyAgICAg ICAgVG8gdGVzdCB0aGlzLCBhY2Nlc3MgYSByZXN0cmljdGVkIHNpdGUgdGhhdCBpcyBydW5uaW5n IG9uIGh0dHAuIFNhdmUgdGhlCisgICAgICAgIHBhc3N3b3JkIGFuZCBhY2Nlc3MgdGhlIHNhbWUg cmVzdHJpY3RlZCBzaXRlIChzYW1lIGRvbWFpbgorICAgICAgICBhbmQgcGF0aCkgYnV0IG9uIGh0 dHBzLiBUaGUgYnJvd3NlciBzaG91bGQgcHJvbXB0IGZvciBjcmVkZW50aWFscy4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok5ldHdvcmtKb2I6Om5vdGlmeUF1dGhSZWNlaXZlZCk6CisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrSm9iOjpoYW5kbGVGVFBIZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6TmV0 d29ya0pvYjo6c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMpOgorICAgICAgICAoV2ViQ29yZTo6 TmV0d29ya0pvYjo6c3RvcmVDcmVkZW50aWFscyk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtNYW5hZ2VyOjpzdGFydEpvYik6CisKIDIwMTItMTAtMTEgIENocmlzdG9waGUgRHVtZXogIDxj aHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAogICAgICAgICBSZWdyZXNzaW9uKHIxMzEwNTgp OiBCcm9rZSBFRkwgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCA0NjU1ZTc5ODIwYzAwYmJk NjFjOWY2NjgwYTZkZWJlYmExZDM4MjFhLi40MWZiMzk2Njg1ODhmNzg0NDIwYjI2MjkyNWM2OTJh ZTY1MDJiMzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC0yNTIsNiArMjUyLDEwIEBAIHZvaWQg TmV0d29ya0pvYjo6bm90aWZ5QXV0aFJlY2VpdmVkKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3 b3JrUmVxdWVzdDo6QXV0aFR5CiAKICAgICBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlIHNlcnZl clR5cGUgPSBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJIVFRQOwogICAgIFByb3RlY3Rpb25TcGFjZUF1 dGhlbnRpY2F0aW9uU2NoZW1lIHNjaGVtZSA9IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9u U2NoZW1lRGVmYXVsdDsKKworICAgIGlmIChtX3Jlc3BvbnNlLnVybCgpLnByb3RvY29sSXMoImh0 dHBzIikpCisgICAgICAgIHNlcnZlclR5cGUgPSBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJIVFRQUzsK KwogICAgIHN3aXRjaCAoYXV0aFR5cGUpIHsKICAgICBjYXNlIE5ldHdvcmtSZXF1ZXN0OjpBdXRo SFRUUEJhc2ljOgogICAgICAgICBzY2hlbWUgPSBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlv blNjaGVtZUhUVFBCYXNpYzsKQEAgLTI2NiwxMCArMjcwLDE2IEBAIHZvaWQgTmV0d29ya0pvYjo6 bm90aWZ5QXV0aFJlY2VpdmVkKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6 QXV0aFR5CiAgICAgICAgIHNjaGVtZSA9IFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2No ZW1lTlRMTTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBOZXR3b3JrUmVxdWVzdDo6QXV0aEZU UDoKLSAgICAgICAgc2VydmVyVHlwZSA9IFByb3RlY3Rpb25TcGFjZVNlcnZlckZUUDsKKyAgICAg ICAgaWYgKG1fcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJcygiZnRwcyIpKQorICAgICAgICAgICAg c2VydmVyVHlwZSA9IFByb3RlY3Rpb25TcGFjZVNlcnZlckZUUFM7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIHNlcnZlclR5cGUgPSBQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJGVFA7CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgTmV0d29ya1JlcXVlc3Q6OkF1dGhQcm94eToKLSAgICAgICAgc2Vy dmVyVHlwZSA9IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUDsKKyAgICAgICAgaWYgKG1fcmVzcG9u c2UudXJsKCkucHJvdG9jb2xJcygiaHR0cHMiKSkKKyAgICAgICAgICAgIHNlcnZlclR5cGUgPSBQ cm90ZWN0aW9uU3BhY2VQcm94eUhUVFBTOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzZXJ2 ZXJUeXBlID0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQOwogICAgICAgICBicmVhazsKICAgICBj YXNlIE5ldHdvcmtSZXF1ZXN0OjpBdXRoTm9uZToKICAgICBkZWZhdWx0OgpAQCAtNjk4LDcgKzcw OCwxMCBAQCBib29sIE5ldHdvcmtKb2I6OmhhbmRsZUZUUEhlYWRlcihjb25zdCBTdHJpbmcmIGhl YWRlcikKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSA1MzA6CiAgICAgICAgIHB1cmdlQ3JlZGVu dGlhbHMoKTsKLSAgICAgICAgc2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoUHJvdGVjdGlvblNw YWNlU2VydmVyRlRQLCBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZURlZmF1bHQs ICJmdHAiKTsKKyAgICAgICAgaWYgKG1fcmVzcG9uc2UudXJsKCkucHJvdG9jb2xJcygiZnRwcyIp KQorICAgICAgICAgICAgc2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoUHJvdGVjdGlvblNwYWNl U2VydmVyRlRQUywgUHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRpb25TY2hlbWVEZWZhdWx0LCAi ZnRwIik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNlbmRSZXF1ZXN0V2l0aENyZWRlbnRp YWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlckZUUCwgUHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRp b25TY2hlbWVEZWZhdWx0LCAiZnRwIik7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgMjMwOgog ICAgICAgICBzdG9yZUNyZWRlbnRpYWxzKCk7CkBAIC03MjcsMTMgKzc0MCwyMCBAQCBib29sIE5l dHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZl clR5cGUgdHlwZSwgUHJvdAogCiAgICAgU3RyaW5nIGhvc3Q7CiAgICAgaW50IHBvcnQ7Ci0gICAg aWYgKHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQKSB7CisgICAgaWYgKHR5cGUgPT0g UHJvdGVjdGlvblNwYWNlUHJveHlIVFRQIHx8IHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlI VFRQUykgewogICAgICAgICAvLyBwcm94eUFkZHJlc3MgcmV0dXJucyBob3N0OnBvcnQsIHdpdGhv dXQgYSBwcm90b2NvbC4gS1VSTCBjYW4ndCBwYXJzZSB0aGlzLCBzbyBzdGljayBodHRwCiAgICAg ICAgIC8vIG9uIHRoZSBmcm9udC4KICAgICAgICAgLy8gKFdlIGNvdWxkIHNwbGl0IGludG8gaG9z dCBhbmQgcG9ydCBieSBoYW5kLCBidXQgdGhhdCBnZXRzIGhhcmQgdG8gcGFyc2Ugd2l0aCBJUHY2 IHVybHMsCiAgICAgICAgIC8vIHNvIGJldHRlciB0byByZXVzZSBLVVJMJ3MgcGFyc2luZy4pCi0g ICAgICAgIFN0cmluZyBwcm94eUFkZHJlc3MgPSBTdHJpbmcoImh0dHA6Ly8iKSArIEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2UoKS0+cHJveHlBZGRyZXNzKG5ld1VSTC5z dHJpbmcoKS5hc2NpaSgpLmRhdGEoKSkuY19zdHIoKTsKLSAgICAgICAgS1VSTCBwcm94eVVSTChL VVJMKCksIHByb3h5QWRkcmVzcyk7CisgICAgICAgIFN0cmluZ0J1aWxkZXIgcHJveHlBZGRyZXNz OworCisgICAgICAgIGlmICh0eXBlID09IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUCkKKyAgICAg ICAgICAgIHByb3h5QWRkcmVzcy5hcHBlbmQoImh0dHA6Ly8iKTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgcHJveHlBZGRyZXNzLmFwcGVuZCgiaHR0cHM6Ly8iKTsKKworICAgICAgICBwcm94 eUFkZHJlc3MuYXBwZW5kKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2Uo KS0+cHJveHlBZGRyZXNzKG5ld1VSTC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSkuY19zdHIoKSk7 CisgICAgICAgIEtVUkwgcHJveHlVUkwoS1VSTCgpLCBwcm94eUFkZHJlc3MudG9TdHJpbmcoKSk7 CiAgICAgICAgIGhvc3QgPSBwcm94eVVSTC5ob3N0KCk7CiAgICAgICAgIHBvcnQgPSBwcm94eVVS TC5wb3J0KCk7CiAgICAgfSBlbHNlIHsKQEAgLTc2Niw3ICs3ODYsNyBAQCBib29sIE5ldHdvcmtK b2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUg dHlwZSwgUHJvdAogICAgICAgICBTdHJpbmcgdXNlcm5hbWU7CiAgICAgICAgIFN0cmluZyBwYXNz d29yZDsKIAotICAgICAgICBpZiAodHlwZSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFApIHsK KyAgICAgICAgaWYgKHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQIHx8IHR5cGUgPT0g UHJvdGVjdGlvblNwYWNlUHJveHlIVFRQUykgewogICAgICAgICAgICAgdXNlcm5hbWUgPSBTdHJp bmcoQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5wcm94eVVzZXJu YW1lKCkuY19zdHIoKSk7CiAgICAgICAgICAgICBwYXNzd29yZCA9IFN0cmluZyhCbGFja0JlcnJ5 OjpQbGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPnByb3h5UGFzc3dvcmQoKS5jX3N0cigp KTsKICAgICAgICAgfSBlbHNlIHsKQEAgLTc3OCw3ICs3OTgsNyBAQCBib29sIE5ldHdvcmtKb2I6 OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUgdHlw ZSwgUHJvdAogICAgICAgICBpZiAoIXVzZXJuYW1lLmlzRW1wdHkoKSB8fCAhcGFzc3dvcmQuaXNF bXB0eSgpKSB7CiAgICAgICAgICAgICAvLyBQcmV2ZW50IHRoZW0gZnJvbSBiZWVuIHVzZWQgYWdh aW4gaWYgdGhleSBhcmUgd3JvbmcuCiAgICAgICAgICAgICAvLyBJZiB0aGV5IGFyZSBjb3JyZWN0 LCB0aGV5IHdpbGwgdGhlIHB1dCBpbnRvIENyZWRlbnRpYWxTdG9yYWdlLgotICAgICAgICAgICAg aWYgKHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQKQorICAgICAgICAgICAgaWYgKHR5 cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQIHx8IHR5cGUgPT0gUHJvdGVjdGlvblNwYWNl UHJveHlIVFRQUykKICAgICAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U2V0dGlu Z3M6Omluc3RhbmNlKCktPnNldFByb3h5Q3JlZGVudGlhbCgiIiwgIiIpOwogICAgICAgICAgICAg ZWxzZSB7CiAgICAgICAgICAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fdXNlciA9 ICIiOwpAQCAtODI1LDcgKzg0NSw3IEBAIHZvaWQgTmV0d29ya0pvYjo6c3RvcmVDcmVkZW50aWFs cygpCiAgICAgQ3JlZGVudGlhbFN0b3JhZ2U6OnNldChjaGFsbGVuZ2UucHJvcG9zZWRDcmVkZW50 aWFsKCksIGNoYWxsZW5nZS5wcm90ZWN0aW9uU3BhY2UoKSwgbV9yZXNwb25zZS51cmwoKSk7CiAg ICAgY2hhbGxlbmdlLnNldFN0b3JlZCh0cnVlKTsKIAotICAgIGlmIChjaGFsbGVuZ2UucHJvdGVj dGlvblNwYWNlKCkuc2VydmVyVHlwZSgpID09IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUCkgewor ICAgIGlmIChjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCkuc2VydmVyVHlwZSgpID09IFByb3Rl Y3Rpb25TcGFjZVByb3h5SFRUUCB8fCBjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCkuc2VydmVy VHlwZSgpID09IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUFMpIHsKICAgICAgICAgQmxhY2tCZXJy eTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5zZXRQcm94eUNyZWRlbnRpYWwoY2hh bGxlbmdlLnByb3Bvc2VkQ3JlZGVudGlhbCgpLnVzZXIoKS51dGY4KCkuZGF0YSgpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNoYWxsZW5nZS5wcm9wb3NlZENyZWRlbnRpYWwoKS5wYXNzd29yZCgpLnV0ZjgoKS5kYXRhKCkp OwogICAgICAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5wYWdlKCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtN YW5hZ2VyLmNwcAppbmRleCA1ZDAzNmI1MDFmYzU0ZmJkZTJhNjg2ZjZlMmU5YWMyZWZiMTI1NWNk Li41MmNmZjliNWMyNmFhNTgwNjBhODkxZjdkZDRhYzU5ZWIyMDM5MDZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrTWFuYWdlci5jcHAKQEAgLTEwNSw3ICsxMDUsNyBAQCBib29sIE5ldHdvcmtNYW5hZ2VyOjpz dGFydEpvYihpbnQgcGxheWVySWQsIGNvbnN0IFN0cmluZyYgcGFnZUdyb3VwTmFtZSwgUGFzc1Jl ZgogICAgICAgICBTdHJpbmcgcGFzc3dvcmQgPSBjcmVkZW50aWFsLnBhc3N3b3JkKCk7CiAKICAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoVHlwZSBhdXRo VHlwZSA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6QXV0aE5vbmU7Ci0g ICAgICAgIGlmICh0eXBlID09IFByb3RlY3Rpb25TcGFjZVNlcnZlckhUVFApIHsKKyAgICAgICAg aWYgKHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlU2VydmVySFRUUCB8fCB0eXBlID09IFByb3RlY3Rp b25TcGFjZVNlcnZlckhUVFBTKSB7CiAgICAgICAgICAgICBzd2l0Y2ggKHByb3RlY3Rpb25TcGFj ZS5hdXRoZW50aWNhdGlvblNjaGVtZSgpKSB7CiAgICAgICAgICAgICBjYXNlIFByb3RlY3Rpb25T cGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lSFRUUEJhc2ljOgogICAgICAgICAgICAgICAgIGF1dGhU eXBlID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoSFRUUEJhc2lj OwpAQCAtMTI0LDkgKzEyNCw5IEBAIGJvb2wgTmV0d29ya01hbmFnZXI6OnN0YXJ0Sm9iKGludCBw bGF5ZXJJZCwgY29uc3QgU3RyaW5nJiBwYWdlR3JvdXBOYW1lLCBQYXNzUmVmCiAgICAgICAgICAg ICAgICAgLy8gRGVmYXVsdHMgdG8gQXV0aE5vbmUgYXMgcGVyIGFib3ZlLgogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gUHJv dGVjdGlvblNwYWNlU2VydmVyRlRQKQorICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gUHJvdGVj dGlvblNwYWNlU2VydmVyRlRQIHx8IHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlU2VydmVyRlRQUykK ICAgICAgICAgICAgIGF1dGhUeXBlID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1 ZXN0OjpBdXRoRlRQOwotICAgICAgICBlbHNlIGlmICh0eXBlID09IFByb3RlY3Rpb25TcGFjZVBy b3h5SFRUUCkKKyAgICAgICAgZWxzZSBpZiAodHlwZSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhU VFAgfHwgdHlwZSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFBTKQogICAgICAgICAgICAgYXV0 aFR5cGUgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkF1dGhQcm94eTsK IAogICAgICAgICBpZiAoYXV0aFR5cGUgIT0gQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtS ZXF1ZXN0OjpBdXRoTm9uZSkK