Mercurial > pidgin

comparison libpurple/proxy.c @ 25843:9bdd3ab8087f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 4cc0bbe98be861a279e3b1fd97a3b4d491dec519) to branch 'im.pidgin.pidgin.next.minor' (head 0bc630b4c58beab06485f17e1633164d548ca68a)
author Richard Laager <rlaager@wiktel.com>
date Thu, 27 Nov 2008 06:57:15 +0000
parents f3103f786c86
children 95ef7beb926b 9bc0c3274c3c
comparison
equal deleted inserted replaced
25842:244863136504 25843:9bdd3ab8087f
942 942
943 g_free(response); 943 g_free(response);
944 944
945 } else if((header = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic"))) { 945 } else if((header = g_strrstr((const char *)connect_data->read_buffer, "Proxy-Authenticate: Basic"))) {
946 gchar *t1, *t2; 946 gchar *t1, *t2;
947 const char *username, *password;
948
949 username = purple_proxy_info_get_username(connect_data->gpi);
950 password = purple_proxy_info_get_password(connect_data->gpi);
947 951
948 t1 = g_strdup_printf("%s:%s", 952 t1 = g_strdup_printf("%s:%s",
949 purple_proxy_info_get_username(connect_data->gpi), 953 username ? username : "",
950 purple_proxy_info_get_password(connect_data->gpi) ? 954 password ? password : "");
951 purple_proxy_info_get_password(connect_data->gpi) : ""); 955 t2 = purple_base64_encode((guchar *)t1, strlen(t1));
952 t2 = purple_base64_encode((const guchar *)t1, strlen(t1));
953 g_free(t1); 956 g_free(t1);
954 957
955 request = g_strdup_printf( 958 request = g_strdup_printf(
956 "CONNECT %s:%d HTTP/1.1\r\n" 959 "CONNECT %s:%d HTTP/1.1\r\n"
957 "Host: %s:%d\r\n" 960 "Host: %s:%d\r\n"