rasmus Tue, 01 Nov 2011 15:15:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=318649
Log: Fix bug 60183 Bug: https://bugs.php.net/60183 (Open) Bug resulting in out of sync ftp responses Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/ftp/ftp.c U php/php-src/branches/PHP_5_4/ext/ftp/ftp.c U php/php-src/trunk/ext/ftp/ftp.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-11-01 14:42:01 UTC (rev 318648) +++ php/php-src/branches/PHP_5_3/NEWS 2011-11-01 15:15:51 UTC (rev 318649) @@ -131,7 +131,10 @@ - Fileinfo: . Fixed bug #60094 (C++ comment fails in c89). (Laruence) +- FTP: + . Fixed bug #60183 (out of sync ftp responses). (bram at ebskamp dot me, rasmus) + 23 Aug 2011, PHP 5.3.8 - Core: Modified: php/php-src/branches/PHP_5_3/ext/ftp/ftp.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2011-11-01 14:42:01 UTC (rev 318648) +++ php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2011-11-01 15:15:51 UTC (rev 318649) @@ -1122,6 +1122,9 @@ data = ftp->outbuf; + /* Clear the extra-lines buffer */ + ftp->extra = NULL; + if (my_send(ftp, ftp->fd, data, size) != size) { return 0; } Modified: php/php-src/branches/PHP_5_4/ext/ftp/ftp.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/ftp/ftp.c 2011-11-01 14:42:01 UTC (rev 318648) +++ php/php-src/branches/PHP_5_4/ext/ftp/ftp.c 2011-11-01 15:15:51 UTC (rev 318649) @@ -1122,6 +1122,9 @@ data = ftp->outbuf; + /* Clear the extra-lines buffer */ + ftp->extra = NULL; + if (my_send(ftp, ftp->fd, data, size) != size) { return 0; } Modified: php/php-src/trunk/ext/ftp/ftp.c =================================================================== --- php/php-src/trunk/ext/ftp/ftp.c 2011-11-01 14:42:01 UTC (rev 318648) +++ php/php-src/trunk/ext/ftp/ftp.c 2011-11-01 15:15:51 UTC (rev 318649) @@ -1122,6 +1122,9 @@ data = ftp->outbuf; + /* Clear the extra-lines buffer */ + ftp->extra = NULL; + if (my_send(ftp, ftp->fd, data, size) != size) { return 0; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
