diff options
| author | Nikita Popov <nikic@php.net> | 2016-08-05 23:09:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-08-05 23:09:30 +0200 |
| commit | a2a2ea18feea8945be7a7f02f384f015fa47076a (patch) | |
| tree | 72a46086bcc5ff500ab8e03f235d5db8a1816e8d | |
| parent | 807e81937b290ddb71152196aae3bbaca9a53c7e (diff) | |
| parent | 65056e9d6c74adef89332080b5458fd4850fb3b7 (diff) | |
| download | php-git-a2a2ea18feea8945be7a7f02f384f015fa47076a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/ftp/tests/server.inc | 8 | ||||
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 23 |
3 files changed, 19 insertions, 16 deletions
@@ -12,6 +12,10 @@ PHP NEWS - Session: . Fixed bug #72724 (PHP7: session-uploadprogress kills httpd). (Nikita) +- Streams: + . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails + with IIS FTP 7.5, 8.5). (vhuk) + ?? ??? 2016 PHP 7.0.10 diff --git a/ext/ftp/tests/server.inc b/ext/ftp/tests/server.inc index e2a74029bf..5629c2e312 100644 --- a/ext/ftp/tests/server.inc +++ b/ext/ftp/tests/server.inc @@ -288,6 +288,10 @@ if ($pid) { } + if ((!empty($ssl)) && (!stream_socket_enable_crypto($pasvs, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER))) { + die("SSLv23 handshake failed.\n"); + } + if (empty($m[1]) || $m[1] !== 'emptydir') { fputs($fs, "file1\r\nfile1\r\nfile\nb0rk\r\n"); } @@ -403,10 +407,6 @@ if ($pid) { $pasvs = stream_socket_accept($soc,10); - if ((!empty($ssl)) && (!stream_socket_enable_crypto($pasvs, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER))) { - die("SSLv23 handshake failed.\n"); - } - }elseif (preg_match('/^EPSV/', $buf, $matches)) { fputs($s, "550 Extended passsive mode not supported.\r\n"); } elseif (preg_match('/^SITE EXEC/', $buf, $matches)) { diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 82875777a0..8d0f19c516 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -728,18 +728,6 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat goto opendir_errexit; } - php_stream_context_set(datastream, context); - if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, - STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || - php_stream_xport_crypto_enable(datastream, 1) < 0)) { - - php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); - php_stream_close(datastream); - datastream = NULL; - goto opendir_errexit; - } - - php_stream_printf(stream, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/")); result = GET_FTP_RESULT(stream); @@ -752,6 +740,17 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat goto opendir_errexit; } + php_stream_context_set(datastream, context); + if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, + STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || + php_stream_xport_crypto_enable(datastream, 1) < 0)) { + + php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); + php_stream_close(datastream); + datastream = NULL; + goto opendir_errexit; + } + php_url_free(resource); dirsdata = emalloc(sizeof *dirsdata); |