From: Nikita Popov Date: Mon, 25 Mar 2019 16:45:03 +0000 (+0100) Subject: Merge branch 'PHP-7.2' into PHP-7.3 X-Git-Tag: php-7.3.5RC1~52 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4d9d91462eb46249b7bed589603951a3a8cb6f9;p=php Merge branch 'PHP-7.2' into PHP-7.3 --- e4d9d91462eb46249b7bed589603951a3a8cb6f9 diff --cc ext/ftp/tests/server.inc index 53501060a5,6e360c67e5..3a1c537d1a --- 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)) {