mirror of
https://github.com/php/php-src.git
synced 2024-09-23 02:47:26 +00:00
Merge branch 'PHP-7.0' into PHP-7.1
This commit is contained in:
commit
be31515cc6
2
NEWS
2
NEWS
@ -22,6 +22,8 @@ PHP NEWS
|
|||||||
(Loianhtuan)
|
(Loianhtuan)
|
||||||
. Implemented FR #27814 (Multiple small packets send for HTTP request).
|
. Implemented FR #27814 (Multiple small packets send for HTTP request).
|
||||||
(vhuk)
|
(vhuk)
|
||||||
|
. Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails
|
||||||
|
with IIS FTP 7.5, 8.5). (vhuk)
|
||||||
|
|
||||||
04 Aug 2016, PHP 7.1.0beta2
|
04 Aug 2016, PHP 7.1.0beta2
|
||||||
|
|
||||||
|
@ -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') {
|
if (empty($m[1]) || $m[1] !== 'emptydir') {
|
||||||
fputs($fs, "file1\r\nfile1\r\nfile\nb0rk\r\n");
|
fputs($fs, "file1\r\nfile1\r\nfile\nb0rk\r\n");
|
||||||
}
|
}
|
||||||
@ -403,10 +407,6 @@ if ($pid) {
|
|||||||
|
|
||||||
$pasvs = stream_socket_accept($soc,10);
|
$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)) {
|
}elseif (preg_match('/^EPSV/', $buf, $matches)) {
|
||||||
fputs($s, "550 Extended passsive mode not supported.\r\n");
|
fputs($s, "550 Extended passsive mode not supported.\r\n");
|
||||||
} elseif (preg_match('/^SITE EXEC/', $buf, $matches)) {
|
} elseif (preg_match('/^SITE EXEC/', $buf, $matches)) {
|
||||||
|
@ -728,18 +728,6 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat
|
|||||||
goto opendir_errexit;
|
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 : "/"));
|
php_stream_printf(stream, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/"));
|
||||||
|
|
||||||
result = GET_FTP_RESULT(stream);
|
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;
|
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);
|
php_url_free(resource);
|
||||||
|
|
||||||
dirsdata = emalloc(sizeof *dirsdata);
|
dirsdata = emalloc(sizeof *dirsdata);
|
||||||
|
Loading…
Reference in New Issue
Block a user