91871 2012-07-20 08:57:41 -0700 [BlackBerry] Support Negotiate auth 2012-07-31 08:41:31 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 joenotcharles joenotcharles mifenton webkit.review.bot oldest_to_newest 674613 0 joenotcharles 2012-07-20 08:57:41 -0700 NetworkJob needs some additions to support Negotiate auth, which uses a ticket so does not necessarily need a username and password. 683085 1 155542 joenotcharles 2012-07-31 08:13:35 -0700 Created attachment 155542 patch The API changes to support this patch are ready, so finally ready to get it reviewed and committed. 683121 2 155542 webkit.review.bot 2012-07-31 08:41:28 -0700 Comment on attachment 155542 patch Clearing flags on attachment: 155542 Committed r124205: <http://trac.webkit.org/changeset/124205> 683122 3 webkit.review.bot 2012-07-31 08:41:31 -0700 All reviewed patches have been landed. Closing bug. 155542 2012-07-31 08:13:35 -0700 2012-07-31 08:41:28 -0700 patch 0001-BlackBerry-Support-Negotiate-auth.patch text/plain 11826 joenotcharles RnJvbSA0N2FkNWRhYWIwNmY1YThkOGZmYTExMTRhYzNhYTc3YjFjMGI1OTFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDIwIEp1bCAyMDEyIDEyOjA4OjU2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFN1cHBvcnQgTmVnb3RpYXRlIGF1dGgKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05MTg3MQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpBZGQgTmVnb3RpYXRl IHRvIHRoZSBsaXN0IG9mIGF1dGggc2NoZW1lcyBhbGxvd2VkIGluIHRoZSBwbGF0Zm9ybSByZXF1 ZXN0LgoKQWRkICJzdWNjZXNzIiBhbmQgInJlcXVpcmVDcmVkZW50aWFscyIgcGFyYW1ldGVycyB0 byBub3RpZnlBdXRoUmVjZWl2ZWQgKHdoaWNoIGlzIG5vdyBjYWxsZWQKd2l0aCBzdWNjZXNzID0g dHJ1ZSBvbiBzdWNjZXNzZnVsIGF1dGhlbnRpY2F0aW9uLCBhcyB3ZWxsIGFzIG9uIGZhaWx1cmVz KS4KCldoZW4gc3VjY2VzcyBpcyB0cnVlLCB1cGRhdGUgdGhlIHN0b3JlZCBjcmVkZW50aWFsIHRv IHVzZSB0aGUgYXV0aCBzY2hlbWUgYWN0dWFsbHkgcmVwb3J0ZWQKcmF0aGVyIHRoYW4gdGhhdCBz ZXQgaW4gdGhlIHJlcXVlc3QuIChUaGlzIGlzIHVzZWQgd2hlbiBOZWdvdGlhdGUgYXV0aCBjYW4n dCBnZXQgYSB0aWNrZXQKYW5kIGZhbGxzIGJhY2sgdG8gYSBkaWZmZXJlbnQgc3VwcG9ydGVkIGF1 dGggdHlwZS4pCgpXaGVuIHJlcXVpcmVDcmVkZW50aWFscyBpcyBmYWxzZSwganVzdCBzZXQgdGhl IGF1dGggdHlwZSBhbmQgc3RhcnQgYSBuZXcgcmVxdWVzdCB1c2luZyBlbXB0eQpjcmVkZW50aWFs cy4KClJJTSBQUiMgMTY2NTE0CkludGVybmFsbHkgcmV2aWV3ZWQgYnkgSm9uYXRoYW4gRG9uZwoK KiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6CihXZWJDb3JlOjpO ZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQpOiBBZGQgTmVnb3RpYXRlIHRvIHRoZSBhdXRo IHNjaGVtZSBzd2l0Y2guIEhhbmRsZQpzdWNjZXNzIHBhcmFtIGJ5IHVwZGF0aW5nIGF1dGggdHlw ZSBpbiBzdG9yZWQgY3JlZGVudGlhbHM7IHBhc3MgcmVxdWlyZUNyZWRlbnRpYWxzIHBhcmFtIG9u CnRvIHNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzLgooV2ViQ29yZTo6TmV0d29ya0pvYjo6c3Rh cnROZXdKb2JXaXRoUmVxdWVzdCk6IEZpeCB0eXBvIGluIGluY3JlYXNlUmVkaXJlY3RDb3VudCBw YXJhbWV0ZXIKbmFtZS4KKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRl bnRpYWxzKTogVXNlIGVtcHR5IGNyZWRlbnRpYWxzIGlmCnJlcXVpcmVDcmVkZW50aWFscyBpcyBm YWxzZS4KKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oOgooTmV0d29y a0pvYik6CiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcDoK KFdlYkNvcmU6Ok5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYik6IEFkZCBOZWdvdGlhdGUgdG8gdGhl IGF1dGggc2NoZW1lIHN3aXRjaC4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICB8ICAgMzUgKysrKysrKysrKysrKysrKwogLi4uL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCAgICAgfCAgIDQyICsrKysrKysrKysr KysrKystLS0tCiAuLi4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCAg ICAgICB8ICAgIDYgKy0KIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01h bmFnZXIuY3BwIHwgICAgMyArCiA0IGZpbGVzIGNoYW5nZWQsIDc1IGluc2VydGlvbnMoKyksIDEx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlZDE4MGQxLi5hODc1ZWJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMzggQEAKKzIwMTItMDctMjAgIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29t PgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBTdXBwb3J0IE5lZ290aWF0ZSBhdXRoCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTg3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBOZWdvdGlhdGUgdG8g dGhlIGxpc3Qgb2YgYXV0aCBzY2hlbWVzIGFsbG93ZWQgaW4gdGhlIHBsYXRmb3JtIHJlcXVlc3Qu CisKKyAgICAgICAgQWRkICJzdWNjZXNzIiBhbmQgInJlcXVpcmVDcmVkZW50aWFscyIgcGFyYW1l dGVycyB0byBub3RpZnlBdXRoUmVjZWl2ZWQgKHdoaWNoIGlzIG5vdyBjYWxsZWQKKyAgICAgICAg d2l0aCBzdWNjZXNzID0gdHJ1ZSBvbiBzdWNjZXNzZnVsIGF1dGhlbnRpY2F0aW9uLCBhcyB3ZWxs IGFzIG9uIGZhaWx1cmVzKS4KKworICAgICAgICBXaGVuIHN1Y2Nlc3MgaXMgdHJ1ZSwgdXBkYXRl IHRoZSBzdG9yZWQgY3JlZGVudGlhbCB0byB1c2UgdGhlIGF1dGggc2NoZW1lIGFjdHVhbGx5IHJl cG9ydGVkCisgICAgICAgIHJhdGhlciB0aGFuIHRoYXQgc2V0IGluIHRoZSByZXF1ZXN0LiAoVGhp cyBpcyB1c2VkIHdoZW4gTmVnb3RpYXRlIGF1dGggY2FuJ3QgZ2V0IGEgdGlja2V0CisgICAgICAg IGFuZCBmYWxscyBiYWNrIHRvIGEgZGlmZmVyZW50IHN1cHBvcnRlZCBhdXRoIHR5cGUuKQorCisg ICAgICAgIFdoZW4gcmVxdWlyZUNyZWRlbnRpYWxzIGlzIGZhbHNlLCBqdXN0IHNldCB0aGUgYXV0 aCB0eXBlIGFuZCBzdGFydCBhIG5ldyByZXF1ZXN0IHVzaW5nIGVtcHR5CisgICAgICAgIGNyZWRl bnRpYWxzLgorCisgICAgICAgIFJJTSBQUiMgMTY2NTE0CisgICAgICAgIEludGVybmFsbHkgcmV2 aWV3ZWQgYnkgSm9uYXRoYW4gRG9uZworCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pvYjo6bm90 aWZ5QXV0aFJlY2VpdmVkKTogQWRkIE5lZ290aWF0ZSB0byB0aGUgYXV0aCBzY2hlbWUgc3dpdGNo LiBIYW5kbGUKKyAgICAgICAgc3VjY2VzcyBwYXJhbSBieSB1cGRhdGluZyBhdXRoIHR5cGUgaW4g c3RvcmVkIGNyZWRlbnRpYWxzOyBwYXNzIHJlcXVpcmVDcmVkZW50aWFscyBwYXJhbSBvbgorICAg ICAgICB0byBzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscy4KKyAgICAgICAgKFdlYkNvcmU6Ok5l dHdvcmtKb2I6OnN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QpOiBGaXggdHlwbyBpbiBpbmNyZWFzZVJl ZGlyZWN0Q291bnQgcGFyYW1ldGVyCisgICAgICAgIG5hbWUuCisgICAgICAgIChXZWJDb3JlOjpO ZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyk6IFVzZSBlbXB0eSBjcmVkZW50 aWFscyBpZgorICAgICAgICByZXF1aXJlQ3JlZGVudGlhbHMgaXMgZmFsc2UuCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaDoKKyAgICAgICAgKE5ldHdv cmtKb2IpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFu YWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrTWFuYWdlcjo6c3RhcnRKb2IpOiBB ZGQgTmVnb3RpYXRlIHRvIHRoZSBhdXRoIHNjaGVtZSBzd2l0Y2guCisKIDIwMTItMDctMjcgIEVs aSBGaWRsZXIgIDxlZmlkbGVyQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFVzZSBu ZXcgTG9jYWxlSGFuZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCBhNmRkMWE4Li5kNjkzNTRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkv TmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC0yMzEsNyArMjMxLDcgQEAgdm9pZCBOZXR3b3JrSm9i Ojpub3RpZnlNdWx0aXBhcnRIZWFkZXJSZWNlaXZlZChjb25zdCBjaGFyKiBrZXksIGNvbnN0IGNo YXIqIHZhbHUKICAgICAgICAgaGFuZGxlTm90aWZ5TXVsdGlwYXJ0SGVhZGVyUmVjZWl2ZWQoa2V5 LCB2YWx1ZSk7CiB9CiAKLXZvaWQgTmV0d29ya0pvYjo6bm90aWZ5QXV0aFJlY2VpdmVkKEJsYWNr QmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6QXV0aFR5cGUgYXV0aFR5cGUsIGNvbnN0 IGNoYXIqIHJlYWxtKQordm9pZCBOZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tC ZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoVHlwZSBhdXRoVHlwZSwgY29uc3Qg Y2hhciogcmVhbG0sIGJvb2wgc3VjY2VzcywgYm9vbCByZXF1aXJlQ3JlZGVudGlhbHMpCiB7CiAg ICAgdXNpbmcgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OwogCkBAIC0yNDQs NiArMjQ0LDkgQEAgdm9pZCBOZXR3b3JrSm9iOjpub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tCZXJy eTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoVHkKICAgICBjYXNlIE5ldHdvcmtSZXF1 ZXN0OjpBdXRoSFRUUERpZ2VzdDoKICAgICAgICAgc2NoZW1lID0gUHJvdGVjdGlvblNwYWNlQXV0 aGVudGljYXRpb25TY2hlbWVIVFRQRGlnZXN0OwogICAgICAgICBicmVhazsKKyAgICBjYXNlIE5l dHdvcmtSZXF1ZXN0OjpBdXRoTmVnb3RpYXRlOgorICAgICAgICBzY2hlbWUgPSBQcm90ZWN0aW9u U3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZU5lZ290aWF0ZTsKKyAgICAgICAgYnJlYWs7CiAgICAg Y2FzZSBOZXR3b3JrUmVxdWVzdDo6QXV0aEhUVFBOVExNOgogICAgICAgICBzY2hlbWUgPSBQcm90 ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZU5UTE07CiAgICAgICAgIGJyZWFrOwpAQCAt MjU4LDcgKzI2MSwyNiBAQCB2b2lkIE5ldHdvcmtKb2I6Om5vdGlmeUF1dGhSZWNlaXZlZChCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkF1dGhUeQogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgbV9uZXdKb2JXaXRoQ3JlZGVudGlhbHNTdGFydGVkID0gc2VuZFJlcXVl c3RXaXRoQ3JlZGVudGlhbHMoc2VydmVyVHlwZSwgc2NoZW1lLCByZWFsbSk7CisgICAgaWYgKHN1 Y2Nlc3MpIHsKKyAgICAgICAgLy8gVXBkYXRlIHRoZSBjcmVkZW50aWFscyB0aGF0IHdpbGwgYmUg c3RvcmVkIHRvIG1hdGNoIHRoZSBzY2hlbWUgdGhhdCB3YXMgYWN0dWFsbHkgdXNlZAorICAgICAg ICBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlID0gbV9oYW5kbGUtPmdldEludGVy bmFsKCktPm1fY3VycmVudFdlYkNoYWxsZW5nZTsKKyAgICAgICAgaWYgKCFjaGFsbGVuZ2UuaXNO dWxsKCkpIHsKKyAgICAgICAgICAgIGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgb2xkU3BhY2UgPSBj aGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCk7CisgICAgICAgICAgICBpZiAob2xkU3BhY2UuYXV0 aGVudGljYXRpb25TY2hlbWUoKSAhPSBzY2hlbWUpIHsKKyAgICAgICAgICAgICAgICAvLyBUaGUg c2NoZW1lIG1pZ2h0IGhhdmUgY2hhbmdlZCwgYnV0IHRoZSBzZXJ2ZXIgdHlwZSBzaG91bGRuJ3Qg aGF2ZSEKKyAgICAgICAgICAgICAgICBCTEFDS0JFUlJZX0FTU0VSVChzZXJ2ZXJUeXBlID09IG9s ZFNwYWNlLnNlcnZlclR5cGUoKSk7CisgICAgICAgICAgICAgICAgUHJvdGVjdGlvblNwYWNlIG5l d1NwYWNlKG9sZFNwYWNlLmhvc3QoKSwgb2xkU3BhY2UucG9ydCgpLCBvbGRTcGFjZS5zZXJ2ZXJU eXBlKCksIG9sZFNwYWNlLnJlYWxtKCksIHNjaGVtZSk7CisgICAgICAgICAgICAgICAgbV9oYW5k bGUtPmdldEludGVybmFsKCktPm1fY3VycmVudFdlYkNoYWxsZW5nZSA9IEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlKG5ld1NwYWNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFs bGVuZ2UucHJvcG9zZWRDcmVkZW50aWFsKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNoYWxsZW5nZS5wcmV2aW91c0ZhaWx1cmVDb3VudCgpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjaGFsbGVuZ2UuZmFpbHVyZVJlc3BvbnNlKCksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNoYWxsZW5nZS5lcnJvcigpKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbV9uZXdKb2JXaXRoQ3JlZGVu dGlhbHNTdGFydGVkID0gc2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoc2VydmVyVHlwZSwgc2No ZW1lLCByZWFsbSwgcmVxdWlyZUNyZWRlbnRpYWxzKTsKIH0KIAogdm9pZCBOZXR3b3JrSm9iOjpu b3RpZnlTdHJpbmdIZWFkZXJSZWNlaXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB2YWx1ZSkKQEAgLTUxMCw3ICs1MzIsNyBAQCBib29sIE5ldHdvcmtKb2I6OnJldHJ5QXNGVFBE aXJlY3RvcnkoKQogICAgIHJldHVybiBzdGFydE5ld0pvYldpdGhSZXF1ZXN0KG5ld1JlcXVlc3Qp OwogfQogCi1ib29sIE5ldHdvcmtKb2I6OnN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QoUmVzb3VyY2VS ZXF1ZXN0JiBuZXdSZXF1ZXN0LCBib29sIGluY3JlYXNSZWRpcmVjdENvdW50KQorYm9vbCBOZXR3 b3JrSm9iOjpzdGFydE5ld0pvYldpdGhSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVz dCwgYm9vbCBpbmNyZWFzZVJlZGlyZWN0Q291bnQpCiB7CiAgICAgLy8gbV9mcmFtZSBjYW4gYmUg bnVsbCBpZiB0aGlzIGlzIGEgUGluZ0xvYWRlciBqb2IgKFNlZSBOZXR3b3JrSm9iOjppbml0aWFs aXplKS4KICAgICAvLyBJbiB0aGlzIGNhc2Ugd2UgZG9uJ3Qgc3RhcnQgbmV3IHJlcXVlc3QuCkBA IC01MzgsNyArNTYwLDcgQEAgYm9vbCBOZXR3b3JrSm9iOjpzdGFydE5ld0pvYldpdGhSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCwgYm9vbCBpbmNyZWEKICAgICAgICAgbV9zdHJl YW1GYWN0b3J5LAogICAgICAgICAqbV9mcmFtZSwKICAgICAgICAgbV9kZWZlckxvYWRpbmdDb3Vu dCwKLSAgICAgICAgaW5jcmVhc1JlZGlyZWN0Q291bnQgPyBtX3JlZGlyZWN0Q291bnQgKyAxIDog bV9yZWRpcmVjdENvdW50KTsKKyAgICAgICAgaW5jcmVhc2VSZWRpcmVjdENvdW50ID8gbV9yZWRp cmVjdENvdW50ICsgMSA6IG1fcmVkaXJlY3RDb3VudCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAK QEAgLTY3NCw3ICs2OTYsNyBAQCBib29sIE5ldHdvcmtKb2I6OmhhbmRsZUZUUEhlYWRlcihjb25z dCBTdHJpbmcmIGhlYWRlcikKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBOZXR3b3JrSm9i OjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlIHR5 cGUsIFByb3RlY3Rpb25TcGFjZUF1dGhlbnRpY2F0aW9uU2NoZW1lIHNjaGVtZSwgY29uc3QgU3Ry aW5nJiByZWFsbSkKK2Jvb2wgTmV0d29ya0pvYjo6c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMo UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZSB0eXBlLCBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNh dGlvblNjaGVtZSBzY2hlbWUsIGNvbnN0IFN0cmluZyYgcmVhbG0sIGJvb2wgcmVxdWlyZUNyZWRl bnRpYWxzKQogewogICAgIEFTU0VSVChtX2hhbmRsZSk7CiAgICAgaWYgKCFtX2hhbmRsZSkKQEAg LTY5OSw5ICs3MjEsMTMgQEAgYm9vbCBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50 aWFscyhQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlIHR5cGUsIFByb3QKICAgICBQcm90ZWN0aW9u U3BhY2UgcHJvdGVjdGlvblNwYWNlKGhvc3QsIHBvcnQsIHR5cGUsIHJlYWxtLCBzY2hlbWUpOwog CiAgICAgLy8gV2UndmUgZ290IHRoZSBzY2hlbWUgYW5kIHJlYWxtLiBOb3cgd2UgbmVlZCBhIHVz ZXJuYW1lIGFuZCBwYXNzd29yZC4KLSAgICAvLyBGaXJzdCBzZWFyY2ggdGhlIENyZWRlbnRpYWxT dG9yYWdlLgotICAgIENyZWRlbnRpYWwgY3JlZGVudGlhbCA9IENyZWRlbnRpYWxTdG9yYWdlOjpn ZXQocHJvdGVjdGlvblNwYWNlKTsKLSAgICBpZiAoIWNyZWRlbnRpYWwuaXNFbXB0eSgpKSB7Cisg ICAgQ3JlZGVudGlhbCBjcmVkZW50aWFsOworICAgIGlmICghcmVxdWlyZUNyZWRlbnRpYWxzKSB7 CisgICAgICAgIC8vIERvbid0IG92ZXJ3cml0ZSBhbnkgZXhpc3RpbmcgY3JlZGVudGlhbHMgd2l0 aCB0aGUgZW1wdHkgY3JlZGVudGlhbAorICAgICAgICBpZiAobV9oYW5kbGUtPmdldEludGVybmFs KCktPm1fY3VycmVudFdlYkNoYWxsZW5nZS5pc051bGwoKSkKKyAgICAgICAgICAgIG1faGFuZGxl LT5nZXRJbnRlcm5hbCgpLT5tX2N1cnJlbnRXZWJDaGFsbGVuZ2UgPSBBdXRoZW50aWNhdGlvbkNo YWxsZW5nZShwcm90ZWN0aW9uU3BhY2UsIGNyZWRlbnRpYWwsIDAsIG1fcmVzcG9uc2UsIFJlc291 cmNlRXJyb3IoKSk7CisgICAgfSBlbHNlIGlmICghKGNyZWRlbnRpYWwgPSBDcmVkZW50aWFsU3Rv cmFnZTo6Z2V0KHByb3RlY3Rpb25TcGFjZSkpLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBGaXJz dCBzZWFyY2ggdGhlIENyZWRlbnRpYWxTdG9yYWdlLgogICAgICAgICBtX2hhbmRsZS0+Z2V0SW50 ZXJuYWwoKS0+bV9jdXJyZW50V2ViQ2hhbGxlbmdlID0gQXV0aGVudGljYXRpb25DaGFsbGVuZ2Uo cHJvdGVjdGlvblNwYWNlLCBjcmVkZW50aWFsLCAwLCBtX3Jlc3BvbnNlLCBSZXNvdXJjZUVycm9y KCkpOwogICAgICAgICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9jdXJyZW50V2ViQ2hhbGxl bmdlLnNldFN0b3JlZCh0cnVlKTsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKaW5kZXggYjQ4 YzFlYy4uZTM5ZTUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCkBAIC02Nyw4ICs2Nyw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIGhhbmRsZU5vdGlmeVN0YXR1c1JlY2VpdmVkKGludCBzdGF0dXMsIGNvbnN0IFN0 cmluZyYgbWVzc2FnZSk7CiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUhlYWRlcnNSZWNlaXZlZChC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhlYWRlckxpc3QmIGhlYWRlcnMp OwogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlNdWx0aXBhcnRIZWFkZXJSZWNlaXZlZChjb25zdCBj aGFyKiBrZXksIGNvbnN0IGNoYXIqIHZhbHVlKTsKLSAgICAvLyBFeGlzdHMgb25seSB0byByZXNv bHZlIGFtYmlndWl0eSBiZXR3ZWVuIGNoYXIqIGFuZCBTdHJpbmcgcGFyYW1ldGVycwotICAgIHZp cnR1YWwgdm9pZCBub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdv cmtSZXF1ZXN0OjpBdXRoVHlwZSwgY29uc3QgY2hhciogcmVhbG0pOworICAgIHZpcnR1YWwgdm9p ZCBub3RpZnlBdXRoUmVjZWl2ZWQoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0 OjpBdXRoVHlwZSwgY29uc3QgY2hhciogcmVhbG0sIGJvb2wgc3VjY2VzcywgYm9vbCByZXF1aXJl Q3JlZGVudGlhbHMpOworICAgIC8vIG5vdGlmeVN0cmluZ0hlYWRlclJlY2VpdmVkIGV4aXN0cyBv bmx5IHRvIHJlc29sdmUgYW1iaWd1aXR5IGJldHdlZW4gY2hhciogYW5kIFN0cmluZyBwYXJhbWV0 ZXJzCiAgICAgdm9pZCBub3RpZnlTdHJpbmdIZWFkZXJSZWNlaXZlZChjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBoYW5kbGVOb3RpZnlIZWFkZXJSZWNl aXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7CiAgICAgdm9pZCBo YW5kbGVOb3RpZnlNdWx0aXBhcnRIZWFkZXJSZWNlaXZlZChjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiB2YWx1ZSk7CkBAIC0xMjAsNyArMTIwLDcgQEAgcHJpdmF0ZToKIAogICAgIC8v IFRoZSBzZXJ2ZXIgbmVlZHMgYXV0aGVudGljYXRpb24gY3JlZGVudGlhbHMuIFNlYXJjaCBpbiB0 aGUgQ3JlZGVudGlhbFN0b3JhZ2UKICAgICAvLyBvciBwcm9tcHQgdGhlIHVzZXIgdmlhIGRpYWxv ZywgdGhlbiByZXNlbmQgdGhlIHJlcXVlc3Qgd2l0aCB0aGUgY3JlZGVudGlhbHMuCi0gICAgYm9v bCBzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlLCBQ cm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZSwgY29uc3QgU3RyaW5nJiByZWFsbSk7 CisgICAgYm9vbCBzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQcm90ZWN0aW9uU3BhY2VTZXJ2 ZXJUeXBlLCBQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZSwgY29uc3QgU3RyaW5n JiByZWFsbSwgYm9vbCByZXF1aXJlQ3JlZGVudGlhbHMgPSB0cnVlKTsKIAogICAgIHZvaWQgc3Rv cmVDcmVkZW50aWFscygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcAppbmRleCBiOTJhMGE0 Li4xMThiZDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHAKQEAgLTk3LDYgKzk3LDkgQEAg Ym9vbCBOZXR3b3JrTWFuYWdlcjo6c3RhcnRKb2IoaW50IHBsYXllcklkLCBjb25zdCBTdHJpbmcm IHBhZ2VHcm91cE5hbWUsIFBhc3NSZWYKICAgICAgICAgICAgIGNhc2UgUHJvdGVjdGlvblNwYWNl QXV0aGVudGljYXRpb25TY2hlbWVIVFRQRGlnZXN0OgogICAgICAgICAgICAgICAgIGF1dGhUeXBl ID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0OjpBdXRoSFRUUERpZ2VzdDsK ICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgUHJvdGVjdGlvblNwYWNl QXV0aGVudGljYXRpb25TY2hlbWVOZWdvdGlhdGU6CisgICAgICAgICAgICAgICAgYXV0aFR5cGUg PSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkF1dGhOZWdvdGlhdGU7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIFByb3RlY3Rpb25TcGFjZUF1 dGhlbnRpY2F0aW9uU2NoZW1lTlRMTToKICAgICAgICAgICAgICAgICBhdXRoVHlwZSA9IEJsYWNr QmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6QXV0aEhUVFBOVExNOwogICAgICAgICAg ICAgICAgIGJyZWFrOwotLSAKMS43LjUuNAoK