Mercurial > pidgin
comparison src/proxy.c @ 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 | bfd3aca4647a |
| children | 29594d4ccbb1 |
comparison
equal
deleted
inserted
replaced
| 12757:e2f1f49fad1a | 12758:ef1a954512bc |
|---|---|
| 1229 g_free(t1); | 1229 g_free(t1); |
| 1230 g_return_if_fail(request_len < sizeof(request)); | 1230 g_return_if_fail(request_len < sizeof(request)); |
| 1231 | 1231 |
| 1232 request_len += g_snprintf(request + request_len, | 1232 request_len += g_snprintf(request + request_len, |
| 1233 sizeof(request) - request_len, | 1233 sizeof(request) - request_len, |
| 1234 "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); | 1234 "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),"")); |
| 1235 g_free(t2); | 1235 g_free(t2); |
| 1236 } | 1236 } |
| 1237 | 1237 |
| 1238 g_return_if_fail(request_len < sizeof(request)); | 1238 g_return_if_fail(request_len < sizeof(request)); |
| 1239 strcpy(request + request_len, "\r\n"); | 1239 strcpy(request + request_len, "\r\n"); |
