/cpw/tomkiewicz/http: c5c9135ffafa: Tunelled http proxy is not a...

[Tomasz Wasilczyk]

Changeset: c5c9135ffafabb8b35f300431d35ff4bd6ff9416
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-10-17 13:54 +0200
Branch:	 default
URL: http://hg.pidgin.im/cpw/tomkiewicz/http/rev/c5c9135ffafa

Description:

Tunelled http proxy is not a http proxy

diffstat:

 libpurple/http.c |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -391,6 +391,9 @@ static void _purple_http_gen_headers(Pur
 
 	proxy_http = (purple_proxy_info_get_type(proxy) == PURPLE_PROXY_HTTP ||
 		purple_proxy_info_get_type(proxy) == PURPLE_PROXY_USE_ENVVAR);
+	/* this is HTTP proxy, but used with tunelling with CONNECT */
+	if (proxy_http && url->port != 80)
+		proxy_http = FALSE;
 
 	hc->request_header = h = g_string_new("");
 	hc->request_header_written = 0;