Mercurial > pidgin
changeset 12758:ef1a954512bc
[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>
| author | Thomas Butter <tbutter> |
|---|---|
| date | Sat, 07 Jan 2006 22:54:03 +0000 |
| parents | e2f1f49fad1a |
| children | 019d0e4d8d65 |
| files | src/proxy.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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); }