From b10e25af87a374684d2b0079cc8a327365b49cf4 Mon Sep 17 00:00:00 2001 From: "nicolas.dufresne@gmail.com" Date: Thu, 5 Jul 2012 16:19:23 +0000 Subject: Don't use HTTP Connect for http:// scheme git-svn-id: http://libproxy.googlecode.com/svn/trunk@844 c587cffe-e639-0410-9787-d7902ae8ed56 --- libproxy/modules/config_gnome.cpp | 2 +- libproxy/modules/config_gnome3.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libproxy/modules/config_gnome.cpp b/libproxy/modules/config_gnome.cpp index 027e5e7..e6cda95 100644 --- a/libproxy/modules/config_gnome.cpp +++ b/libproxy/modules/config_gnome.cpp @@ -235,7 +235,7 @@ public: // In case nothing matched, try HTTP Connect and fallback to direct. // If there is not secure HTTP proxy, this will only add direct:// to // the response - if (response.size() == 0) { + if (response.size() == 0 && dest.get_scheme() != "http") { store_response("http", this->data[PROXY_SECURE_HOST], this->data[PROXY_SECURE_PORT], auth, username, password, response); response.push_back(url("direct://")); diff --git a/libproxy/modules/config_gnome3.cpp b/libproxy/modules/config_gnome3.cpp index 00c0146..bc77350 100644 --- a/libproxy/modules/config_gnome3.cpp +++ b/libproxy/modules/config_gnome3.cpp @@ -225,7 +225,7 @@ public: // In case nothing matched, try HTTP Connect and fallback to direct. // If there is not secure HTTP proxy, this will only add direct:// to // the response - if (response.size() == 0) { + if (response.size() == 0 && dest.get_scheme() != "http") { store_response("http", this->data[PROXY_SECURE_HOST], this->data[PROXY_SECURE_PORT], auth, username, password, response); response.push_back(url("direct://")); -- cgit v1.2.1