pollita Fri Feb 20 16:09:09 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ftp ftp.c
/php-src NEWS
Log:
MFH: long is not always 32-bit
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.12&r2=1.68.2.13&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.12 php-src/ext/ftp/ftp.c:1.68.2.13
--- php-src/ext/ftp/ftp.c:1.68.2.12 Tue Jan 13 13:59:08 2004
+++ php-src/ext/ftp/ftp.c Fri Feb 20 16:09:07 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.68.2.12 2004/01/13 18:59:08 sniper Exp $ */
+/* $Id: ftp.c,v 1.68.2.13 2004/02/20 21:09:07 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -638,7 +638,7 @@
sin = (struct sockaddr_in *) sa;
sin->sin_family = AF_INET;
- sin->sin_addr.s_addr = ipbox.l[0];
+ memcpy(&(sin->sin_addr.s_addr), &(ipbox.c[0]), 4);
sin->sin_port = ipbox.s[2];
ftp->pasv = 2;
@@ -1328,7 +1328,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],
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.571&r2=1.1247.2.572&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.571 php-src/NEWS:1.1247.2.572
--- php-src/NEWS:1.1247.2.571 Wed Feb 18 14:49:15 2004
+++ php-src/NEWS Fri Feb 20 16:09:08 2004
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Feb 2004, Version 4.3.5
+- Fixed bug #27328 (ftp extension relies on 32-bit longs). (Sara)
- Fixed bug #27295 (memory leak inside sscanf()). (Ilia)
- Fixed bug #27293 (two crashes inside image2wbmp()). (Ilia)
- Fixed bug #27278 (*printf() functions treat arguments as if passed by
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
