com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/curl/config.m4
| From: | Joe Watkins | Date: | Tue, 25 Jul 2017 05:59:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS ext/curl/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98788@lists.php.net to get a copy of this message | ||
Commit: 4ddb0630c216481dbc25605421551ad676c8c4f0
Author: Joe Watkins <krakjoe@php.net> Tue, 25 Jul 2017 06:58:47 +0100
Parents: 8d5a5fbf6b2504cb1589d1fc9031f89c057ca871 238f837cbce468dd0b601bf0f0e54d6e7fb4b40b
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ddb0630c216481dbc25605421551ad676c8c4f0
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed finding CURL on systems with multiarch support
Changed paths:
MM NEWS
MM ext/curl/config.m4
Diff:
diff --cc NEWS
index ed0a13b,3e32ae0..d47196a
--- a/NEWS
+++ b/NEWS
@@@ -6,12 -6,11 +6,16 @@@ PH
. Fixed bug #74947 (Segfault in scanner on INF number). (Laruence)
. Fixed bug #74954 (null deref and segfault in zend_generator_resume()). (Bob)
+- CLI:
+ . Fixed bug #74979 (Interactive shell opening instead of script execution
+ with -f flag). (Anatol)
+
+ - cURL:
+ . Fixed bug #74125 (Fixed finding CURL on systems with multiarch support).
+ (cebe)
+
- Mbstring:
+ . Fixed bug #69267 (mb_strtolower fails on titlecase characters). (Nikita)
. Fixed bug #71606 (Segmentation fault mb_strcut with HTML-ENTITIES encoding).
(cmb)