iliaa Thu, 04 Mar 2010 12:52:58 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=295820
Log: Fixed bug #51190 (ftp_put() returns false when transfer was successful). Bug: http://bugs.php.net/51190 (Open) ftp_put() returns false when transfer was successful Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 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/trunk/ext/ftp/ftp.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-03-04 11:23:55 UTC (rev 295819) +++ php/php-src/branches/PHP_5_2/NEWS 2010-03-04 12:52:58 UTC (rev 295820) @@ -5,6 +5,8 @@ - Fixed bug #51192 (FILTER_VALIDATE_URL will invalidate a hostname that includes '-'). (Adam, solar at azrael dot ws). +- Fixed bug #51190 (ftp_put() returns false when transfer was successful). + (Ilia) - Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when an invalid option is provided). (Ilia) - Fixed bug #43314 (iconv_mime_encode(), broken Q scheme). (Rasmus) Modified: php/php-src/branches/PHP_5_2/ext/ftp/ftp.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2010-03-04 11:23:55 UTC (rev 295819) +++ php/php-src/branches/PHP_5_2/ext/ftp/ftp.c 2010-03-04 12:52:58 UTC (rev 295820) @@ -948,7 +948,7 @@ } ftp->data = data = data_close(ftp, data); - if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250)) { + if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250 && ftp->resp != 200)) { goto bail; } return 1; Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-03-04 11:23:55 UTC (rev 295819) +++ php/php-src/branches/PHP_5_3/NEWS 2010-03-04 12:52:58 UTC (rev 295820) @@ -6,6 +6,8 @@ - Added stream filter support to mcrypt extension (ported from mcrypt_filter). (Stas) +- Fixed bug #51190 (ftp_put() returns false when transfer was successful). + (Ilia) - Fixed bug #51176 (Static calling in non-static method behaves like $this->). (Felipe) - Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when Modified: php/php-src/branches/PHP_5_3/ext/ftp/ftp.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2010-03-04 11:23:55 UTC (rev 295819) +++ php/php-src/branches/PHP_5_3/ext/ftp/ftp.c 2010-03-04 12:52:58 UTC (rev 295820) @@ -948,7 +948,7 @@ } ftp->data = data = data_close(ftp, data); - if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250)) { + if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250 && ftp->resp != 200)) { goto bail; } return 1; Modified: php/php-src/trunk/ext/ftp/ftp.c =================================================================== --- php/php-src/trunk/ext/ftp/ftp.c 2010-03-04 11:23:55 UTC (rev 295819) +++ php/php-src/trunk/ext/ftp/ftp.c 2010-03-04 12:52:58 UTC (rev 295820) @@ -949,7 +949,7 @@ } ftp->data = data = data_close(ftp, data); - if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250)) { + if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250 && ftp->resp != 200)) { goto bail; } return 1;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
