101945 2012-11-12 09:30:36 -0800 [BlackBerry] Update to new ProxyInfo api 2012-11-12 12:33:34 -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 oldest_to_newest 764488 0 joenotcharles 2012-11-12 09:30:36 -0800 The API to get the proxy info has changed. 764491 1 173661 joenotcharles 2012-11-12 09:32:49 -0800 Created attachment 173661 patch 764670 2 173661 webkit.review.bot 2012-11-12 12:33:31 -0800 Comment on attachment 173661 patch Clearing flags on attachment: 173661 Committed r134280: <http://trac.webkit.org/changeset/134280> 764671 3 webkit.review.bot 2012-11-12 12:33:34 -0800 All reviewed patches have been landed. Closing bug. 173661 2012-11-12 09:32:49 -0800 2012-11-12 12:33:31 -0800 patch 0001-BlackBerry-Update-to-new-proxyInfo-API.patch text/plain 7335 joenotcharles RnJvbSA5MmY3YWMyYmZhNGU2MzZjODEwN2NlYTgzMjE4NjFmNmVlZWU4MDE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBUaHUs IDggTm92IDIwMTIgMDk6NDk6MjAgLTA1MDAKU3ViamVjdDogW1BBVENIIDEvM10gW0JsYWNrQmVy cnldIFVwZGF0ZSB0byBuZXcgcHJveHlJbmZvIEFQSSBOZWVkIHRoZSBidWcKIFVSTCAoT09QUyEp LgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpJbnRlcm5hbCBQUjogMjM0NjgwClJldmll d2VkIGludGVybmFsbHkgYnk6IG5vYm9keQoKVGhlIHByb3h5QWRkcmVzcywgcHJveHlVc2VybmFt ZSBhbmQgcHJveHlQYXNzd29yZCBtZXRob2RzIGluIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0 aW5ncwpoYXZlIGJlZW4gcmVwbGFjZWQgd2l0aCBhIHNpbmdsZSwgbW9yZSBlZmZpY2llbnQgcHJv eHlJbmZvIG1ldGhvZC4KCk5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoaXMgaXMgYW4gQVBJIHVwZGF0 ZSB3aXRoIG5vIGJlaGF2aW91ciBjaGFuZ2UuCgoqIHBsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmNwcDoKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENy ZWRlbnRpYWxzKToKKFdlYkNvcmU6Ok5ldHdvcmtKb2I6OnN0b3JlQ3JlZGVudGlhbHMpOgotLS0K IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx OSArKysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAg ICAgIHwgICA2NiArKysrKysrKysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2MiBpbnNl cnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVlMzkzMS4uZDM5N2Ez NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTA4ICBKb2UgTWFzb24gIDxq bWFzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gVXBkYXRlIHRvIG5ldyBwcm94 eUluZm8gQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDE5NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbnRlcm5hbCBQUjogMjM0NjgwCisgICAgICAgIFJldmlld2VkIGludGVybmFsbHkgYnk6IExl byBZYW5nCisKKyAgICAgICAgVGhlIHByb3h5QWRkcmVzcywgcHJveHlVc2VybmFtZSBhbmQgcHJv eHlQYXNzd29yZCBtZXRob2RzIGluIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0aW5ncworICAg ICAgICBoYXZlIGJlZW4gcmVwbGFjZWQgd2l0aCBhIHNpbmdsZSwgbW9yZSBlZmZpY2llbnQgcHJv eHlJbmZvIG1ldGhvZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGlzIGlzIGFu IEFQSSB1cGRhdGUgd2l0aCBubyBiZWhhdmlvdXIgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TmV0d29ya0pvYjo6c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMpOgorICAgICAgICAoV2ViQ29y ZTo6TmV0d29ya0pvYjo6c3RvcmVDcmVkZW50aWFscyk6CisKIDIwMTItMTEtMDkgIENoYXJsZXMg V2VpICA8Y2hhcmxlcy53ZWlAdG9yY2htb2JpbGUuY29tLmNuPgogCiAgICAgICAgIE5lZWQgdG8g Y2xlYXIgZXhjZXB0aW9uIGluIEpTRGljdGlvbmFyeSB0aGF0IG1pZ2h0IGhhdmUgYmVlbiBjYXVz ZWQgYnkgcHJldmlvdXMgb3BlcmF0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IDMwMThhYTIu Ljk5NzdlZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2JsYWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTc0NywyMiArNzQ3LDMxIEBAIGJvb2wg TmV0d29ya0pvYjo6c2VuZFJlcXVlc3RXaXRoQ3JlZGVudGlhbHMoUHJvdGVjdGlvblNwYWNlU2Vy dmVyVHlwZSB0eXBlLCBQcm90CiAKICAgICBTdHJpbmcgaG9zdDsKICAgICBpbnQgcG9ydDsKKyAg ICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6UHJveHlJbmZvIHByb3h5SW5mbzsKICAgICBpZiAodHlw ZSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94eUhUVFAgfHwgdHlwZSA9PSBQcm90ZWN0aW9uU3BhY2VQ cm94eUhUVFBTKSB7Ci0gICAgICAgIC8vIHByb3h5QWRkcmVzcyByZXR1cm5zIGhvc3Q6cG9ydCwg d2l0aG91dCBhIHByb3RvY29sLiBLVVJMIGNhbid0IHBhcnNlIHRoaXMsIHNvIHN0aWNrIGh0dHAK LSAgICAgICAgLy8gb24gdGhlIGZyb250LgotICAgICAgICAvLyAoV2UgY291bGQgc3BsaXQgaW50 byBob3N0IGFuZCBwb3J0IGJ5IGhhbmQsIGJ1dCB0aGF0IGdldHMgaGFyZCB0byBwYXJzZSB3aXRo IElQdjYgdXJscywKLSAgICAgICAgLy8gc28gYmV0dGVyIHRvIHJldXNlIEtVUkwncyBwYXJzaW5n LikKLSAgICAgICAgU3RyaW5nQnVpbGRlciBwcm94eUFkZHJlc3M7Ci0KLSAgICAgICAgaWYgKHR5 cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQKQotICAgICAgICAgICAgcHJveHlBZGRyZXNz LmFwcGVuZCgiaHR0cDovLyIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBwcm94eUFkZHJl c3MuYXBwZW5kKCJodHRwczovLyIpOworICAgICAgICBwcm94eUluZm8gPSBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPnByb3h5SW5mbyhuZXdVUkwuc3RyaW5nKCkp OworICAgICAgICBBU1NFUlQoIXByb3h5SW5mby5hZGRyZXNzLmVtcHR5KCkpOworICAgICAgICBp ZiAocHJveHlJbmZvLmFkZHJlc3MuZW1wdHkoKSkgeworICAgICAgICAgICAgLy8gRmFsbCBiYWNr IHRvIHRoZSByZXNwb25zZSB1cmwgaWYgdGhlcmUncyBubyBwcm94eQorICAgICAgICAgICAgLy8g RklYTUU6IGlzIHRoaXMgdGhlIGJlc3Qgd2F5IHRvIGhhbmRsZSB0aGlzPworICAgICAgICAgICAg aG9zdCA9IG1fcmVzcG9uc2UudXJsKCkuaG9zdCgpOworICAgICAgICAgICAgcG9ydCA9IG1fcmVz cG9uc2UudXJsKCkucG9ydCgpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gcHJv eHlJbmZvIHJldHVybnMgaG9zdDpwb3J0LCB3aXRob3V0IGEgcHJvdG9jb2wuIEtVUkwgY2FuJ3Qg cGFyc2UgdGhpcywgc28gc3RpY2sgaHR0cAorICAgICAgICAgICAgLy8gb24gdGhlIGZyb250Lgor ICAgICAgICAgICAgLy8gKFdlIGNvdWxkIHNwbGl0IGludG8gaG9zdCBhbmQgcG9ydCBieSBoYW5k LCBidXQgdGhhdCBnZXRzIGhhcmQgdG8gcGFyc2Ugd2l0aCBJUHY2IHVybHMsCisgICAgICAgICAg ICAvLyBzbyBiZXR0ZXIgdG8gcmV1c2UgS1VSTCdzIHBhcnNpbmcuKQorICAgICAgICAgICAgU3Ry aW5nQnVpbGRlciBwcm94eUFkZHJlc3M7CisgICAgICAgICAgICBpZiAodHlwZSA9PSBQcm90ZWN0 aW9uU3BhY2VQcm94eUhUVFApCisgICAgICAgICAgICAgICAgcHJveHlBZGRyZXNzLmFwcGVuZCgi aHR0cDovLyIpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHByb3h5QWRkcmVz cy5hcHBlbmQoImh0dHBzOi8vIik7CisgICAgICAgICAgICBwcm94eUFkZHJlc3MuYXBwZW5kKHBy b3h5SW5mby5hZGRyZXNzKTsKIAotICAgICAgICBwcm94eUFkZHJlc3MuYXBwZW5kKEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2UoKS0+cHJveHlBZGRyZXNzKG5ld1VSTC5z dHJpbmcoKSkpOwotICAgICAgICBLVVJMIHByb3h5VVJMKEtVUkwoKSwgcHJveHlBZGRyZXNzLnRv U3RyaW5nKCkpOwotICAgICAgICBob3N0ID0gcHJveHlVUkwuaG9zdCgpOwotICAgICAgICBwb3J0 ID0gcHJveHlVUkwucG9ydCgpOworICAgICAgICAgICAgS1VSTCBwcm94eVVSTChLVVJMKCksIHBy b3h5QWRkcmVzcy50b1N0cmluZygpKTsKKyAgICAgICAgICAgIGhvc3QgPSBwcm94eVVSTC5ob3N0 KCk7CisgICAgICAgICAgICBwb3J0ID0gcHJveHlVUkwucG9ydCgpOworICAgICAgICB9CiAgICAg fSBlbHNlIHsKICAgICAgICAgaG9zdCA9IG1fcmVzcG9uc2UudXJsKCkuaG9zdCgpOwogICAgICAg ICBwb3J0ID0gbV9yZXNwb25zZS51cmwoKS5wb3J0KCk7CkBAIC03OTcsOSArODA2LDkgQEAgYm9v bCBOZXR3b3JrSm9iOjpzZW5kUmVxdWVzdFdpdGhDcmVkZW50aWFscyhQcm90ZWN0aW9uU3BhY2VT ZXJ2ZXJUeXBlIHR5cGUsIFByb3QKICAgICAgICAgU3RyaW5nIHVzZXJuYW1lOwogICAgICAgICBT dHJpbmcgcGFzc3dvcmQ7CiAKLSAgICAgICAgaWYgKHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJv eHlIVFRQIHx8IHR5cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQUykgewotICAgICAgICAg ICAgdXNlcm5hbWUgPSBTdHJpbmcoQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0 YW5jZSgpLT5wcm94eVVzZXJuYW1lKCkpOwotICAgICAgICAgICAgcGFzc3dvcmQgPSBTdHJpbmco QmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5wcm94eVBhc3N3b3Jk KCkpOworICAgICAgICBpZiAoIXByb3h5SW5mby5hZGRyZXNzLmVtcHR5KCkpIHsKKyAgICAgICAg ICAgIHVzZXJuYW1lID0gcHJveHlJbmZvLnVzZXJuYW1lOworICAgICAgICAgICAgcGFzc3dvcmQg PSBwcm94eUluZm8ucGFzc3dvcmQ7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB1c2Vy bmFtZSA9IG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3VzZXI7CiAgICAgICAgICAgICBwYXNz d29yZCA9IG1faGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5tX3Bhc3M7CkBAIC04MDgsMTAgKzgxNywx MiBAQCBib29sIE5ldHdvcmtKb2I6OnNlbmRSZXF1ZXN0V2l0aENyZWRlbnRpYWxzKFByb3RlY3Rp b25TcGFjZVNlcnZlclR5cGUgdHlwZSwgUHJvdAogICAgICAgICAvLyBCZWZvcmUgYXNraW5nIHRo ZSB1c2VyIGZvciBjcmVkZW50aWFscywgd2UgY2hlY2sgaWYgdGhlIFVSTCBjb250YWlucyB0aGF0 LgogICAgICAgICBpZiAoIXVzZXJuYW1lLmlzRW1wdHkoKSB8fCAhcGFzc3dvcmQuaXNFbXB0eSgp KSB7CiAgICAgICAgICAgICAvLyBQcmV2ZW50IHRoZW0gZnJvbSBiZWVuIHVzZWQgYWdhaW4gaWYg dGhleSBhcmUgd3JvbmcuCi0gICAgICAgICAgICAvLyBJZiB0aGV5IGFyZSBjb3JyZWN0LCB0aGV5 IHdpbGwgdGhlIHB1dCBpbnRvIENyZWRlbnRpYWxTdG9yYWdlLgotICAgICAgICAgICAgaWYgKHR5 cGUgPT0gUHJvdGVjdGlvblNwYWNlUHJveHlIVFRQIHx8IHR5cGUgPT0gUHJvdGVjdGlvblNwYWNl UHJveHlIVFRQUykKLSAgICAgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U2V0dGlu Z3M6Omluc3RhbmNlKCktPnNldFByb3h5Q3JlZGVudGlhbCgiIiwgIiIpOwotICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAvLyBJZiB0aGV5IGFyZSBjb3JyZWN0LCB0aGV5IHdpbGwgYmUg cHV0IGludG8gQ3JlZGVudGlhbFN0b3JhZ2UuCisgICAgICAgICAgICBpZiAoIXByb3h5SW5mby5h ZGRyZXNzLmVtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBwcm94eUluZm8udXNlcm5hbWUuY2xl YXIoKTsKKyAgICAgICAgICAgICAgICBwcm94eUluZm8ucGFzc3dvcmQuY2xlYXIoKTsKKyAgICAg ICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPnN0 b3JlUHJveHlDcmVkZW50aWFscyhwcm94eUluZm8pOworICAgICAgICAgICAgfSBlbHNlIHsKICAg ICAgICAgICAgICAgICBtX2hhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV91c2VyID0gIiI7CiAgICAg ICAgICAgICAgICAgbV9oYW5kbGUtPmdldEludGVybmFsKCktPm1fcGFzcyA9ICIiOwogICAgICAg ICAgICAgfQpAQCAtODU3LDggKzg2OCwxNyBAQCB2b2lkIE5ldHdvcmtKb2I6OnN0b3JlQ3JlZGVu dGlhbHMoKQogICAgIGNoYWxsZW5nZS5zZXRTdG9yZWQodHJ1ZSk7CiAKICAgICBpZiAoY2hhbGxl bmdlLnByb3RlY3Rpb25TcGFjZSgpLnNlcnZlclR5cGUoKSA9PSBQcm90ZWN0aW9uU3BhY2VQcm94 eUhUVFAgfHwgY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFjZSgpLnNlcnZlclR5cGUoKSA9PSBQcm90 ZWN0aW9uU3BhY2VQcm94eUhUVFBTKSB7Ci0gICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT ZXR0aW5nczo6aW5zdGFuY2UoKS0+c2V0UHJveHlDcmVkZW50aWFsKGNoYWxsZW5nZS5wcm9wb3Nl ZENyZWRlbnRpYWwoKS51c2VyKCkudXRmOCgpLmRhdGEoKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFsbGVuZ2UucHJv cG9zZWRDcmVkZW50aWFsKCkucGFzc3dvcmQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgU3Ry aW5nQnVpbGRlciBwcm94eUFkZHJlc3M7CisgICAgICAgIHByb3h5QWRkcmVzcy5hcHBlbmQoY2hh bGxlbmdlLnByb3RlY3Rpb25TcGFjZSgpLmhvc3QoKSk7CisgICAgICAgIHByb3h5QWRkcmVzcy5h cHBlbmQoIjoiKTsKKyAgICAgICAgcHJveHlBZGRyZXNzLmFwcGVuZE51bWJlcihjaGFsbGVuZ2Uu cHJvdGVjdGlvblNwYWNlKCkucG9ydCgpKTsKKworICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9y bTo6UHJveHlJbmZvIHByb3h5SW5mbzsKKyAgICAgICAgcHJveHlJbmZvLmFkZHJlc3MgPSBwcm94 eUFkZHJlc3MudG9TdHJpbmcoKTsKKyAgICAgICAgcHJveHlJbmZvLnVzZXJuYW1lID0gY2hhbGxl bmdlLnByb3Bvc2VkQ3JlZGVudGlhbCgpLnVzZXIoKTsKKyAgICAgICAgcHJveHlJbmZvLnBhc3N3 b3JkID0gY2hhbGxlbmdlLnByb3Bvc2VkQ3JlZGVudGlhbCgpLnBhc3N3b3JkKCk7CisKKyAgICAg ICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjppbnN0YW5jZSgpLT5zdG9yZVByb3h5 Q3JlZGVudGlhbHMocHJveHlJbmZvKTsKICAgICAgICAgaWYgKG1fZnJhbWUgJiYgbV9mcmFtZS0+ cGFnZSgpKQogICAgICAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkt PnBsYXRmb3JtUGFnZUNsaWVudCgpLT5zeW5jUHJveHlDcmVkZW50aWFsKGNoYWxsZW5nZS5wcm9w b3NlZENyZWRlbnRpYWwoKSk7CiAgICAgfQotLSAKMS43LjUuNAoK