30446 2009-10-16 10:51:58 -0700 wx port lacks proxy support 2009-10-18 10:05:24 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 kevinwatters webkit-unassigned kevino oldest_to_newest 155139 0 kevinwatters 2009-10-16 10:51:58 -0700 With a simple API for setting proxy info, we could forward it down to CURL and have proxy support in wxWebKit easily. 155140 1 41298 kevinwatters 2009-10-16 10:52:24 -0700 Created attachment 41298 Adds wxWebView::SetProxyInfo 155504 2 kevino 2009-10-18 10:05:24 -0700 Landed in r49752, thanks! 41298 2009-10-16 10:52:24 -0700 2009-10-16 17:30:13 -0700 Adds wxWebView::SetProxyInfo proxy.patch text/plain 7415 kevinwatters ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDhjMjEzYS4uODNiOWUwNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0wOS0xMyAgS2V2aW4gV2F0dGVy cyAgPGtldmlud2F0dGVyc0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHByb3hpZXMgaW4gQ1VSTC4KKwor ICAgICAgICA8YnVnIFVSTCBoZXJlPgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJs L1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZU1hbmFnZXI6OnNldFByb3h5SW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZU1hbmFnZXI6OmluaXRpYWxpemVIYW5kbGUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdv cmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlSGFuZGxlTWFuYWdlcjo6KToKKwogMjAwOS0wOS0xMyAgS2V2aW4gT2xsaXZpZXIgIDxrZXZp bm9AdGhlb2xsaXZpZXJzLmNvbT4KIAogICAgICAgICB3eCBidWlsZCBmaXgsIGZpbGUgd2FzIG1p c3NlZCBkdXJpbmcgVExTLmNwcCByZW1vdmFsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcCBiL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKaW5kZXggMTRjNmYzMS4u YTE3NGEzMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9S ZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwCkBAIC00MDksNiArNDA5LDI1IEBAIHZvaWQgUmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2soVGltZXI8UmVzb3VyY2VIYW5k bGVNYW5hZ2VyPioKICAgICAgICAgbV9kb3dubG9hZFRpbWVyLnN0YXJ0T25lU2hvdChwb2xsVGlt ZVNlY29uZHMpOwogfQogCit2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6c2V0UHJveHlJbmZv KGNvbnN0IFN0cmluZyYgaG9zdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdW5zaWduZWQgbG9uZyBwb3J0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQcm94eVR5cGUgdHlwZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgU3RyaW5nJiB1c2VybmFtZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBwYXNzd29yZCkKK3sKKyAgICBtX3By b3h5VHlwZSA9IHR5cGU7CisKKyAgICBpZiAoIWhvc3QubGVuZ3RoKCkpIHsKKyAgICAgICAgbV9w cm94eSA9IFN0cmluZygiIik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgU3RyaW5nIHVzZXJQYXNz OworICAgICAgICBpZiAodXNlcm5hbWUubGVuZ3RoKCkgfHwgcGFzc3dvcmQubGVuZ3RoKCkpCisg ICAgICAgICAgICB1c2VyUGFzcyA9IHVzZXJuYW1lICsgIjoiICsgcGFzc3dvcmQgKyAiQCI7CisK KyAgICAgICAgbV9wcm94eSA9IFN0cmluZygiaHR0cDovLyIpICsgdXNlclBhc3MgKyBob3N0ICsg IjoiICsgU3RyaW5nOjpudW1iZXIocG9ydCk7CisgICAgfQorfQorCiB2b2lkIFJlc291cmNlSGFu ZGxlTWFuYWdlcjo6cmVtb3ZlRnJvbUN1cmwoUmVzb3VyY2VIYW5kbGUqIGpvYikKIHsKICAgICBS ZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gam9iLT5nZXRJbnRlcm5hbCgpOwpAQCAtNzUzLDYg Kzc3MiwxNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRsZShS ZXNvdXJjZUhhbmRsZSogam9iKQogICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxl LCBDVVJMT1BUX0hUVFBIRUFERVIsIGhlYWRlcnMpOwogICAgICAgICBkLT5tX2N1c3RvbUhlYWRl cnMgPSBoZWFkZXJzOwogICAgIH0KKyAgICAvLyBjdXJsIENVUkxPUFRfVVNFUlBXRCBleHBlY3Rz IHVzZXJuYW1lOnBhc3N3b3JkCisgICAgaWYgKGQtPm1fdXNlci5sZW5ndGgoKSB8fCBkLT5tX3Bh c3MubGVuZ3RoKCkpIHsKKyAgICAgICAgU3RyaW5nIHVzZXJwYXNzID0gZC0+bV91c2VyICsgIjoi ICsgZC0+bV9wYXNzOworICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJM T1BUX1VTRVJQV0QsIHVzZXJwYXNzLnV0ZjgoKS5kYXRhKCkpOworICAgIH0KKworICAgIC8vIFNl dCBwcm94eSBvcHRpb25zIGlmIHdlIGhhdmUgdGhlbS4KKyAgICBpZiAobV9wcm94eS5sZW5ndGgo KSkgeworICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1faGFuZGxlLCBDVVJMT1BUX1BST1hZ LCBtX3Byb3h5LnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBjdXJsX2Vhc3lfc2V0b3B0KGQtPm1f aGFuZGxlLCBDVVJMT1BUX1BST1hZVFlQRSwgbV9wcm94eVR5cGUpOworICAgIH0KIH0KIAogdm9p ZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmNhbmNlbChSZXNvdXJjZUhhbmRsZSogam9iKQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5h Z2VyLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFn ZXIuaAppbmRleCA4OWIyN2Q3Li44NjRjNDAzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuaApAQCAtMjgsOCArMjgsOSBA QAogI2lmbmRlZiBSZXNvdXJjZUhhbmRsZU1hbmFnZXJfaAogI2RlZmluZSBSZXNvdXJjZUhhbmRs ZU1hbmFnZXJfaAogCi0jaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJDU3RyaW5nLmgiCisj aW5jbHVkZSAiRnJhbWUuaCIKKyNpbmNsdWRlICJTdHJpbmcuaCIKICNpbmNsdWRlICJUaW1lci5o IgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlQ2xpZW50LmgiCiAKQEAgLTQ1LDYgKzQ2LDEzIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyIHsKIHB1 YmxpYzoKKyAgICBlbnVtIFByb3h5VHlwZSB7CisgICAgICAgIEhUVFAgPSBDVVJMUFJPWFlfSFRU UCwKKyAgICAgICAgU29ja3M0ID0gQ1VSTFBST1hZX1NPQ0tTNCwKKyAgICAgICAgU29ja3M0QSA9 IENVUkxQUk9YWV9TT0NLUzRBLAorICAgICAgICBTb2NrczUgPSBDVVJMUFJPWFlfU09DS1M1LAor ICAgICAgICBTb2NrczVIb3N0bmFtZSA9IENVUkxQUk9YWV9TT0NLUzVfSE9TVE5BTUUKKyAgICB9 OwogICAgIHN0YXRpYyBSZXNvdXJjZUhhbmRsZU1hbmFnZXIqIHNoYXJlZEluc3RhbmNlKCk7CiAg ICAgdm9pZCBhZGQoUmVzb3VyY2VIYW5kbGUqKTsKICAgICB2b2lkIGNhbmNlbChSZXNvdXJjZUhh bmRsZSopOwpAQCAtNTUsNiArNjMsMTIgQEAgcHVibGljOgogICAgIHZvaWQgc2V0dXBQT1NUKFJl c291cmNlSGFuZGxlKiwgc3RydWN0IGN1cmxfc2xpc3QqKik7CiAgICAgdm9pZCBzZXR1cFBVVChS ZXNvdXJjZUhhbmRsZSosIHN0cnVjdCBjdXJsX3NsaXN0KiopOwogCisgICAgdm9pZCBzZXRQcm94 eUluZm8oY29uc3QgU3RyaW5nJiBob3N0ID0gIiIsCisgICAgICAgICAgICAgICAgICAgICAgdW5z aWduZWQgbG9uZyBwb3J0ID0gMCwKKyAgICAgICAgICAgICAgICAgICAgICBQcm94eVR5cGUgdHlw ZSA9IEhUVFAsCisgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiB1c2VybmFtZSA9 ICIiLAorICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFN0cmluZyYgcGFzc3dvcmQgPSAiIik7 CisKIHByaXZhdGU6CiAgICAgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyKCk7CiAgICAgflJlc291cmNl SGFuZGxlTWFuYWdlcigpOwpAQCAtNzQsNiArODgsOSBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxS ZXNvdXJjZUhhbmRsZSo+IG1fcmVzb3VyY2VIYW5kbGVMaXN0OwogICAgIGNvbnN0IENTdHJpbmcg bV9jZXJ0aWZpY2F0ZVBhdGg7CiAgICAgaW50IG1fcnVubmluZ0pvYnM7CisgICAgCisgICAgU3Ry aW5nIG1fcHJveHk7CisgICAgUHJveHlUeXBlIG1fcHJveHlUeXBlOwogfTsKIAogfQpkaWZmIC0t Z2l0IGEvV2ViS2l0L3d4L0NoYW5nZUxvZyBiL1dlYktpdC93eC9DaGFuZ2VMb2cKaW5kZXggNmFm NjhmYi4uMWMwNzU2NSAxMDA2NDQKLS0tIGEvV2ViS2l0L3d4L0NoYW5nZUxvZworKysgYi9XZWJL aXQvd3gvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMDktMDktMTMgIEtldmluIFdhdHRl cnMgIDxrZXZpbndhdHRlcnNAZ21haWwuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBzcGVjaWZ5IGEgcHJveHkg Zm9yIHd4V2ViS2l0LgorICAgICAgICAKKyAgICAgICAgPGJ1ZyBVUkwgaGVyZT4KKworICAgICAg ICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoY3VybFByb3h5VHlwZSk6CisgICAgICAgICh3eFdl YlZpZXc6OlNldFByb3h5SW5mbyk6CisgICAgICAgICogV2ViVmlldy5oOgorCisyMDA5LTA5LTEz ICBLZXZpbiBXYXR0ZXJzICA8a2V2aW53YXR0ZXJzQGdtYWlsLmNvbT4KKwogICAgICAgICBSZXZp ZXdlZCBieSBLZXZpbiBPbGxpdmllci4KIAogICAgICAgICBBbGxvdyBhIHdheSB0byBzZXQgdGhl IGNhY2hlIHBvbGljeSB2aWEgd3ggQVBJLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3d4L1dlYlZpZXcu Y3BwIGIvV2ViS2l0L3d4L1dlYlZpZXcuY3BwCmluZGV4IGM3YjVhODIuLmQ4ZDEzNWUgMTAwNjQ0 Ci0tLSBhL1dlYktpdC93eC9XZWJWaWV3LmNwcAorKysgYi9XZWJLaXQvd3gvV2ViVmlldy5jcHAK QEAgLTQ3LDYgKzQ3LDcgQEAKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNpbmNs dWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCisjaW5jbHVkZSAi UmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiU2Nyb2xsYmFyLmgiCiAjaW5jbHVk ZSAiU2VsZWN0aW9uQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC04ODUs MyArODg2LDI5IEBAIGJvb2wgd3hXZWJWaWV3OjpTaG91bGRDbG9zZSgpIGNvbnN0CiAKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KKworc3RhdGljIFdlYkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6 UHJveHlUeXBlIGN1cmxQcm94eVR5cGUod3hQcm94eVR5cGUgdHlwZSkKK3sKKyAgICBzd2l0Y2gg KHR5cGUpIHsKKyAgICAgICAgY2FzZSBIVFRQOiByZXR1cm4gV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVNYW5hZ2VyOjpIVFRQOworICAgICAgICBjYXNlIFNvY2tzNDogcmV0dXJuIFdlYkNvcmU6OlJl c291cmNlSGFuZGxlTWFuYWdlcjo6U29ja3M0OworICAgICAgICBjYXNlIFNvY2tzNEE6IHJldHVy biBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OlNvY2tzNEE7CisgICAgICAgIGNhc2Ug U29ja3M1OiByZXR1cm4gV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpTb2NrczU7Cisg ICAgICAgIGNhc2UgU29ja3M1SG9zdG5hbWU6IHJldHVybiBXZWJDb3JlOjpSZXNvdXJjZUhhbmRs ZU1hbmFnZXI6OlNvY2tzNUhvc3RuYW1lOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyOjpIVFRQOworICAgIH0KK30KKworLyogc3RhdGljICovCit2b2lkIHd4 V2ViVmlldzo6U2V0UHJveHlJbmZvKGNvbnN0IHd4U3RyaW5nJiBob3N0LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIHBvcnQsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHd4UHJveHlUeXBlIHR5cGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IHd4U3RyaW5nJiB1c2VybmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3Qgd3hTdHJpbmcmIHBhc3N3b3JkKQoreworICAgIHVzaW5nIFdlYkNvcmU6OlJlc291cmNl SGFuZGxlTWFuYWdlcjsKKyAgICBpZiAoUmVzb3VyY2VIYW5kbGVNYW5hZ2VyKiBtZ3IgPSBSZXNv dXJjZUhhbmRsZU1hbmFnZXI6OnNoYXJlZEluc3RhbmNlKCkpCisgICAgICAgIG1nci0+c2V0UHJv eHlJbmZvKGhvc3QsIHBvcnQsIGN1cmxQcm94eVR5cGUodHlwZSksIHVzZXJuYW1lLCBwYXNzd29y ZCk7Cit9CmRpZmYgLS1naXQgYS9XZWJLaXQvd3gvV2ViVmlldy5oIGIvV2ViS2l0L3d4L1dlYlZp ZXcuaAppbmRleCAwMTg5M2FjLi45YTNkNmNhIDEwMDY0NAotLS0gYS9XZWJLaXQvd3gvV2ViVmll dy5oCisrKyBiL1dlYktpdC93eC9XZWJWaWV3LmgKQEAgLTEwNCw2ICsxMDQsMTQgQEAgZW51bSB7 CiAgICAgV2ViS2l0RXJyb3JKYXZhVW5hdmFpbGFibGUgPSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgMjAyLAogfTsKIAorZW51bSB3eFByb3h5VHlwZSB7CisgICAgSFRUUCwKKyAgICBT b2NrczQsCisgICAgU29ja3M0QSwKKyAgICBTb2NrczUsCisgICAgU29ja3M1SG9zdG5hbWUKK307 CisKIGNsYXNzIFdYRExMSU1QRVhQX1dFQktJVCB3eFdlYlZpZXcgOiBwdWJsaWMgd3hXaW5kb3cK IHsKICAgICAvLyBDaHJvbWVDbGllbnRXeCBuZWVkcyB0byBnZXQgdGhlIFBhZ2UqIHN0b3JlZCBi eSB0aGUgd3hXZWJWaWV3CkBAIC0xOTMsNiArMjAxLDEyIEBAIHB1YmxpYzoKICAgICBzdGF0aWMg dm9pZCBTZXRDYWNoZVBvbGljeShjb25zdCB3eFdlYlZpZXdDYWNoZVBvbGljeSYgY2FjaGVQb2xp Y3kpOwogICAgIHN0YXRpYyB3eFdlYlZpZXdDYWNoZVBvbGljeSBHZXRDYWNoZVBvbGljeSgpOwog CisgICAgc3RhdGljIHZvaWQgU2V0UHJveHlJbmZvKGNvbnN0IHd4U3RyaW5nJiBob3N0ID0gd3hF bXB0eVN0cmluZywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBw b3J0ID0gMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd3hQcm94eVR5cGUgdHlwZSA9 IEhUVFAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHd4U3RyaW5nJiB1c2Vy bmFtZSA9IHd4RW1wdHlTdHJpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IHd4U3RyaW5nJiBwYXNzd29yZCA9IHd4RW1wdHlTdHJpbmcpOworCiBwcm90ZWN0ZWQ6CiAKICAg ICAvLyBldmVudCBoYW5kbGVycyAodGhlc2UgZnVuY3Rpb25zIHNob3VsZCBfbm90XyBiZSB2aXJ0 dWFsKQo=