92457 2012-07-26 22:22:35 -0700 [BlackBerry] Update sendRequestWithCredentials to use new getProxyAddress interface 2012-07-27 11:05:05 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 joenotcharles joenotcharles mifenton webkit.review.bot yong.li.webkit oldest_to_newest 680122 0 joenotcharles 2012-07-26 22:22:35 -0700 BlackBerry::Platform::Client::getProxyAddress has been updated to return "host:port", instead of having two separate functions for host and port. Need to update NetworkJob to use the new API. 680511 1 154920 joenotcharles 2012-07-27 06:07:19 -0700 Created attachment 154920 patch 680662 2 154920 yong.li.webkit 2012-07-27 08:12:28 -0700 Comment on attachment 154920 patch View in context: https://bugs.webkit.org/attachment.cgi?id=154920&action=review > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:690 > + String proxyAddress = BlackBerry::Platform::Client::get()->getProxyAddress(newURL.string().utf8().data()).c_str(); Is latin1() any better than utf8() here? 680663 3 yong.li.webkit 2012-07-27 08:14:46 -0700 seems String::ascii() is good to use now. 680683 4 154959 joenotcharles 2012-07-27 08:29:32 -0700 Created attachment 154959 fixed utf8/ascii Good catch. Changed to ascii 680687 5 154920 joenotcharles 2012-07-27 08:33:13 -0700 Comment on attachment 154920 patch Putting both the utf8 and ascii versions up for review. Let the reviewers fight it out. 680692 6 webkit.review.bot 2012-07-27 08:34:29 -0700 Attachment 154959 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 680695 7 154959 yong.li.webkit 2012-07-27 08:38:04 -0700 Comment on attachment 154959 fixed utf8/ascii cancel committing for now. there is style error 680709 8 154965 joenotcharles 2012-07-27 08:48:30 -0700 Created attachment 154965 ascii version with tab removed Fixed style error 680711 9 154959 webkit.review.bot 2012-07-27 08:58:19 -0700 Comment on attachment 154959 fixed utf8/ascii Cleared Yong Li's review+ from obsolete attachment 154959 so that this bug does not appear in http://webkit.org/pending-commit. 680726 10 154920 joenotcharles 2012-07-27 09:15:04 -0700 Comment on attachment 154920 patch Clearing review flag as the other version is being committed 680824 11 154965 webkit.review.bot 2012-07-27 11:05:02 -0700 Comment on attachment 154965 ascii version with tab removed Clearing flags on attachment: 154965 Committed r123890: <http://trac.webkit.org/changeset/123890> 680825 12 webkit.review.bot 2012-07-27 11:05:05 -0700 All reviewed patches have been landed. Closing bug. 154920 2012-07-27 06:07:19 -0700 2012-07-27 09:15:03 -0700 patch 0001-BlackBerry-Update-NetworkJob-sendRequestWithCredenti.patch text/plain 3068 joenotcharles RnJvbSAxMDRjOWMyNDYzOTMxOTM5NDNhODhhMDBjYzc4NzJiNjAwMjJiYmVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDI3IEp1bCAyMDEyIDAxOjI1OjMyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFVwZGF0ZSBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscwogdG8gdXNlIG5l dyBnZXRQcm94eUFkZHJlc3MgQVBJCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI0NTcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKZ2V0UHJveHlBZGRyZXNz IG5vdyByZXR1cm5zICJob3N0OnBvcnQiLCBhbmQgZ2V0UHJveHlQb3J0IGlzIGdvbmUuIFVwZGF0 ZSBOZXR3b3JrSm9iIHRvIHVzZQp0aGUgbmV3IGludGVyZmFjZS4KClJJTSBQUjogMTc2MTY2ClJl dmlld2VkIGludGVybmFsbHkgYnkgSm9uYXRoYW4gRG9uZyA8am9uYXRoYW4uZG9uZ0B0b3JjaG1v YmlsZS5jb20uY24+CgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNw cDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKLS0t CiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTQgKysrKysrKysrKysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29y a0pvYi5jcHAgICAgIHwgICAxNiArKysrKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI0 IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGFkYTYxNGYuLjMx M2I1ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNy0yNiAgSm9lIE1hc29u ICA8am1hc29uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFVwZGF0ZSBOZXR3b3Jr Sm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyB0byB1c2UgbmV3IGdldFByb3h5QWRkcmVz cyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTky NDU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUklN IFBSOiAxNzYxNjYKKyAgICAgICAgZ2V0UHJveHlBZGRyZXNzIG5vdyByZXR1cm5zICJob3N0OnBv cnQiLCBhbmQgZ2V0UHJveHlQb3J0IGlzIGdvbmUuIFVwZGF0ZSBOZXR3b3JrSm9iIHRvIHVzZQor ICAgICAgICB0aGUgbmV3IGludGVyZmFjZS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtKb2I6 OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKKwogMjAxMi0wNy0yNSAgSm9uYXRoYW4gRG9u ZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIFtCbGFja0Jl cnJ5XSBJbnRlZ3JhdGUgY2VydG1nciB3aXRoIENyZWRlbnRpYWxCYWNraW5nU3RvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3Jr Sm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmNwcAppbmRleCBlMDFiZGMxLi5kMWJkNWVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBA IC02ODQsMTUgKzY4NCwxOSBAQCBib29sIE5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRl bnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUgdHlwZSwgUHJvdAogICAgIGlmICghbmV3 VVJMLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaW50IHBvcnQgPSAw OworICAgIFN0cmluZyBob3N0OworICAgIGludCBwb3J0OwogICAgIGlmICh0eXBlID09IFByb3Rl Y3Rpb25TcGFjZVByb3h5SFRUUCkgewotICAgICAgICBzdGQ6OnN0cmluZ3N0cmVhbSB0b1BvcnQo QmxhY2tCZXJyeTo6UGxhdGZvcm06OkNsaWVudDo6Z2V0KCktPmdldFByb3h5UG9ydCgpKTsKLSAg ICAgICAgdG9Qb3J0ID4+IHBvcnQ7Ci0gICAgfSBlbHNlCisgICAgICAgIFN0cmluZyBwcm94eUFk ZHJlc3MgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Q2xpZW50OjpnZXQoKS0+Z2V0UHJveHlBZGRy ZXNzKG5ld1VSTC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKS5jX3N0cigpOworICAgICAgICBLVVJM IHByb3h5VVJMKEtVUkwoKSwgcHJveHlBZGRyZXNzKTsKKyAgICAgICAgaG9zdCA9IHByb3h5VVJM Lmhvc3QoKTsKKyAgICAgICAgcG9ydCA9IHByb3h5VVJMLnBvcnQoKTsKKyAgICB9IGVsc2Ugewor ICAgICAgICBob3N0ID0gbV9yZXNwb25zZS51cmwoKS5ob3N0KCk7CiAgICAgICAgIHBvcnQgPSBt X3Jlc3BvbnNlLnVybCgpLnBvcnQoKTsKKyAgICB9CiAKLSAgICBQcm90ZWN0aW9uU3BhY2UgcHJv dGVjdGlvblNwYWNlKCh0eXBlID09IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUCkgPyBCbGFja0Jl cnJ5OjpQbGF0Zm9ybTo6Q2xpZW50OjpnZXQoKS0+Z2V0UHJveHlBZGRyZXNzKCkuY19zdHIoKSA6 IG1fcmVzcG9uc2UudXJsKCkuaG9zdCgpCi0gICAgICAgICAgICAsIHBvcnQsIHR5cGUsIHJlYWxt LCBzY2hlbWUpOworICAgIFByb3RlY3Rpb25TcGFjZSBwcm90ZWN0aW9uU3BhY2UoaG9zdCwgcG9y dCwgdHlwZSwgcmVhbG0sIHNjaGVtZSk7CiAKICAgICAvLyBXZSd2ZSBnb3QgdGhlIHNjaGVtZSBh bmQgcmVhbG0uIE5vdyB3ZSBuZWVkIGEgdXNlcm5hbWUgYW5kIHBhc3N3b3JkLgogICAgIC8vIEZp cnN0IHNlYXJjaCB0aGUgQ3JlZGVudGlhbFN0b3JhZ2UuCi0tIAoxLjcuNS40Cgo= 154959 2012-07-27 08:29:32 -0700 2012-07-27 08:58:19 -0700 fixed utf8/ascii 0001-BlackBerry-Update-NetworkJob-sendRequestWithCredenti.patch text/plain 3147 joenotcharles RnJvbSBjMzc5ZmM1OWE0MTQwMzczNWE1ZGQ1MGM3NzM2YTU1MDk1MDIxNDdjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDI3IEp1bCAyMDEyIDAxOjI1OjMyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFVwZGF0ZSBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscwogdG8gdXNlIG5l dyBnZXRQcm94eUFkZHJlc3MgQVBJCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI0NTcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKZ2V0UHJveHlBZGRyZXNz IG5vdyByZXR1cm5zICJob3N0OnBvcnQiLCBhbmQgZ2V0UHJveHlQb3J0IGlzIGdvbmUuIFVwZGF0 ZSBOZXR3b3JrSm9iIHRvIHVzZQp0aGUgbmV3IGludGVyZmFjZS4KClJJTSBQUjogMTc2MTY2ClJl dmlld2VkIGludGVybmFsbHkgYnkgSm9uYXRoYW4gRG9uZyA8am9uYXRoYW4uZG9uZ0B0b3JjaG1v YmlsZS5jb20uY24+CgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNw cDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKLS0t CiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTYgKysrKysrKysrKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmNwcCAgICAgfCAgIDE2ICsrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRhNjE0Zi4u YzU1ZmYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTI2ICBKb2UgTWFz b24gIDxqbWFzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gVXBkYXRlIE5ldHdv cmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzIHRvIHVzZSBuZXcgZ2V0UHJveHlBZGRy ZXNzIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI0NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBn ZXRQcm94eUFkZHJlc3Mgbm93IHJldHVybnMgImhvc3Q6cG9ydCIsIGFuZCBnZXRQcm94eVBvcnQg aXMgZ29uZS4gVXBkYXRlIE5ldHdvcmtKb2IgdG8gdXNlCisgICAgICAgIHRoZSBuZXcgaW50ZXJm YWNlLgorCisgICAgICAgIFJJTSBQUjogMTc2MTY2CisJSW50ZXJuYWxseSByZXZpZXdlZCBieSBK b25hdGhhbiBEb25nIDxqb25hdGhhbi5kb25nQHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAg ICAqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKKwogMjAx Mi0wNy0yNSAgSm9uYXRoYW4gRG9uZyAgPGpvbmF0aGFuLmRvbmdAdG9yY2htb2JpbGUuY29tLmNu PgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBJbnRlZ3JhdGUgY2VydG1nciB3aXRoIENyZWRlbnRp YWxCYWNraW5nU3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCBlMDFiZGMxLi5hNmRkMWE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0 d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2Jl cnJ5L05ldHdvcmtKb2IuY3BwCkBAIC02ODQsMTUgKzY4NCwxOSBAQCBib29sIE5ldHdvcmtKb2I6 OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUgdHlw ZSwgUHJvdAogICAgIGlmICghbmV3VVJMLmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgaW50IHBvcnQgPSAwOworICAgIFN0cmluZyBob3N0OworICAgIGludCBwb3J0Owog ICAgIGlmICh0eXBlID09IFByb3RlY3Rpb25TcGFjZVByb3h5SFRUUCkgewotICAgICAgICBzdGQ6 OnN0cmluZ3N0cmVhbSB0b1BvcnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OkNsaWVudDo6Z2V0KCkt PmdldFByb3h5UG9ydCgpKTsKLSAgICAgICAgdG9Qb3J0ID4+IHBvcnQ7Ci0gICAgfSBlbHNlCisg ICAgICAgIFN0cmluZyBwcm94eUFkZHJlc3MgPSBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Q2xpZW50 OjpnZXQoKS0+Z2V0UHJveHlBZGRyZXNzKG5ld1VSTC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSku Y19zdHIoKTsKKyAgICAgICAgS1VSTCBwcm94eVVSTChLVVJMKCksIHByb3h5QWRkcmVzcyk7Cisg ICAgICAgIGhvc3QgPSBwcm94eVVSTC5ob3N0KCk7CisgICAgICAgIHBvcnQgPSBwcm94eVVSTC5w b3J0KCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaG9zdCA9IG1fcmVzcG9uc2UudXJsKCkuaG9z dCgpOwogICAgICAgICBwb3J0ID0gbV9yZXNwb25zZS51cmwoKS5wb3J0KCk7CisgICAgfQogCi0g ICAgUHJvdGVjdGlvblNwYWNlIHByb3RlY3Rpb25TcGFjZSgodHlwZSA9PSBQcm90ZWN0aW9uU3Bh Y2VQcm94eUhUVFApID8gQmxhY2tCZXJyeTo6UGxhdGZvcm06OkNsaWVudDo6Z2V0KCktPmdldFBy b3h5QWRkcmVzcygpLmNfc3RyKCkgOiBtX3Jlc3BvbnNlLnVybCgpLmhvc3QoKQotICAgICAgICAg ICAgLCBwb3J0LCB0eXBlLCByZWFsbSwgc2NoZW1lKTsKKyAgICBQcm90ZWN0aW9uU3BhY2UgcHJv dGVjdGlvblNwYWNlKGhvc3QsIHBvcnQsIHR5cGUsIHJlYWxtLCBzY2hlbWUpOwogCiAgICAgLy8g V2UndmUgZ290IHRoZSBzY2hlbWUgYW5kIHJlYWxtLiBOb3cgd2UgbmVlZCBhIHVzZXJuYW1lIGFu ZCBwYXNzd29yZC4KICAgICAvLyBGaXJzdCBzZWFyY2ggdGhlIENyZWRlbnRpYWxTdG9yYWdlLgot LSAKMS43LjUuNAoK 154965 2012-07-27 08:48:30 -0700 2012-07-27 11:05:02 -0700 ascii version with tab removed 0001-BlackBerry-Update-NetworkJob-sendRequestWithCredenti.patch text/plain 3154 joenotcharles RnJvbSAzZTEzZjc3Y2Q4NmZjY2Q3YjE0MGUyNzFmOWRjYmEzMWYyZmRmMWEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBGcmks IDI3IEp1bCAyMDEyIDAxOjI1OjMyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gW0JsYWNrQmVycnld IFVwZGF0ZSBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscwogdG8gdXNlIG5l dyBnZXRQcm94eUFkZHJlc3MgQVBJCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI0NTcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKZ2V0UHJveHlBZGRyZXNz IG5vdyByZXR1cm5zICJob3N0OnBvcnQiLCBhbmQgZ2V0UHJveHlQb3J0IGlzIGdvbmUuIFVwZGF0 ZSBOZXR3b3JrSm9iIHRvIHVzZQp0aGUgbmV3IGludGVyZmFjZS4KClJJTSBQUjogMTc2MTY2ClJl dmlld2VkIGludGVybmFsbHkgYnkgSm9uYXRoYW4gRG9uZyA8am9uYXRoYW4uZG9uZ0B0b3JjaG1v YmlsZS5jb20uY24+CgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNw cDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKToKLS0t CiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTYgKysrKysrKysrKysrKysrKwogLi4uL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9OZXR3 b3JrSm9iLmNwcCAgICAgfCAgIDE2ICsrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRhNjE0Zi4u N2U3OWE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA3LTI2ICBKb2UgTWFz b24gIDxqbWFzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gVXBkYXRlIE5ldHdv cmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzIHRvIHVzZSBuZXcgZ2V0UHJveHlBZGRy ZXNzIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTI0NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBn ZXRQcm94eUFkZHJlc3Mgbm93IHJldHVybnMgImhvc3Q6cG9ydCIsIGFuZCBnZXRQcm94eVBvcnQg aXMgZ29uZS4gVXBkYXRlIE5ldHdvcmtKb2IgdG8gdXNlCisgICAgICAgIHRoZSBuZXcgaW50ZXJm YWNlLgorCisgICAgICAgIFJJTSBQUjogMTc2MTY2CisgICAgICAgIEludGVybmFsbHkgcmV2aWV3 ZWQgYnkgSm9uYXRoYW4gRG9uZyA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyk6 CisKIDIwMTItMDctMjUgIEpvbmF0aGFuIERvbmcgIDxqb25hdGhhbi5kb25nQHRvcmNobW9iaWxl LmNvbS5jbj4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gSW50ZWdyYXRlIGNlcnRtZ3Igd2l0aCBD cmVkZW50aWFsQmFja2luZ1N0b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKaW5kZXggZTAxYmRjMS4uYTZk ZDFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2Jl cnJ5L05ldHdvcmtKb2IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcApAQCAtNjg0LDE1ICs2ODQsMTkgQEAgYm9vbCBOZXR3 b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQcm90ZWN0aW9uU3BhY2VTZXJ2ZXJU eXBlIHR5cGUsIFByb3QKICAgICBpZiAoIW5ld1VSTC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIGludCBwb3J0ID0gMDsKKyAgICBTdHJpbmcgaG9zdDsKKyAgICBpbnQg cG9ydDsKICAgICBpZiAodHlwZSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFApIHsKLSAgICAg ICAgc3RkOjpzdHJpbmdzdHJlYW0gdG9Qb3J0KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpDbGllbnQ6 OmdldCgpLT5nZXRQcm94eVBvcnQoKSk7Ci0gICAgICAgIHRvUG9ydCA+PiBwb3J0OwotICAgIH0g ZWxzZQorICAgICAgICBTdHJpbmcgcHJveHlBZGRyZXNzID0gQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkNsaWVudDo6Z2V0KCktPmdldFByb3h5QWRkcmVzcyhuZXdVUkwuc3RyaW5nKCkuYXNjaWkoKS5k YXRhKCkpLmNfc3RyKCk7CisgICAgICAgIEtVUkwgcHJveHlVUkwoS1VSTCgpLCBwcm94eUFkZHJl c3MpOworICAgICAgICBob3N0ID0gcHJveHlVUkwuaG9zdCgpOworICAgICAgICBwb3J0ID0gcHJv eHlVUkwucG9ydCgpOworICAgIH0gZWxzZSB7CisgICAgICAgIGhvc3QgPSBtX3Jlc3BvbnNlLnVy bCgpLmhvc3QoKTsKICAgICAgICAgcG9ydCA9IG1fcmVzcG9uc2UudXJsKCkucG9ydCgpOworICAg IH0KIAotICAgIFByb3RlY3Rpb25TcGFjZSBwcm90ZWN0aW9uU3BhY2UoKHR5cGUgPT0gUHJvdGVj dGlvblNwYWNlUHJveHlIVFRQKSA/IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpDbGllbnQ6OmdldCgp LT5nZXRQcm94eUFkZHJlc3MoKS5jX3N0cigpIDogbV9yZXNwb25zZS51cmwoKS5ob3N0KCkKLSAg ICAgICAgICAgICwgcG9ydCwgdHlwZSwgcmVhbG0sIHNjaGVtZSk7CisgICAgUHJvdGVjdGlvblNw YWNlIHByb3RlY3Rpb25TcGFjZShob3N0LCBwb3J0LCB0eXBlLCByZWFsbSwgc2NoZW1lKTsKIAog ICAgIC8vIFdlJ3ZlIGdvdCB0aGUgc2NoZW1lIGFuZCByZWFsbS4gTm93IHdlIG5lZWQgYSB1c2Vy bmFtZSBhbmQgcGFzc3dvcmQuCiAgICAgLy8gRmlyc3Qgc2VhcmNoIHRoZSBDcmVkZW50aWFsU3Rv cmFnZS4KLS0gCjEuNy41LjQKCg==