changeset 23920:62387da2a57f

merge of '3acf6d9387524fb3b59c35e5e1db2847387c37af' and '5d5313fdfd6fdadba37ba06101fff9174cb2e568'
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 27 Aug 2008 03:06:44 +0000
parents c241bc48c962 (current diff) 58e3b422e595 (diff)
children f368b91a542b 4a1bbe955690
files share/ca-certs/Microsoft_Internet_Authority.pem
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/util.c	Wed Aug 27 03:06:42 2008 +0000
+++ b/libpurple/util.c	Wed Aug 27 03:06:44 2008 +0000
@@ -3578,7 +3578,10 @@
 		g_snprintf(port_str, sizeof(port_str), "80");
 	}
 
-	if (f == 1)
+	if (f == 0)
+		*host = '\0';
+
+	if (f <= 1)
 		*path = '\0';
 
 	sscanf(port_str, "%d", &port);
@@ -3589,7 +3592,7 @@
 	if (ret_user != NULL) *ret_user = g_strdup(user);
 	if (ret_passwd != NULL) *ret_passwd = g_strdup(passwd);
 
-	return TRUE;
+	return ((*host != '\0') ? TRUE : FALSE);
 }
 
 /**