# HG changeset patch
# User Thomas Butter <tbutter>
# Date 1136674443 0
# Node ID ef1a954512bc80deaa2f09a6cfc00d2a886e8803
# Parent  e2f1f49fad1a4ce73238720c3dd010d276f98dde
[gaim-migrate @ 15105]
If NTLM and Basic auth is configured in squid with different passwords
the order of the headers seems to matter and only NTLM is checked.

Now first Basic is checked and then NTLM in the next request (or NTLM in
the first if no Basic auth is configured in squid).

Should fix bug #1384428

committer: Tailor Script <tailor@pidgin.im>

diff -r e2f1f49fad1a -r ef1a954512bc src/proxy.c
--- a/src/proxy.c	Sat Jan 07 22:19:43 2006 +0000
+++ b/src/proxy.c	Sat Jan 07 22:54:03 2006 +0000
@@ -1231,7 +1231,7 @@
 		
 		request_len += g_snprintf(request + request_len,
 					  sizeof(request) - request_len,
-					  "Proxy-Authorization: NTLM %s\r\nProxy-Authorization: Basic %s\r\nProxy-Connection: Keep-Alive\r\n", gaim_ntlm_gen_type1((gchar*)gaim_proxy_info_get_host(phb->gpi),""), t2);
+					  "Proxy-Authorization: Basic %s\r\nProxy-Authorization: NTLM %s\r\nProxy-Connection: Keep-Alive\r\n", t2, gaim_ntlm_gen_type1((gchar*)gaim_proxy_info_get_host(phb->gpi),""));
 		g_free(t2);
 	}