]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 25 Mar 2019 16:45:03 +0000 (17:45 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 25 Mar 2019 16:45:03 +0000 (17:45 +0100)
1  2 
ext/ftp/tests/server.inc
ext/standard/ftp_fopen_wrapper.c

index 53501060a5d2a9d5e40f8bfdb8b29dfe620c17d0,6e360c67e5a1cbb9a6c940c17232c0a5d00c188d..3a1c537d1ad242fb39c185b7991702f2227533b4
@@@ -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)) {
  
Simple merge