110628 2013-02-22 11:13:29 -0800 [BlackBerry] cookies set on a 401 response are not included when retrying with credentials 2013-02-22 14:18:33 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joenotcharles joenotcharles mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 839749 0 joenotcharles 2013-02-22 11:13:29 -0800 When a 401 or 407 response includes a Set-Cookie header, it is saved in the cookie jar. But after querying the user for auth credentials, the followup request re-uses the cookies from the original request rather than rereading them from the cookie jar, so the new cookie is not included. This breaks some sites that use cookies for custom auth schemes. 839752 1 189795 joenotcharles 2013-02-22 11:14:40 -0800 Created attachment 189795 fix 839783 2 189801 joenotcharles 2013-02-22 11:48:32 -0800 Created attachment 189801 patch with style fixes 839961 3 189801 webkit.review.bot 2013-02-22 14:18:30 -0800 Comment on attachment 189801 patch with style fixes Clearing flags on attachment: 189801 Committed r143796: <http://trac.webkit.org/changeset/143796> 839962 4 webkit.review.bot 2013-02-22 14:18:33 -0800 All reviewed patches have been landed. Closing bug. 189795 2013-02-22 11:14:40 -0800 2013-02-22 11:48:32 -0800 fix 0001-BlackBerry-Reread-cookies-when-retrying-a-request-wi.patch text/plain 13523 joenotcharles RnJvbSAxNWMyODM5N2FiYzMyNTRmYjg2MjdlY2I5ZGZmMGEzYjc0YjFjZDcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDIyIEZlYiAyMDEzIDE0OjAyOjU2IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFJlcmVhZCBjb29raWVzIHdoZW4gcmV0cnlpbmcgYSByZXF1ZXN0IHdpdGggbmV3CiBhdXRoIGNy ZWRlbnRpYWxzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNjI4 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkludGVybmFsIFBSOiAyOTg4MDUKClRoZSAi aXNSZWRpcmVjdCIgcGFyYW1ldGVyIG9mIGluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QgaXMgb25s eSB1c2VkIHRvIGRlY2lkZSB3aGV0aGVyIHRvCnJlcmVhZCBjb29raWVzLiBTaW5jZSB3ZSBtdXN0 IHJlcmVhZCBjb29raWVzIHdoZW4gcmVzZW5kaW5nIGEgcmVxdWVzdCB3aXRoIG5ldyBhdXRoCmNy ZWRlbnRpYWxzIGFzIHdlbGwsIHJlbmFtZSB0aGlzIHRvICJyZXJlYWRDb29raWVzIi4KClRoZSBv bmx5IGNhbGxlciB3aGljaCBzZXRzIHRoaXMgcGFyYW1ldGVyIHJhdGhlciB0aGFuIHVzaW5nIHRo ZSBkZWZhdWx0IHZhbHVlIGlzCk5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYiwgd2hpY2ggYWxzbyBo YXMgb3RoZXIgcHJvY2Vzc2luZyBvbiByZWRpcmVjdC4gU28gYWRkIGEgbmV3CiJyZXJlYWRDb29r aWVzIiBwYXJhbWV0ZXIgdG8gc3RhcnRKb2IgYW5kIGVuc3VyZSBpdCBpcyBhbHdheXMgc2V0IHRv IHRydWUgb24gYSByZWRpcmVjdCwgYnV0CmNhbiBhbHNvIGJlIHNldCB0byB0cnVlIG9uIGEgbm9u LXJlZGlyZWN0LiBBbmQgd2hlbiBzdGFydEpvYiBpcyBjYWxsZWQgZHVlIHRvIG5ldyBhdXRoCmNy ZWRlbnRpYWxzLCBzZXQgaXQgdG8gdHJ1ZS4KCiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5 L05ldHdvcmtKb2IuY3BwOgooV2ViQ29yZTo6TmV0d29ya0pvYjo6c3RhcnROZXdKb2JXaXRoUmVx dWVzdCk6IEFkZCByZXJlYWRDb29raWVzIHBhcmFtZXRlciwgcGFzcyBpdCB0bwpzdGFydEpvYi4K KFdlYkNvcmU6Ok5ldHdvcmtKb2I6OmhhbmRsZVJlZGlyZWN0KTogU2V0IG5ldyByZXJlYWRDb29r aWVzIHBhcmFtIG9mIHN0YXJ0TmV3Sm9iIHRvIHRydWUuCihXZWJDb3JlOjpOZXR3b3JrSm9iOjpu b3RpZnlDaGFsbGVuZ2VSZXN1bHQpOiBTZXQgbmV3IHJlcmVhZENvb2tpZXMgcGFyYW0gb2Ygc3Rh cnROZXdKb2IgdG8KdHJ1ZS4KKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pv Yi5oOgooTmV0d29ya0pvYik6IEFkZCByZXJlYWRDb29raWVzIHBhcmFtZXRlciB0byBzdGFydE5l d0pvYldpdGhSZXF1ZXN0LgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFu YWdlci5jcHA6CihXZWJDb3JlOjpOZXR3b3JrTWFuYWdlcjo6c3RhcnRKb2IpOiBBZGQgcmVyZWFk Q29va2llcyBwYXJhbWV0ZXIsIHBhc3MgaXQgaW5zdGVhZCBvZgpyZWRpcmVjdENvdW50IHRvIGlu aXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QuCiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05l dHdvcmtNYW5hZ2VyLmg6CihOZXR3b3JrTWFuYWdlcik6IEFkZCByZXJlYWRDb29raWVzIHBhcmFt ZXRlciB0byBzdGFydEpvYi4KKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VS ZXF1ZXN0Lmg6CihSZXNvdXJjZVJlcXVlc3QpOiBSZW5hbWUgaXNSZWRpcmVjdCBwYXJhbWV0ZXIg dG8gcmVyZWFkQ29va2llcy4KKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VS ZXF1ZXN0QmxhY2tCZXJyeS5jcHA6CihXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmluaXRpYWxp emVQbGF0Zm9ybVJlcXVlc3QpOiBSZW5hbWUgaXNSZWRpcmVjdCB0byByZXJlYWRDb29raWVzLgot LS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg ICAzNyArKysrKysrKysrKysrKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmNwcCAgICAgfCAgICA5ICsrKy0tCiAuLi4vcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L05ldHdvcmtKb2IuaCAgICAgICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwIHwgICAxNiArKysrKysrLQogLi4uL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5oICAgfCAgIDEwICsrKysr LQogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaCAgfCAg ICAyICstCiAuLi4vYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcCAgICAg ICB8ICAgIDQgKy0KIDcgZmlsZXMgY2hhbmdlZCwgNjkgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGU1MGYwODYuLjRmMzBhODUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAxMy0wMi0yMiAgSm9lIE1hc29uICA8am1hc29uQHJpbS5jb20+CisKKyAg ICAgICAgW0JsYWNrQmVycnldIFJlcmVhZCBjb29raWVzIHdoZW4gcmV0cnlpbmcgYSByZXF1ZXN0 IHdpdGggbmV3IGF1dGggY3JlZGVudGlhbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExMDYyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEludGVybmFsIFBSOiAyOTg4MDUKKworICAgICAgICBUaGUgImlz UmVkaXJlY3QiIHBhcmFtZXRlciBvZiBpbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0IGlzIG9ubHkg dXNlZCB0byBkZWNpZGUgd2hldGhlciB0bworICAgICAgICByZXJlYWQgY29va2llcy4gU2luY2Ug d2UgbXVzdCByZXJlYWQgY29va2llcyB3aGVuIHJlc2VuZGluZyBhIHJlcXVlc3Qgd2l0aCBuZXcg YXV0aAorICAgICAgICBjcmVkZW50aWFscyBhcyB3ZWxsLCByZW5hbWUgdGhpcyB0byAicmVyZWFk Q29va2llcyIuCisKKyAgICAgICAgVGhlIG9ubHkgY2FsbGVyIHdoaWNoIHNldHMgdGhpcyBwYXJh bWV0ZXIgcmF0aGVyIHRoYW4gdXNpbmcgdGhlIGRlZmF1bHQgdmFsdWUgaXMKKyAgICAgICAgTmV0 d29ya01hbmFnZXI6OnN0YXJ0Sm9iLCB3aGljaCBhbHNvIGhhcyBvdGhlciBwcm9jZXNzaW5nIG9u IHJlZGlyZWN0LiBTbyBhZGQgYSBuZXcKKyAgICAgICAgInJlcmVhZENvb2tpZXMiIHBhcmFtZXRl ciB0byBzdGFydEpvYiBhbmQgZW5zdXJlIGl0IGlzIGFsd2F5cyBzZXQgdG8gdHJ1ZSBvbiBhIHJl ZGlyZWN0LCBidXQKKyAgICAgICAgY2FuIGFsc28gYmUgc2V0IHRvIHRydWUgb24gYSBub24tcmVk aXJlY3QuIEFuZCB3aGVuIHN0YXJ0Sm9iIGlzIGNhbGxlZCBkdWUgdG8gbmV3IGF1dGgKKyAgICAg ICAgY3JlZGVudGlhbHMsIHNldCBpdCB0byB0cnVlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29y a0pvYjo6c3RhcnROZXdKb2JXaXRoUmVxdWVzdCk6IEFkZCByZXJlYWRDb29raWVzIHBhcmFtZXRl ciwgcGFzcyBpdCB0bworICAgICAgICBzdGFydEpvYi4KKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtKb2I6OmhhbmRsZVJlZGlyZWN0KTogU2V0IG5ldyByZXJlYWRDb29raWVzIHBhcmFtIG9mIHN0 YXJ0TmV3Sm9iIHRvIHRydWUuCisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpub3RpZnlD aGFsbGVuZ2VSZXN1bHQpOiBTZXQgbmV3IHJlcmVhZENvb2tpZXMgcGFyYW0gb2Ygc3RhcnROZXdK b2IgdG8KKyAgICAgICAgdHJ1ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya0pvYi5oOgorICAgICAgICAoTmV0d29ya0pvYik6IEFkZCByZXJlYWRDb29raWVz IHBhcmFtZXRlciB0byBzdGFydE5ld0pvYldpdGhSZXF1ZXN0LgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpOZXR3b3JrTWFuYWdlcjo6c3RhcnRKb2IpOiBBZGQgcmVyZWFkQ29va2llcyBwYXJhbWV0ZXIs IHBhc3MgaXQgaW5zdGVhZCBvZgorICAgICAgICByZWRpcmVjdENvdW50IHRvIGluaXRpYWxpemVQ bGF0Zm9ybVJlcXVlc3QuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05l dHdvcmtNYW5hZ2VyLmg6CisgICAgICAgIChOZXR3b3JrTWFuYWdlcik6IEFkZCByZXJlYWRDb29r aWVzIHBhcmFtZXRlciB0byBzdGFydEpvYi4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChSZXNvdXJjZVJlcXVlc3QpOiBS ZW5hbWUgaXNSZWRpcmVjdCBwYXJhbWV0ZXIgdG8gcmVyZWFkQ29va2llcy4KKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmluaXRpYWxpemVQbGF0Zm9ybVJl cXVlc3QpOiBSZW5hbWUgaXNSZWRpcmVjdCB0byByZXJlYWRDb29raWVzLgorCiAyMDEzLTAyLTIx ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gTW92 ZSBTZXQtQ29va2llIGhlYWRlciBoYW5kbGluZyB0byBOZXR3b3JrSm9iOjpub3RpZnlTZXRDb29r aWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2ti ZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCAzNGRhOGJiLi5mZTBlZjYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtK b2IuY3BwCkBAIC02MTMsNyArNjEzLDcgQEAgYm9vbCBOZXR3b3JrSm9iOjpyZXRyeUFzRlRQRGly ZWN0b3J5KCkKICAgICByZXR1cm4gc3RhcnROZXdKb2JXaXRoUmVxdWVzdChuZXdSZXF1ZXN0KTsK IH0KIAotYm9vbCBOZXR3b3JrSm9iOjpzdGFydE5ld0pvYldpdGhSZXF1ZXN0KFJlc291cmNlUmVx dWVzdCYgbmV3UmVxdWVzdCwgYm9vbCBpbmNyZWFzZVJlZGlyZWN0Q291bnQpCitib29sIE5ldHdv cmtKb2I6OnN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0 LCBib29sIGluY3JlYXNlUmVkaXJlY3RDb3VudCwgYm9vbCByZXJlYWRDb29raWVzKQogewogICAg IC8vIG1fZnJhbWUgY2FuIGJlIG51bGwgaWYgdGhpcyBpcyBhIFBpbmdMb2FkZXIgam9iIChTZWUg TmV0d29ya0pvYjo6aW5pdGlhbGl6ZSkuCiAgICAgLy8gSW4gdGhpcyBjYXNlIHdlIGRvbid0IHN0 YXJ0IG5ldyByZXF1ZXN0LgpAQCAtNjQxLDcgKzY0MSw4IEBAIGJvb2wgTmV0d29ya0pvYjo6c3Rh cnROZXdKb2JXaXRoUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGJvb2wgaW5j cmVhCiAgICAgICAgIG1fc3RyZWFtRmFjdG9yeSwKICAgICAgICAgbV9mcmFtZSwKICAgICAgICAg bV9kZWZlckxvYWRpbmdDb3VudCwKLSAgICAgICAgaW5jcmVhc2VSZWRpcmVjdENvdW50ID8gbV9y ZWRpcmVjdENvdW50ICsgMSA6IG1fcmVkaXJlY3RDb3VudCk7CisgICAgICAgIGluY3JlYXNlUmVk aXJlY3RDb3VudCA/IG1fcmVkaXJlY3RDb3VudCArIDEgOiBtX3JlZGlyZWN0Q291bnQsCisgICAg ICAgIHJlcmVhZENvb2tpZXMpOwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC02ODQsNyArNjg1 LDcgQEAgYm9vbCBOZXR3b3JrSm9iOjpoYW5kbGVSZWRpcmVjdCgpCiAgICAgbV9oYW5kbGUtPmdl dEludGVybmFsKCktPm1fcHJveHlXZWJDaGFsbGVuZ2UubnVsbGlmeSgpOwogICAgIG1faGFuZGxl LT5nZXRJbnRlcm5hbCgpLT5tX2hvc3RXZWJDaGFsbGVuZ2UubnVsbGlmeSgpOwogCi0gICAgcmV0 dXJuIHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QobmV3UmVxdWVzdCwgdHJ1ZSk7CisgICAgcmV0dXJu IHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QobmV3UmVxdWVzdCwgLyogaW5jcmVhc2VSZWRpcmVjdENv dW50ICovIHRydWUsIC8qIHJlcmVhZENvb2tpZXMgKi8gdHJ1ZSk7CiB9CiAKIHZvaWQgTmV0d29y a0pvYjo6c2VuZFJlc3BvbnNlSWZOZWVkZWQoKQpAQCAtMTAyNyw3ICsxMDI4LDcgQEAgdm9pZCBO ZXR3b3JrSm9iOjpub3RpZnlDaGFsbGVuZ2VSZXN1bHQoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBQ cm90ZWN0aW9uU3BhY2UmIHAKICAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdCA9IG1faGFu ZGxlLT5maXJzdFJlcXVlc3QoKTsKICAgICBuZXdSZXF1ZXN0LnNldFVSTCh1cmwpOwogICAgIG5l d1JlcXVlc3Quc2V0TXVzdEhhbmRsZUludGVybmFsbHkodHJ1ZSk7Ci0gICAgbV9uZXdKb2JXaXRo Q3JlZGVudGlhbHNTdGFydGVkID0gc3RhcnROZXdKb2JXaXRoUmVxdWVzdChuZXdSZXF1ZXN0KTsK KyAgICBtX25ld0pvYldpdGhDcmVkZW50aWFsc1N0YXJ0ZWQgPSBzdGFydE5ld0pvYldpdGhSZXF1 ZXN0KG5ld1JlcXVlc3QsIC8qIGluY3JlYXNlUmVkaXJlY3RDb3VudCAqLyBmYWxzZSwgLyogcmVy ZWFkQ29va2llcyAqLyB0cnVlKTsKIH0KIAogdm9pZCBOZXR3b3JrSm9iOjpmcmFtZURlc3Ryb3ll ZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya0pvYi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2Jl cnJ5L05ldHdvcmtKb2IuaAppbmRleCAwMzZhMzNmLi4xZjBiZTliIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgK QEAgLTEyMSw3ICsxMjEsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCByZXRyeUFzRlRQRGlyZWN0 b3J5KCk7CiAKLSAgICBib29sIHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0 JiBuZXdSZXF1ZXN0LCBib29sIGluY3JlYXNSZWRpcmVjdENvdW50ID0gZmFsc2UpOworICAgIGJv b2wgc3RhcnROZXdKb2JXaXRoUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGJv b2wgaW5jcmVhc1JlZGlyZWN0Q291bnQgPSBmYWxzZSwgYm9vbCByZXJlYWRDb29raWVzID0gZmFs c2UpOwogCiAgICAgYm9vbCBoYW5kbGVSZWRpcmVjdCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2Vy LmNwcAppbmRleCA5ODBkNzJjLi5hZGI5YjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHAK QEAgLTEzOCw3ICsxMzgsMTUgQEAgc3RhdGljIHZvaWQgc2V0QXV0aENyZWRlbnRpYWxzKE5ldHdv cmtSZXF1ZXN0JiBwbGF0Zm9ybVJlcXVlc3QsIGNvbnN0IEF1dGhlbnRpY2EKICAgICAgICAgcGxh dGZvcm1SZXF1ZXN0LnNldENyZWRlbnRpYWxzKGF1dGhUeXBlLCBhdXRoUHJvdG9jb2wsIGF1dGhT Y2hlbWUsIHVzZXJuYW1lLnV0ZjgoKS5kYXRhKCksIHBhc3N3b3JkLnV0ZjgoKS5kYXRhKCkpOwog fQogCi1ib29sIE5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYihpbnQgcGxheWVySWQsIGNvbnN0IFN0 cmluZyYgcGFnZUdyb3VwTmFtZSwgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4gam9iLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3Jr U3RyZWFtRmFjdG9yeSogc3RyZWFtRmFjdG9yeSwgRnJhbWUqIGZyYW1lLCBpbnQgZGVmZXJMb2Fk aW5nQ291bnQsIGludCByZWRpcmVjdENvdW50KQorYm9vbCBOZXR3b3JrTWFuYWdlcjo6c3RhcnRK b2IoaW50IHBsYXllcklkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3Ry aW5nJiBwYWdlR3JvdXBOYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGFzc1Jl ZlB0cjxSZXNvdXJjZUhhbmRsZT4gam9iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtTdHJlYW1GYWN0b3J5KiBzdHJlYW1G YWN0b3J5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRnJhbWUqIGZyYW1lLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGRlZmVyTG9hZGluZ0NvdW50LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50IHJlZGlyZWN0Q291bnQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBib29sIHJlcmVhZENvb2tpZXMpCiB7CiAgICAgLy8gTWFrZSBzdXJl IHRoZSBSZXNvdXJjZUhhbmRsZSBkb2Vzbid0IGdvIG91dCBvZiBzY29wZSB3aGlsZSBjYWxsaW5n IGNhbGxiYWNrcy4KICAgICBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGd1YXJkSm9iKGpvYik7CkBA IC0xNTAsOCArMTU4LDEyIEBAIGJvb2wgTmV0d29ya01hbmFnZXI6OnN0YXJ0Sm9iKGludCBwbGF5 ZXJJZCwgY29uc3QgU3RyaW5nJiBwYWdlR3JvdXBOYW1lLCBQYXNzUmVmCiAgICAgaWYgKGlzSW5p dGlhbCkKICAgICAgICAgbV9pbml0aWFsVVJMID0gS1VSTCgpOwogCisgICAgLy8gQWx3YXlzIHJl cmVhZCBjb29raWVzIG9uIGEgcmVkaXJlY3QKKyAgICBpZiAocmVkaXJlY3RDb3VudCkKKyAgICAg ICAgcmVyZWFkQ29va2llcyA9IHRydWU7CisKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0 d29ya1JlcXVlc3QgcGxhdGZvcm1SZXF1ZXN0OwotICAgIHJlcXVlc3QuaW5pdGlhbGl6ZVBsYXRm b3JtUmVxdWVzdChwbGF0Zm9ybVJlcXVlc3QsIGZyYW1lLT5sb2FkZXIoKSAmJiBmcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpICYmIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJy eSo+KGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkpLT5jb29raWVzRW5hYmxlZCgpLCBpc0luaXRp YWwsIHJlZGlyZWN0Q291bnQpOworICAgIHJlcXVlc3QuaW5pdGlhbGl6ZVBsYXRmb3JtUmVxdWVz dChwbGF0Zm9ybVJlcXVlc3QsIGZyYW1lLT5sb2FkZXIoKSAmJiBmcmFtZS0+bG9hZGVyKCktPmNs aWVudCgpICYmIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KGZyYW1l LT5sb2FkZXIoKS0+Y2xpZW50KCkpLT5jb29raWVzRW5hYmxlZCgpLCBpc0luaXRpYWwsIHJlcmVh ZENvb2tpZXMpOwogCiAgICAgY29uc3QgU3RyaW5nJiBkb2N1bWVudFVybCA9IGZyYW1lLT5kb2N1 bWVudCgpLT51cmwoKS5zdHJpbmcoKTsKICAgICBpZiAoIWRvY3VtZW50VXJsLmlzRW1wdHkoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5 L05ldHdvcmtNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvTmV0d29ya01hbmFnZXIuaAppbmRleCBmMGM1OWQwLi5kZjQ4MjlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0 d29ya01hbmFnZXIuaApAQCAtNTcsNyArNTcsMTUgQEAgcHJpdmF0ZToKIAogICAgIE5ldHdvcmtK b2IqIGZpbmRKb2JGb3JIYW5kbGUoUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4pOwogICAgIHZv aWQgZGVsZXRlSm9iKE5ldHdvcmtKb2IqKTsKLSAgICBib29sIHN0YXJ0Sm9iKGludCBwbGF5ZXJJ ZCwgY29uc3QgU3RyaW5nJiBwYWdlR3JvdXBOYW1lLCBQYXNzUmVmUHRyPFJlc291cmNlSGFuZGxl PiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtT dHJlYW1GYWN0b3J5KiwgRnJhbWUqLCBpbnQgZGVmZXJMb2FkaW5nQ291bnQgPSAwLCBpbnQgcmVk aXJlY3RDb3VudCA9IDApOworICAgIGJvb2wgc3RhcnRKb2IoaW50IHBsYXllcklkLAorICAgICAg ICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBwYWdlR3JvdXBOYW1lLAorICAgICAgICAgICAgICAg ICAgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4sCisgICAgICAgICAgICAgICAgICBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmLAorICAgICAgICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06 Ok5ldHdvcmtTdHJlYW1GYWN0b3J5KiwKKyAgICAgICAgICAgICAgICAgIEZyYW1lKiwKKyAgICAg ICAgICAgICAgICAgIGludCBkZWZlckxvYWRpbmdDb3VudCA9IDAsCisgICAgICAgICAgICAgICAg ICBpbnQgcmVkaXJlY3RDb3VudCA9IDAsCisgICAgICAgICAgICAgICAgICBib29sIHJlcmVhZENv b2tpZXMgPSBmYWxzZSk7CiAKICAgICBWZWN0b3I8TmV0d29ya0pvYio+IG1fam9iczsKICAgICBL VVJMIG1faW5pdGlhbFVSTDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaAppbmRleCAxYjBmOTU4Li4z YTU1ZjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvUmVzb3VyY2VSZXF1ZXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oCkBAIC0xMDYsNyArMTA2LDcgQEAgcHVi bGljOgogICAgIHZvaWQgc2V0TXVzdEhhbmRsZUludGVybmFsbHkoYm9vbCBtdXN0SGFuZGxlSW50 ZXJuYWxseSkgeyBtX211c3RIYW5kbGVJbnRlcm5hbGx5ID0gbXVzdEhhbmRsZUludGVybmFsbHk7 IH0KICAgICBib29sIG11c3RIYW5kbGVJbnRlcm5hbGx5KCkgY29uc3QgeyByZXR1cm4gbV9tdXN0 SGFuZGxlSW50ZXJuYWxseTsgfQogCi0gICAgdm9pZCBpbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0 KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYsIGJvb2wgY29va2llc0VuYWJs ZWQsIGJvb2wgaXNJbml0aWFsID0gZmFsc2UsIGJvb2wgaXNSZWRpcmVjdCA9IGZhbHNlKSBjb25z dDsKKyAgICB2b2lkIGluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QoQmxhY2tCZXJyeTo6UGxhdGZv cm06Ok5ldHdvcmtSZXF1ZXN0JiwgYm9vbCBjb29raWVzRW5hYmxlZCwgYm9vbCBpc0luaXRpYWwg PSBmYWxzZSwgYm9vbCByZXJlYWRDb29raWVzID0gZmFsc2UpIGNvbnN0OwogICAgIHZvaWQgc2V0 Rm9yY2VEb3dubG9hZChib29sIGZvcmNlRG93bmxvYWQpIHsgbV9mb3JjZURvd25sb2FkID0gZm9y Y2VEb3dubG9hZDsgfQogICAgIGJvb2wgZm9yY2VEb3dubG9hZCgpIGNvbnN0IHsgcmV0dXJuIG1f Zm9yY2VEb3dubG9hZDsgfQogICAgIHZvaWQgc2V0U3VnZ2VzdGVkU2F2ZU5hbWUoY29uc3QgU3Ry aW5nJiBuYW1lKSB7IG1fc3VnZ2VzdGVkU2F2ZU5hbWUgPSBuYW1lOyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0 QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAKaW5kZXggYjhhNjRiNS4uMWY2NjhlNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jl c291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcApAQCAtMTQx LDcgKzE0MSw3IEBAIFJlc291cmNlUmVxdWVzdDo6VGFyZ2V0VHlwZSBSZXNvdXJjZVJlcXVlc3Q6 OnRhcmdldFR5cGVGcm9tTWltZVR5cGUoY29uc3QgU3RyaW5nCiAgICAgcmV0dXJuIGl0ZXItPnZh bHVlOwogfQogCi12b2lkIFJlc291cmNlUmVxdWVzdDo6aW5pdGlhbGl6ZVBsYXRmb3JtUmVxdWVz dChOZXR3b3JrUmVxdWVzdCYgcGxhdGZvcm1SZXF1ZXN0LCBib29sIGNvb2tpZXNFbmFibGVkLCBi b29sIGlzSW5pdGlhbCwgYm9vbCBpc1JlZGlyZWN0KSBjb25zdAordm9pZCBSZXNvdXJjZVJlcXVl c3Q6OmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QoTmV0d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVx dWVzdCwgYm9vbCBjb29raWVzRW5hYmxlZCwgYm9vbCBpc0luaXRpYWwsIGJvb2wgcmVyZWFkQ29v a2llcykgY29uc3QKIHsKICAgICAvLyBJZiB0aGlzIGlzIHRoZSBpbml0aWFsIGxvYWQsIHNraXAg dGhlIHJlcXVlc3QgYm9keSBhbmQgaGVhZGVycy4KICAgICBpZiAoaXNJbml0aWFsKQpAQCAtMTkx LDcgKzE5MSw3IEBAIHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojppbml0aWFsaXplUGxhdGZvcm1SZXF1 ZXN0KE5ldHdvcmtSZXF1ZXN0JiBwbGF0Zm9ybVJlcXVlc3QsCiAgICAgICAgIH0KIAogICAgICAg ICAvLyBXaGVuIFJlc291cmNlUmVxdWVzdCBpcyByZXVzZWQgYnkgQ2FjaGVSZXNvdXJjZUxvYWRl ciwgcGFnZSByZWZyZXNoaW5nIG9yIHJlZGlyZWN0aW9uLCBpdHMgY29va2llcyBtYXkgYmUgZGly dGllZC4gV2Ugd29uJ3QgdXNlIHRoZXNlIGNvb2tpZXMgYW55IG1vcmUuCi0gICAgICAgIGJvb2wg Y29va2llSGVhZGVyTWF5QmVEaXJ0eSA9IGlzUmVkaXJlY3QgfHwgY2FjaGVQb2xpY3koKSA9PSBX ZWJDb3JlOjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSB8fCBjYWNoZVBvbGljeSgpID09IFdlYkNv cmU6OlJldHVybkNhY2hlRGF0YUVsc2VMb2FkOworICAgICAgICBib29sIGNvb2tpZUhlYWRlck1h eUJlRGlydHkgPSByZXJlYWRDb29raWVzIHx8IGNhY2hlUG9saWN5KCkgPT0gV2ViQ29yZTo6UmVs b2FkSWdub3JpbmdDYWNoZURhdGEgfHwgY2FjaGVQb2xpY3koKSA9PSBXZWJDb3JlOjpSZXR1cm5D YWNoZURhdGFFbHNlTG9hZDsKIAogICAgICAgICBmb3IgKEhUVFBIZWFkZXJNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gaHR0cEhlYWRlckZpZWxkcygpLmJlZ2luKCk7IGl0ICE9IGh0dHBIZWFkZXJG aWVsZHMoKS5lbmQoKTsgKytpdCkgewogICAgICAgICAgICAgU3RyaW5nIGtleSA9IGl0LT5rZXk7 Ci0tIAoxLjcuNS40Cgo= 189801 2013-02-22 11:48:32 -0800 2013-02-22 14:18:30 -0800 patch with style fixes 0001-BlackBerry-Reread-cookies-when-retrying-a-request-wi.patch text/plain 13188 joenotcharles RnJvbSBjNzlhM2UxOTBkOTQzOTg2NTg2MjM2ZTE0ZTc0YmFlODBiYTEwMmZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDIyIEZlYiAyMDEzIDE0OjAyOjU2IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFJlcmVhZCBjb29raWVzIHdoZW4gcmV0cnlpbmcgYSByZXF1ZXN0IHdpdGggbmV3CiBhdXRoIGNy ZWRlbnRpYWxzCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNjI4 CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkludGVybmFsIFBSOiAyOTg4MDUKSW50ZXJu YWxseSBSZXZpZXdlZCBCeTogTGVvIFlhbmcKClRoZSAiaXNSZWRpcmVjdCIgcGFyYW1ldGVyIG9m IGluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QgaXMgb25seSB1c2VkIHRvIGRlY2lkZSB3aGV0aGVy IHRvCnJlcmVhZCBjb29raWVzLiBTaW5jZSB3ZSBtdXN0IHJlcmVhZCBjb29raWVzIHdoZW4gcmVz ZW5kaW5nIGEgcmVxdWVzdCB3aXRoIG5ldyBhdXRoCmNyZWRlbnRpYWxzIGFzIHdlbGwsIHJlbmFt ZSB0aGlzIHRvICJyZXJlYWRDb29raWVzIi4KClRoZSBvbmx5IGNhbGxlciB3aGljaCBzZXRzIHRo aXMgcGFyYW1ldGVyIHJhdGhlciB0aGFuIHVzaW5nIHRoZSBkZWZhdWx0IHZhbHVlIGlzCk5ldHdv cmtNYW5hZ2VyOjpzdGFydEpvYiwgd2hpY2ggYWxzbyBoYXMgb3RoZXIgcHJvY2Vzc2luZyBvbiBy ZWRpcmVjdC4gU28gYWRkIGEgbmV3CiJyZXJlYWRDb29raWVzIiBwYXJhbWV0ZXIgdG8gc3RhcnRK b2IgYW5kIGVuc3VyZSBpdCBpcyBhbHdheXMgc2V0IHRvIHRydWUgb24gYSByZWRpcmVjdCwgYnV0 CmNhbiBhbHNvIGJlIHNldCB0byB0cnVlIG9uIGEgbm9uLXJlZGlyZWN0LiBBbmQgd2hlbiBzdGFy dEpvYiBpcyBjYWxsZWQgZHVlIHRvIG5ldyBhdXRoCmNyZWRlbnRpYWxzLCBzZXQgaXQgdG8gdHJ1 ZS4KCiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgooV2ViQ29y ZTo6TmV0d29ya0pvYjo6c3RhcnROZXdKb2JXaXRoUmVxdWVzdCk6IEFkZCByZXJlYWRDb29raWVz IHBhcmFtZXRlciwgcGFzcyBpdCB0bwpzdGFydEpvYi4KKFdlYkNvcmU6Ok5ldHdvcmtKb2I6Omhh bmRsZVJlZGlyZWN0KTogU2V0IG5ldyByZXJlYWRDb29raWVzIHBhcmFtIG9mIHN0YXJ0TmV3Sm9i IHRvIHRydWUuCihXZWJDb3JlOjpOZXR3b3JrSm9iOjpub3RpZnlDaGFsbGVuZ2VSZXN1bHQpOiBT ZXQgbmV3IHJlcmVhZENvb2tpZXMgcGFyYW0gb2Ygc3RhcnROZXdKb2IgdG8KdHJ1ZS4KKiBwbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5oOgooTmV0d29ya0pvYik6IEFkZCBy ZXJlYWRDb29raWVzIHBhcmFtZXRlciB0byBzdGFydE5ld0pvYldpdGhSZXF1ZXN0LgoqIHBsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFuYWdlci5jcHA6CihXZWJDb3JlOjpOZXR3 b3JrTWFuYWdlcjo6c3RhcnRKb2IpOiBBZGQgcmVyZWFkQ29va2llcyBwYXJhbWV0ZXIsIHBhc3Mg aXQgaW5zdGVhZCBvZgpyZWRpcmVjdENvdW50IHRvIGluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3Qu CiogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmg6CihOZXR3b3Jr TWFuYWdlcik6IEFkZCByZXJlYWRDb29raWVzIHBhcmFtZXRlciB0byBzdGFydEpvYi4KKiBwbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0Lmg6CihSZXNvdXJjZVJlcXVl c3QpOiBSZW5hbWUgaXNSZWRpcmVjdCBwYXJhbWV0ZXIgdG8gcmVyZWFkQ29va2llcy4KKiBwbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHA6CihX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QpOiBSZW5h bWUgaXNSZWRpcmVjdCB0byByZXJlYWRDb29raWVzLgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAzOCArKysrKysrKysrKysrKysrKysr KwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCAgICAgfCAg ICA5ICsrKy0tCiAuLi4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCAg ICAgICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01h bmFnZXIuY3BwIHwgICAgOCArKystCiAuLi4vcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05l dHdvcmtNYW5hZ2VyLmggICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvUmVzb3VyY2VSZXF1ZXN0LmggIHwgICAgMiArLQogLi4uL2JsYWNrYmVycnkvUmVzb3VyY2VS ZXF1ZXN0QmxhY2tCZXJyeS5jcHAgICAgICAgfCAgICA0ICstCiA3IGZpbGVzIGNoYW5nZWQsIDU0 IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNTBmMDg2Li44 YTMxN2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTMtMDItMjIgIEpvZSBNYXNv biAgPGptYXNvbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZXJlYWQgY29va2ll cyB3aGVuIHJldHJ5aW5nIGEgcmVxdWVzdCB3aXRoIG5ldyBhdXRoIGNyZWRlbnRpYWxzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTA2MjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRlcm5hbCBQUjog Mjk4ODA1CisgICAgICAgIEludGVybmFsbHkgUmV2aWV3ZWQgQnk6IExlbyBZYW5nCisKKyAgICAg ICAgVGhlICJpc1JlZGlyZWN0IiBwYXJhbWV0ZXIgb2YgaW5pdGlhbGl6ZVBsYXRmb3JtUmVxdWVz dCBpcyBvbmx5IHVzZWQgdG8gZGVjaWRlIHdoZXRoZXIgdG8KKyAgICAgICAgcmVyZWFkIGNvb2tp ZXMuIFNpbmNlIHdlIG11c3QgcmVyZWFkIGNvb2tpZXMgd2hlbiByZXNlbmRpbmcgYSByZXF1ZXN0 IHdpdGggbmV3IGF1dGgKKyAgICAgICAgY3JlZGVudGlhbHMgYXMgd2VsbCwgcmVuYW1lIHRoaXMg dG8gInJlcmVhZENvb2tpZXMiLgorCisgICAgICAgIFRoZSBvbmx5IGNhbGxlciB3aGljaCBzZXRz IHRoaXMgcGFyYW1ldGVyIHJhdGhlciB0aGFuIHVzaW5nIHRoZSBkZWZhdWx0IHZhbHVlIGlzCisg ICAgICAgIE5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYiwgd2hpY2ggYWxzbyBoYXMgb3RoZXIgcHJv Y2Vzc2luZyBvbiByZWRpcmVjdC4gU28gYWRkIGEgbmV3CisgICAgICAgICJyZXJlYWRDb29raWVz IiBwYXJhbWV0ZXIgdG8gc3RhcnRKb2IgYW5kIGVuc3VyZSBpdCBpcyBhbHdheXMgc2V0IHRvIHRy dWUgb24gYSByZWRpcmVjdCwgYnV0CisgICAgICAgIGNhbiBhbHNvIGJlIHNldCB0byB0cnVlIG9u IGEgbm9uLXJlZGlyZWN0LiBBbmQgd2hlbiBzdGFydEpvYiBpcyBjYWxsZWQgZHVlIHRvIG5ldyBh dXRoCisgICAgICAgIGNyZWRlbnRpYWxzLCBzZXQgaXQgdG8gdHJ1ZS4KKworICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok5ldHdvcmtKb2I6OnN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QpOiBBZGQgcmVyZWFkQ29va2ll cyBwYXJhbWV0ZXIsIHBhc3MgaXQgdG8KKyAgICAgICAgc3RhcnRKb2IuCisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrSm9iOjpoYW5kbGVSZWRpcmVjdCk6IFNldCBuZXcgcmVyZWFkQ29va2llcyBw YXJhbSBvZiBzdGFydE5ld0pvYiB0byB0cnVlLgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0pv Yjo6bm90aWZ5Q2hhbGxlbmdlUmVzdWx0KTogU2V0IG5ldyByZXJlYWRDb29raWVzIHBhcmFtIG9m IHN0YXJ0TmV3Sm9iIHRvCisgICAgICAgIHRydWUuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaDoKKyAgICAgICAgKE5ldHdvcmtKb2IpOiBBZGQgcmVy ZWFkQ29va2llcyBwYXJhbWV0ZXIgdG8gc3RhcnROZXdKb2JXaXRoUmVxdWVzdC4KKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01hbmFnZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TmV0d29ya01hbmFnZXI6OnN0YXJ0Sm9iKTogQWRkIHJlcmVhZENvb2tpZXMg cGFyYW1ldGVyLCBwYXNzIGl0IGluc3RlYWQgb2YKKyAgICAgICAgcmVkaXJlY3RDb3VudCB0byBp bml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0LgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9OZXR3b3JrTWFuYWdlci5oOgorICAgICAgICAoTmV0d29ya01hbmFnZXIpOiBBZGQg cmVyZWFkQ29va2llcyBwYXJhbWV0ZXIgdG8gc3RhcnRKb2IuCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoUmVzb3VyY2VS ZXF1ZXN0KTogUmVuYW1lIGlzUmVkaXJlY3QgcGFyYW1ldGVyIHRvIHJlcmVhZENvb2tpZXMuCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojppbml0aWFsaXpl UGxhdGZvcm1SZXF1ZXN0KTogUmVuYW1lIGlzUmVkaXJlY3QgdG8gcmVyZWFkQ29va2llcy4KKwog MjAxMy0wMi0yMSAgSm9lIE1hc29uICA8am1hc29uQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNr QmVycnldIE1vdmUgU2V0LUNvb2tpZSBoZWFkZXIgaGFuZGxpbmcgdG8gTmV0d29ya0pvYjo6bm90 aWZ5U2V0Q29va2llCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKaW5kZXggMzRkYThiYi4uZmUwZWY2MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdv cmtKb2IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmNwcApAQCAtNjEzLDcgKzYxMyw3IEBAIGJvb2wgTmV0d29ya0pvYjo6cmV0 cnlBc0ZUUERpcmVjdG9yeSgpCiAgICAgcmV0dXJuIHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QobmV3 UmVxdWVzdCk7CiB9CiAKLWJvb2wgTmV0d29ya0pvYjo6c3RhcnROZXdKb2JXaXRoUmVxdWVzdChS ZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGJvb2wgaW5jcmVhc2VSZWRpcmVjdENvdW50KQor Ym9vbCBOZXR3b3JrSm9iOjpzdGFydE5ld0pvYldpdGhSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYg bmV3UmVxdWVzdCwgYm9vbCBpbmNyZWFzZVJlZGlyZWN0Q291bnQsIGJvb2wgcmVyZWFkQ29va2ll cykKIHsKICAgICAvLyBtX2ZyYW1lIGNhbiBiZSBudWxsIGlmIHRoaXMgaXMgYSBQaW5nTG9hZGVy IGpvYiAoU2VlIE5ldHdvcmtKb2I6OmluaXRpYWxpemUpLgogICAgIC8vIEluIHRoaXMgY2FzZSB3 ZSBkb24ndCBzdGFydCBuZXcgcmVxdWVzdC4KQEAgLTY0MSw3ICs2NDEsOCBAQCBib29sIE5ldHdv cmtKb2I6OnN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0 LCBib29sIGluY3JlYQogICAgICAgICBtX3N0cmVhbUZhY3RvcnksCiAgICAgICAgIG1fZnJhbWUs CiAgICAgICAgIG1fZGVmZXJMb2FkaW5nQ291bnQsCi0gICAgICAgIGluY3JlYXNlUmVkaXJlY3RD b3VudCA/IG1fcmVkaXJlY3RDb3VudCArIDEgOiBtX3JlZGlyZWN0Q291bnQpOworICAgICAgICBp bmNyZWFzZVJlZGlyZWN0Q291bnQgPyBtX3JlZGlyZWN0Q291bnQgKyAxIDogbV9yZWRpcmVjdENv dW50LAorICAgICAgICByZXJlYWRDb29raWVzKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAt Njg0LDcgKzY4NSw3IEBAIGJvb2wgTmV0d29ya0pvYjo6aGFuZGxlUmVkaXJlY3QoKQogICAgIG1f aGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3Byb3h5V2ViQ2hhbGxlbmdlLm51bGxpZnkoKTsKICAg ICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9ob3N0V2ViQ2hhbGxlbmdlLm51bGxpZnkoKTsK IAotICAgIHJldHVybiBzdGFydE5ld0pvYldpdGhSZXF1ZXN0KG5ld1JlcXVlc3QsIHRydWUpOwor ICAgIHJldHVybiBzdGFydE5ld0pvYldpdGhSZXF1ZXN0KG5ld1JlcXVlc3QsIC8qIGluY3JlYXNl UmVkaXJlY3RDb3VudCAqLyB0cnVlLCAvKiByZXJlYWRDb29raWVzICovIHRydWUpOwogfQogCiB2 b2lkIE5ldHdvcmtKb2I6OnNlbmRSZXNwb25zZUlmTmVlZGVkKCkKQEAgLTEwMjcsNyArMTAyOCw3 IEBAIHZvaWQgTmV0d29ya0pvYjo6bm90aWZ5Q2hhbGxlbmdlUmVzdWx0KGNvbnN0IEtVUkwmIHVy bCwgY29uc3QgUHJvdGVjdGlvblNwYWNlJiBwCiAgICAgUmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVl c3QgPSBtX2hhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7CiAgICAgbmV3UmVxdWVzdC5zZXRVUkwodXJs KTsKICAgICBuZXdSZXF1ZXN0LnNldE11c3RIYW5kbGVJbnRlcm5hbGx5KHRydWUpOwotICAgIG1f bmV3Sm9iV2l0aENyZWRlbnRpYWxzU3RhcnRlZCA9IHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QobmV3 UmVxdWVzdCk7CisgICAgbV9uZXdKb2JXaXRoQ3JlZGVudGlhbHNTdGFydGVkID0gc3RhcnROZXdK b2JXaXRoUmVxdWVzdChuZXdSZXF1ZXN0LCAvKiBpbmNyZWFzZVJlZGlyZWN0Q291bnQgKi8gZmFs c2UsIC8qIHJlcmVhZENvb2tpZXMgKi8gdHJ1ZSk7CiB9CiAKIHZvaWQgTmV0d29ya0pvYjo6ZnJh bWVEZXN0cm95ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmgKaW5kZXggMDM2YTMzZi4uMWYwYmU5YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtK b2IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0 d29ya0pvYi5oCkBAIC0xMjEsNyArMTIxLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgcmV0cnlB c0ZUUERpcmVjdG9yeSgpOwogCi0gICAgYm9vbCBzdGFydE5ld0pvYldpdGhSZXF1ZXN0KFJlc291 cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCwgYm9vbCBpbmNyZWFzUmVkaXJlY3RDb3VudCA9IGZhbHNl KTsKKyAgICBib29sIHN0YXJ0TmV3Sm9iV2l0aFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiBuZXdS ZXF1ZXN0LCBib29sIGluY3JlYXNSZWRpcmVjdENvdW50ID0gZmFsc2UsIGJvb2wgcmVyZWFkQ29v a2llcyA9IGZhbHNlKTsKIAogICAgIGJvb2wgaGFuZGxlUmVkaXJlY3QoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5h Z2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrTWFuYWdlci5jcHAKaW5kZXggOTgwZDcyYy4uNWVmMzAyYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya01h bmFnZXIuY3BwCkBAIC0xMzgsNyArMTM4LDcgQEAgc3RhdGljIHZvaWQgc2V0QXV0aENyZWRlbnRp YWxzKE5ldHdvcmtSZXF1ZXN0JiBwbGF0Zm9ybVJlcXVlc3QsIGNvbnN0IEF1dGhlbnRpY2EKICAg ICAgICAgcGxhdGZvcm1SZXF1ZXN0LnNldENyZWRlbnRpYWxzKGF1dGhUeXBlLCBhdXRoUHJvdG9j b2wsIGF1dGhTY2hlbWUsIHVzZXJuYW1lLnV0ZjgoKS5kYXRhKCksIHBhc3N3b3JkLnV0ZjgoKS5k YXRhKCkpOwogfQogCi1ib29sIE5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYihpbnQgcGxheWVySWQs IGNvbnN0IFN0cmluZyYgcGFnZUdyb3VwTmFtZSwgUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4g am9iLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpOZXR3b3JrU3RyZWFtRmFjdG9yeSogc3RyZWFtRmFjdG9yeSwgRnJhbWUqIGZyYW1lLCBpbnQg ZGVmZXJMb2FkaW5nQ291bnQsIGludCByZWRpcmVjdENvdW50KQorYm9vbCBOZXR3b3JrTWFuYWdl cjo6c3RhcnRKb2IoaW50IHBsYXllcklkLCBjb25zdCBTdHJpbmcmIHBhZ2VHcm91cE5hbWUsIFBh c3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGpvYiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1N0cmVhbUZhY3RvcnkqIHN0cmVhbUZh Y3RvcnksIEZyYW1lKiBmcmFtZSwgaW50IGRlZmVyTG9hZGluZ0NvdW50LCBpbnQgcmVkaXJlY3RD b3VudCwgYm9vbCByZXJlYWRDb29raWVzKQogewogICAgIC8vIE1ha2Ugc3VyZSB0aGUgUmVzb3Vy Y2VIYW5kbGUgZG9lc24ndCBnbyBvdXQgb2Ygc2NvcGUgd2hpbGUgY2FsbGluZyBjYWxsYmFja3Mu CiAgICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBndWFyZEpvYihqb2IpOwpAQCAtMTUwLDggKzE1 MCwxMiBAQCBib29sIE5ldHdvcmtNYW5hZ2VyOjpzdGFydEpvYihpbnQgcGxheWVySWQsIGNvbnN0 IFN0cmluZyYgcGFnZUdyb3VwTmFtZSwgUGFzc1JlZgogICAgIGlmIChpc0luaXRpYWwpCiAgICAg ICAgIG1faW5pdGlhbFVSTCA9IEtVUkwoKTsKIAorICAgIC8vIEFsd2F5cyByZXJlYWQgY29va2ll cyBvbiBhIHJlZGlyZWN0CisgICAgaWYgKHJlZGlyZWN0Q291bnQpCisgICAgICAgIHJlcmVhZENv b2tpZXMgPSB0cnVlOworCiAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtSZXF1ZXN0 IHBsYXRmb3JtUmVxdWVzdDsKLSAgICByZXF1ZXN0LmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3Qo cGxhdGZvcm1SZXF1ZXN0LCBmcmFtZS0+bG9hZGVyKCkgJiYgZnJhbWUtPmxvYWRlcigpLT5jbGll bnQoKSAmJiBzdGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkqPihmcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSwgaXNJbml0aWFsLCByZWRpcmVj dENvdW50KTsKKyAgICByZXF1ZXN0LmluaXRpYWxpemVQbGF0Zm9ybVJlcXVlc3QocGxhdGZvcm1S ZXF1ZXN0LCBmcmFtZS0+bG9hZGVyKCkgJiYgZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSAmJiBz dGF0aWNfY2FzdDxGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkqPihmcmFtZS0+bG9hZGVyKCkt PmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSwgaXNJbml0aWFsLCByZXJlYWRDb29raWVzKTsK IAogICAgIGNvbnN0IFN0cmluZyYgZG9jdW1lbnRVcmwgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJs KCkuc3RyaW5nKCk7CiAgICAgaWYgKCFkb2N1bWVudFVybC5pc0VtcHR5KCkpIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrTWFu YWdlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdv cmtNYW5hZ2VyLmgKaW5kZXggZjBjNTlkMC4uNWY4Y2IxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2VyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtNYW5hZ2Vy LmgKQEAgLTU3LDcgKzU3LDcgQEAgcHJpdmF0ZToKIAogICAgIE5ldHdvcmtKb2IqIGZpbmRKb2JG b3JIYW5kbGUoUGFzc1JlZlB0cjxSZXNvdXJjZUhhbmRsZT4pOwogICAgIHZvaWQgZGVsZXRlSm9i KE5ldHdvcmtKb2IqKTsKLSAgICBib29sIHN0YXJ0Sm9iKGludCBwbGF5ZXJJZCwgY29uc3QgU3Ry aW5nJiBwYWdlR3JvdXBOYW1lLCBQYXNzUmVmUHRyPFJlc291cmNlSGFuZGxlPiwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiwgQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok5ldHdvcmtTdHJlYW1GYWN0b3J5 KiwgRnJhbWUqLCBpbnQgZGVmZXJMb2FkaW5nQ291bnQgPSAwLCBpbnQgcmVkaXJlY3RDb3VudCA9 IDApOworICAgIGJvb2wgc3RhcnRKb2IoaW50IHBsYXllcklkLCBjb25zdCBTdHJpbmcmIHBhZ2VH cm91cE5hbWUsIFBhc3NSZWZQdHI8UmVzb3VyY2VIYW5kbGU+LCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1N0cmVhbUZhY3RvcnkqLCBGcmFtZSos IGludCBkZWZlckxvYWRpbmdDb3VudCA9IDAsIGludCByZWRpcmVjdENvdW50ID0gMCwgYm9vbCBy ZXJlYWRDb29raWVzID0gZmFsc2UpOwogCiAgICAgVmVjdG9yPE5ldHdvcmtKb2IqPiBtX2pvYnM7 CiAgICAgS1VSTCBtX2luaXRpYWxVUkw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0LmgKaW5kZXggMWIw Zjk1OC4uM2E1NWY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYmxhY2tiZXJyeS9SZXNvdXJjZVJlcXVlc3QuaApAQCAtMTA2LDcgKzEwNiw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE11c3RIYW5kbGVJbnRlcm5hbGx5KGJvb2wgbXVzdEhh bmRsZUludGVybmFsbHkpIHsgbV9tdXN0SGFuZGxlSW50ZXJuYWxseSA9IG11c3RIYW5kbGVJbnRl cm5hbGx5OyB9CiAgICAgYm9vbCBtdXN0SGFuZGxlSW50ZXJuYWxseSgpIGNvbnN0IHsgcmV0dXJu IG1fbXVzdEhhbmRsZUludGVybmFsbHk7IH0KIAotICAgIHZvaWQgaW5pdGlhbGl6ZVBsYXRmb3Jt UmVxdWVzdChCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3QmLCBib29sIGNvb2tp ZXNFbmFibGVkLCBib29sIGlzSW5pdGlhbCA9IGZhbHNlLCBib29sIGlzUmVkaXJlY3QgPSBmYWxz ZSkgY29uc3Q7CisgICAgdm9pZCBpbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0KEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdCYsIGJvb2wgY29va2llc0VuYWJsZWQsIGJvb2wgaXNJ bml0aWFsID0gZmFsc2UsIGJvb2wgcmVyZWFkQ29va2llcyA9IGZhbHNlKSBjb25zdDsKICAgICB2 b2lkIHNldEZvcmNlRG93bmxvYWQoYm9vbCBmb3JjZURvd25sb2FkKSB7IG1fZm9yY2VEb3dubG9h ZCA9IGZvcmNlRG93bmxvYWQ7IH0KICAgICBib29sIGZvcmNlRG93bmxvYWQoKSBjb25zdCB7IHJl dHVybiBtX2ZvcmNlRG93bmxvYWQ7IH0KICAgICB2b2lkIHNldFN1Z2dlc3RlZFNhdmVOYW1lKGNv bnN0IFN0cmluZyYgbmFtZSkgeyBtX3N1Z2dlc3RlZFNhdmVOYW1lID0gbmFtZTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L1Jlc291cmNl UmVxdWVzdEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L1Jlc291cmNlUmVxdWVzdEJsYWNrQmVycnkuY3BwCmluZGV4IGI4YTY0YjUuLjFm NjY4ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2ti ZXJyeS9SZXNvdXJjZVJlcXVlc3RCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvUmVzb3VyY2VSZXF1ZXN0QmxhY2tCZXJyeS5jcHAK QEAgLTE0MSw3ICsxNDEsNyBAQCBSZXNvdXJjZVJlcXVlc3Q6OlRhcmdldFR5cGUgUmVzb3VyY2VS ZXF1ZXN0Ojp0YXJnZXRUeXBlRnJvbU1pbWVUeXBlKGNvbnN0IFN0cmluZwogICAgIHJldHVybiBp dGVyLT52YWx1ZTsKIH0KIAotdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmluaXRpYWxpemVQbGF0Zm9y bVJlcXVlc3QoTmV0d29ya1JlcXVlc3QmIHBsYXRmb3JtUmVxdWVzdCwgYm9vbCBjb29raWVzRW5h YmxlZCwgYm9vbCBpc0luaXRpYWwsIGJvb2wgaXNSZWRpcmVjdCkgY29uc3QKK3ZvaWQgUmVzb3Vy Y2VSZXF1ZXN0Ojppbml0aWFsaXplUGxhdGZvcm1SZXF1ZXN0KE5ldHdvcmtSZXF1ZXN0JiBwbGF0 Zm9ybVJlcXVlc3QsIGJvb2wgY29va2llc0VuYWJsZWQsIGJvb2wgaXNJbml0aWFsLCBib29sIHJl cmVhZENvb2tpZXMpIGNvbnN0CiB7CiAgICAgLy8gSWYgdGhpcyBpcyB0aGUgaW5pdGlhbCBsb2Fk LCBza2lwIHRoZSByZXF1ZXN0IGJvZHkgYW5kIGhlYWRlcnMuCiAgICAgaWYgKGlzSW5pdGlhbCkK QEAgLTE5MSw3ICsxOTEsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6aW5pdGlhbGl6ZVBsYXRm b3JtUmVxdWVzdChOZXR3b3JrUmVxdWVzdCYgcGxhdGZvcm1SZXF1ZXN0LAogICAgICAgICB9CiAK ICAgICAgICAgLy8gV2hlbiBSZXNvdXJjZVJlcXVlc3QgaXMgcmV1c2VkIGJ5IENhY2hlUmVzb3Vy Y2VMb2FkZXIsIHBhZ2UgcmVmcmVzaGluZyBvciByZWRpcmVjdGlvbiwgaXRzIGNvb2tpZXMgbWF5 IGJlIGRpcnRpZWQuIFdlIHdvbid0IHVzZSB0aGVzZSBjb29raWVzIGFueSBtb3JlLgotICAgICAg ICBib29sIGNvb2tpZUhlYWRlck1heUJlRGlydHkgPSBpc1JlZGlyZWN0IHx8IGNhY2hlUG9saWN5 KCkgPT0gV2ViQ29yZTo6UmVsb2FkSWdub3JpbmdDYWNoZURhdGEgfHwgY2FjaGVQb2xpY3koKSA9 PSBXZWJDb3JlOjpSZXR1cm5DYWNoZURhdGFFbHNlTG9hZDsKKyAgICAgICAgYm9vbCBjb29raWVI ZWFkZXJNYXlCZURpcnR5ID0gcmVyZWFkQ29va2llcyB8fCBjYWNoZVBvbGljeSgpID09IFdlYkNv cmU6OlJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhIHx8IGNhY2hlUG9saWN5KCkgPT0gV2ViQ29yZTo6 UmV0dXJuQ2FjaGVEYXRhRWxzZUxvYWQ7CiAKICAgICAgICAgZm9yIChIVFRQSGVhZGVyTWFwOjpj b25zdF9pdGVyYXRvciBpdCA9IGh0dHBIZWFkZXJGaWVsZHMoKS5iZWdpbigpOyBpdCAhPSBodHRw SGVhZGVyRmllbGRzKCkuZW5kKCk7ICsraXQpIHsKICAgICAgICAgICAgIFN0cmluZyBrZXkgPSBp dC0+a2V5OwotLSAKMS43LjUuNAoK