Mercurial > pidgin.yaz
diff libpurple/proxy.c @ 29129:ebb424b7e0a1
merge of '0bd5c5d235ae8c70b289e3b55a19523c4e28539e'
and '9ba62902a7be15503ccd0006cd59c73fecc6255c'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 03 Dec 2009 08:02:54 +0000 |
parents | 9750ec16f325 6846e88e76e3 |
children | 0257b8fe21d6 |
line wrap: on
line diff
--- a/libpurple/proxy.c Thu Dec 03 08:02:40 2009 +0000 +++ b/libpurple/proxy.c Thu Dec 03 08:02:54 2009 +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;