com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/filter/logical_filters.c
| From: | Adam Harvey | Date: | Tue, 03 Dec 2013 22:51:03 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/filter/logical_filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74231@lists.php.net to get a copy of this message | ||
Commit: 6f52f566f3d3a08418917baa6b659249a39c3f18
Author: Adam Harvey <aharvey@php.net> Tue, 3 Dec 2013 14:51:03 -0800
Parents: ffbb56685ff316e89161a80911b71039e4544184 d1314893fd1325ca6aa0831101896e31135a2658
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6f52f566f3d3a08418917baa6b659249a39c3f18
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Changed paths:
MM NEWS
MM ext/filter/logical_filters.c
Diff:
diff --cc NEWS
index 792aa27,c0379f8..88a7129
--- a/NEWS
+++ b/NEWS
@@@ -17,9 -15,9 +17,12 @@@ PH
. Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML()
Produces invalid Markup). (Mike)
+ - Filter:
+ . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam)
+
+- Sockets:
+ . Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined). (Felipe)
+
- XSL
. Fixed bug #49634 (Segfault throwing an exception in a XSL registered
function). (Mike)