Mercurial > pidgin.yaz
changeset 29243:4287ad77f137
*** Plucked rev a35d515dd2c8f385ed4563358fccee9108573018 (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
disapproval of revision '32e63a51dbb65b8b63d134bde098d40167574148'
This change has produced regressions when using HTTP/1.0, as the proxy closes the connection, which is treated as a connection failure. Closes #10880, #10856 for examples. Refs #2910.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 07 Jan 2010 23:42:35 +0000 |
| parents | d4814f2afaef |
| children | 50256289be74 |
| files | libpurple/proxy.c |
| diffstat | 1 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/proxy.c Thu Jan 07 23:42:06 2010 +0000 +++ b/libpurple/proxy.c Thu Jan 07 23:42:35 2010 +0000 @@ -1099,6 +1099,36 @@ connect_data->host, connect_data->port, connect_data->host, connect_data->port); + if (purple_proxy_info_get_username(connect_data->gpi) != NULL) + { + char *t1, *t2, *ntlm_type1; + char hostname[256]; + + ret = gethostname(hostname, sizeof(hostname)); + hostname[sizeof(hostname) - 1] = '\0'; + if (ret < 0 || hostname[0] == '\0') { + purple_debug_warning("proxy", "gethostname() failed -- is your hostname set?"); + strcpy(hostname, "localhost"); + } + + t1 = g_strdup_printf("%s:%s", + purple_proxy_info_get_username(connect_data->gpi), + purple_proxy_info_get_password(connect_data->gpi) ? + purple_proxy_info_get_password(connect_data->gpi) : ""); + t2 = purple_base64_encode((const guchar *)t1, strlen(t1)); + g_free(t1); + + ntlm_type1 = purple_ntlm_gen_type1(hostname, ""); + + g_string_append_printf(request, + "Proxy-Authorization: Basic %s\r\n" + "Proxy-Authorization: NTLM %s\r\n" + "Proxy-Connection: Keep-Alive\r\n", + t2, ntlm_type1); + g_free(ntlm_type1); + g_free(t2); + } + g_string_append(request, "\r\n"); connect_data->write_buf_len = request->len;