com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS sapi/phpdbg/phpdbg.c
| From: | Joe Watkins | Date: | Mon, 17 Jul 2017 05:51:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS sapi/phpdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98576@lists.php.net to get a copy of this message | ||
Commit: 2e82ed9b7326cf8bf716efcdb600937b626a80b2
Author: Joe Watkins <krakjoe@php.net> Mon, 17 Jul 2017 06:51:26 +0100
Parents: 6cd140fdf8a276b27192288d4944f75aa7b81829 0db20a7cb1648420fbec2ea7895e4ac4bc68e634
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e82ed9b7326cf8bf716efcdb600937b626a80b2
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug 74913 redirecting incorrect include <sys/poll.h>
Bugs:
https://bugs..php.net/74913
Changed paths:
MM NEWS
MM sapi/phpdbg/phpdbg.c
Diff:
diff --cc NEWS
index 928f25f,19dc268..d0c0efa
--- a/NEWS
+++ b/NEWS
@@@ -9,7 -9,7 +9,8 @@@ PH
(jhdxr)
. Fixed bug #74761 (Unary operator expected error on some systems). (petk)
. Fixed bug #73900 (Use After Free in unserialize() SplFixedArray). (nikic)
+ . Fixed bug #74923 (Crash when crawling through network share). (Anatol)
+ . Fixed bug #74913 (fixed incorrect poll.h include). (petk)
- Date:
. Fixed bug #74852 (property_exists returns true on unknown DateInterval