com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/ftp/tests/server.inc ext/standard/ftp_fopen_wrapper.c
| From: | Nikita Popov | Date: | Mon, 25 Mar 2019 16:45:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/ftp/tests/server.inc ext/standard/ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105333@lists.php.net to get a copy of this message | ||
Commit: e4d9d91462eb46249b7bed589603951a3a8cb6f9
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 25 Mar 2019 17:45:03 +0100
Parents: e97577edde49e1f6e86219091b343f80b3b92e65 ec2ecb7e12b96f8f95af2885d173a0d46c88e190
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4d9d91462eb46249b7bed589603951a3a8cb6f9
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM ext/ftp/tests/server.inc
MM ext/standard/ftp_fopen_wrapper.c
Diff:
diff --cc ext/ftp/tests/server.inc
index 5350106,6e360c6..3a1c537
--- a/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@@ -279,11 -286,16 +279,16 @@@ if ($pid)
file_put_contents(__DIR__.'/'.$m[1], $data, FILE_APPEND);
fputs($s, "226 Closing data Connection.\r\n");
fclose($fs);
- }
+ }
}elseif (preg_match("~^CWD ([A-Za-z./]+)\r\n$~", $buf, $m)) {
- change_dir($m[1]);
- fputs($s, "250 CWD command successful.\r\n");
+ if (isset($bug77680)) {
+ fputs($s, "550 Directory change to $m[1] failed: file does not exist\r\n");
+ var_dump($buf);
+ } else {
+ change_dir($m[1]);
+ fputs($s, "250 CWD command successful.\r\n");
+ }
} elseif (preg_match("~^NLST(?: ([A-Za-z./]+))?\r\n$~", $buf, $m)) {