pidgin.2.5.7: 6dc0f9eb: *** Plucked rev c1ede5faf776dc1cc966dabb...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 6dc0f9eb0933a3d9a1b8f958cbb0f84315a783c3
Ancestor: 2ce13aec38e3a91664d53ff050dc56c76ec6ff20
Author: rekkanoryo at pidgin.im
Date: 2009-06-19T01:30:45
Branch: im.pidgin.pidgin.2.5.7
URL: http://d.pidgin.im/viewmtn/revision/info/6dc0f9eb0933a3d9a1b8f958cbb0f84315a783c3

Modified files:
        libpurple/protocols/msn/soap.c libpurple/util.c

ChangeLog: 

*** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo at pidgin.im):
Only log requested HTTP URL's when PURPLE_UNSAFE_DEBUG is set and change MSN
to use PURPLE_UNSAFE_DEBUG instead of PURPLE_MSN_UNSAFE_DEBUG for consistency.
Not logging URL's will prevent potential password disclosure for the Yahoo
HTTP login method.


-------------- next part --------------
============================================================
--- libpurple/protocols/msn/soap.c	de2220906eddc184611e9cce54614b9c2fb06f8f
+++ libpurple/protocols/msn/soap.c	22d4fc644dbb90188fd2ad6e1dfce038f45a9e54
@@ -80,7 +80,7 @@ msn_soap_connection_new(MsnSession *sess
 	conn->session = session;
 	conn->host = g_strdup(host);
 	conn->queue = g_queue_new();
-	conn->unsafe_debug = g_getenv("PURPLE_MSN_UNSAFE_DEBUG") != NULL;
+	conn->unsafe_debug = g_getenv("PURPLE_UNSAFE_DEBUG") != NULL;
 	return conn;
 }
 
============================================================
--- libpurple/util.c	77cae668d7a9db7f0c0ad9cecbcc3c5346a2a30f
+++ libpurple/util.c	9324cdd3e0bfe185123ae55873ad7ad8d16756c5
@@ -3966,7 +3966,10 @@ url_fetch_send_cb(gpointer data, gint so
 		}
 	}
 
-	purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	if(g_getenv("PURPLE_UNSAFE_DEBUG"))
+		purple_debug_misc("util", "Request: '%s'\n", gfud->request);
+	else
+		purple_debug_misc("util", "request constructed\n");
 
 	total_len = strlen(gfud->request);
 
@@ -4069,9 +4072,12 @@ purple_util_fetch_url_request_len(const 
 	g_return_val_if_fail(url      != NULL, NULL);
 	g_return_val_if_fail(callback != NULL, NULL);
 
-	purple_debug_info("util",
-			 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
-			 url, full, user_agent?user_agent:"(null)", http11);
+	if(g_getenv("PURPLE_UNSAFE_DEBUG"))
+		purple_debug_info("util",
+				 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
+				 url, full, user_agent?user_agent:"(null)", http11);
+	else
+		purple_debug_info("util", "requesting to fetch a URL\n");
 
 	gfud = g_new0(PurpleUtilFetchUrlData, 1);