com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/ftp_fopen_wrapper.c
| From: | Nikita Popov | Date: | Sat, 23 Jul 2016 11:29:57 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93337@lists.php.net to get a copy of this message | ||
Commit: f12fd5c2d323ad4f76bea50fc2adecc3db0cae59
Author: Nikita Popov <nikic@php.net> Sat, 23 Jul 2016 13:29:57 +0200
Parents: 7d772897177eea2889be81d0f1b9a190b66a5c18 65abdb556ddf67068951020b8829c0817697a84e
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f12fd5c2d323ad4f76bea50fc2adecc3db0cae59
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Changed paths:
MM NEWS
MM ext/standard/ftp_fopen_wrapper.c
Diff:
diff --cc NEWS
index 11cb12e,f264bed..bc7b3d9
--- a/NEWS
+++ b/NEWS
@@@ -81,37 -48,39 +81,41 @@@ PH
. Fixed bug #72330 (CSV fields incorrectly split if escape char followed by
UTF chars). (cmb)
+ - Streams:
+ . Fixed bug #41021 (Problems with the ftps wrapper). (vhuk)
+ . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk)
+
-- SPL:
- . Fixed bug #72122 (IteratorIterator breaks '@' error suppression). (kinglozzer)
- . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape
- character). (cmb)
+- XMLRPC:
+ . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing
+ array elements). (Laruence)
+
+- Wddx:
+ . Fixed bug #72564 (boolean always deserialized as "true") (Remi)
-21 Jul 2016, PHP 5.6.24
+21 Jul 2016 PHP 7.0.9
- Core:
- . Fixed bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA).
- (mike dot laspina at gmail dot com, Remi)
- . Fixed bug #72496 (Cannot declare public method with signature incompatible
- with parent private method). (Pedro Magalhães)
- . Fixed bug #72138 (Integer Overflow in Length of String-typed ZVAL).. (Stas)
+ . Fixed bug #72508 (strange references after recursive function call and
+ "switch" statement). (Laruence)
. Fixed bug #72513 (Stack-based buffer overflow vulnerability in
- virtual_file_ex). (loianhtuan at gmail dot com)
- . Fixed bug #72562 (Use After Free in unserialize() with Unexpected Session
- Deserialization). (taoguangchen at icloud dot com)
- . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries and
- applications). (CVE-2016-5385) (Stas)
+ virtual_file_ex). (Stas)
+ . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries
+ and applications). (Stas)
- bz2:
- . Fixed bug #72447 (Type Confusion in php_bz2_filter_create()). (gogil at
- stealien dot com).
. Fixed bug #72613 (Inadequate error handling in bzread()). (Stas)
-- EXIF:
- . Fixed bug #50845 (exif_read_data() returns corrupted exif headers).
- (Bartosz Dziewoński)
-- EXIF:
+- CLI:
+ . Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify
+ router.php). (Laruence)
+
+- COM:
+ . Fixed bug #72498 (variant_date_from_timestamp null dereference). (Anatol)
+
+- Curl:
+ . Fixed bug #72541 (size_t overflow lead to heap corruption). (Stas)
+
+- Exif:
. Fixed bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE).
(Stas)
. Fixed bug #72618 (NULL Pointer Dereference in exif_process_user_comment).
diff --cc ext/standard/ftp_fopen_wrapper.c
index e59c04f,0260ca1..cca67c8
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@@ -732,16 -741,16 +732,16 @@@ php_stream * php_stream_ftp_opendir(php
*/
php_stream_close(datastream);
datastream = NULL;
- goto opendir_errexit;
+ goto opendir_errexit;
}
-
+
php_stream_context_set(datastream, context);
- if (use_ssl_on_data && (php_stream_xport_crypto_setup(stream,
+ if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream,
- STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 ||
- php_stream_xport_crypto_enable(datastream, 1 TSRMLS_CC) < 0)) {
+ STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 ||
- php_stream_xport_crypto_enable(stream, 1) < 0)) {
++ php_stream_xport_crypto_enable(datastream, 1) < 0)) {
- php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL
mode");
+ php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode");
php_stream_close(datastream);
datastream = NULL;
goto opendir_errexit;