pollita Fri Feb 20 16:05:37 2004 EDT
Modified files:
/php-src/ext/ftp ftp.c
Log:
s_addr is always unsigned 32bit, long is not.
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.98&r2=1.99&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.98 php-src/ext/ftp/ftp.c:1.99
--- php-src/ext/ftp/ftp.c:1.98 Tue Jan 13 13:58:23 2004
+++ php-src/ext/ftp/ftp.c Fri Feb 20 16:05:37 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.98 2004/01/13 18:58:23 sniper Exp $ */
+/* $Id: ftp.c,v 1.99 2004/02/20 21:05:37 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -775,7 +775,8 @@
}
sin = (struct sockaddr_in *) sa;
sin->sin_family = AF_INET;
- sin->sin_addr.s_addr = ipbox.l[0];
+ /* Deal with differing integer sizes */
+ memcpy(&(sin->sin_addr.s_addr), &(ipbox.c[0]), 4);
sin->sin_port = ipbox.s[2];
ftp->pasv = 2;
@@ -1480,7 +1481,7 @@
#endif
/* send the PORT */
- ipbox.l[0] = ((struct sockaddr_in*) sa)->sin_addr.s_addr;
+ memcpy(&(ipbox.c[0]), &(((struct sockaddr_in*) sa)->sin_addr.s_addr), 4);
ipbox.s[2] = ((struct sockaddr_in*) &addr)->sin_port;
sprintf(arg, "%u,%u,%u,%u,%u,%u", ipbox.c[0], ipbox.c[1], ipbox.c[2],
ipbox.c[3], ipbox.c[4], ipbox.c[5]);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
