# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137963772 0
# Node ID c1b2ba353e85e2096dcf970859729744c1fce635
# Parent  798ef873a7e99d4e742679b6223321946761aaf0
[gaim-migrate @ 15344]
SF Patch #1411771 from Tim Mooney

This fixes some cases where we should be using socklen_t as the variable type.

committer: Tailor Script <tailor@pidgin.im>

diff -r 798ef873a7e9 -r c1b2ba353e85 COPYRIGHT
--- a/COPYRIGHT	Sun Jan 22 19:52:17 2006 +0000
+++ b/COPYRIGHT	Sun Jan 22 21:02:52 2006 +0000
@@ -175,6 +175,7 @@
 Paul Miller
 Arkadiusz Miskiewicz
 Andrew Molloy
+Tim Mooney
 Sergio Moretto
 Christian Muise
 Richard Nelson
diff -r 798ef873a7e9 -r c1b2ba353e85 src/proxy.c
--- a/src/proxy.c	Sun Jan 22 19:52:17 2006 +0000
+++ b/src/proxy.c	Sun Jan 22 21:02:52 2006 +0000
@@ -923,7 +923,7 @@
 no_one_calls(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error=0, ret;
 
 	gaim_debug_info("proxy", "Connected.\n");
@@ -1018,7 +1018,7 @@
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 		gaim_debug_misc("proxy", "Connect didn't block.\n");
 		len = sizeof(error);
@@ -1205,7 +1205,7 @@
 	char request[8192];
 	int request_len = 0;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("http proxy", "Connected.\n");
@@ -1296,7 +1296,7 @@
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("http proxy",
@@ -1347,7 +1347,7 @@
 	unsigned char packet[12];
 	struct hostent *hp;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("socks4 proxy", "Connected.\n");
@@ -1430,7 +1430,7 @@
 			return -1;
 		}
 	} else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("socks4 proxy",
@@ -1778,7 +1778,7 @@
 	unsigned char buf[512];
 	int i;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	gaim_debug_info("socks5 proxy", "Connected.\n");
@@ -1854,7 +1854,7 @@
 		}
 	}
 	else {
-		unsigned int len;
+		socklen_t len;
 		int error = ETIMEDOUT;
 
 		gaim_debug_misc("socks5 proxy",