com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/ftp/ftp.c
| From: | Nikita Popov | Date: | Sat, 13 Aug 2016 19:42:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/ftp/ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93770@lists.php.net to get a copy of this message | ||
Commit: 6ab9b531bc12ba3e746be6615f4edcc1cc387e61
Author: Nikita Popov <nikic@php.net> Sat, 13 Aug 2016 21:42:17 +0200
Parents: a927056cadd15e79476f5c7423975a66133b35f3 98787d90020c7b21c1dd5d1701e6157993d02aec
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ab9b531bc12ba3e746be6615f4edcc1cc387e61
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/ftp/ftp.c
Diff:
diff --cc NEWS
index 39cc57c,3582cce..f7b3c43
--- a/NEWS
+++ b/NEWS
@@@ -6,15 -6,13 +6,19 @@@ PH
.. Fixed bug #72813 (Segfault with __get returned by ref). (Laruence)
.. Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator).
(Nikita)
+ . TypeError messages for arg_info type checks will now say "must be ...
+ or null" where the parameter or return type accepts null. (Andrea)
+
+- EXIF:
+ . Fixed bug #72735 (Samsung picture thumb not read (zero size)). (Kalle, Remi)
+ - FTP:
+ . Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with
+ require_ssl_reuse). (Benedict Singer)
+
-- GD:
- . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
+- mbstring:
+ . Fixed bug #72711 (
mb_ereg does not clear the $regs parameter on
+ failure). (ju1ius)
- OCI8
. Fixed invalid handle error with Implicit Result Sets. (Chris Jones)