From af7828a20f085c6cd2b720b093ee08f299505257 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Hukkam=C3=A4ki?= Date: Fri, 19 Aug 2016 22:05:04 +0000 Subject: [PATCH] Test case for bug #72771 --- ext/ftp/tests/server.inc | 9 ++++++++- ext/standard/tests/streams/bug72771.phpt | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ext/standard/tests/streams/bug72771.phpt diff --git a/ext/ftp/tests/server.inc b/ext/ftp/tests/server.inc index 5629c2e312..1a04cd179b 100644 --- a/ext/ftp/tests/server.inc +++ b/ext/ftp/tests/server.inc @@ -139,7 +139,10 @@ if ($pid) { $buf = fread($s, 2048); } - if (!preg_match('/^USER (\w+)\r\n$/', $buf, $m)) { + if ($buf == "AUTH TLS\r\n") { + fputs($s, "500 not supported.\r\n"); + return ; + } else if (!preg_match('/^USER (\w+)\r\n$/', $buf, $m)) { fputs($s, "500 Syntax error, command unrecognized.\r\n"); dump_and_exit($buf); } @@ -208,6 +211,10 @@ if ($pid) { $ascii = true; fputs($s, "200 OK\r\n"); + } elseif ($buf === "AUTH SSL\r\n") { + $ascii = true; + fputs($s, "500 not supported\r\n"); + } elseif ($buf === "TYPE I\r\n") { $ascii = false; fputs($s, "200 OK\r\n"); diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt new file mode 100644 index 0000000000..b38ccbdda8 --- /dev/null +++ b/ext/standard/tests/streams/bug72771.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #72771. FTPS to FTP downgrade not allowed when server doesn't support AUTH TLS or AUTH SSL. +--SKIPIF-- + +--FILE-- + +==DONE== +--EXPECTF-- +Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d +bool(false) +==DONE== -- 2.40.0