summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReeze Xia <reeze@php.net>2015-03-03 14:37:06 +0800
committerReeze Xia <reeze@php.net>2015-03-03 14:37:06 +0800
commitf353162ca2f33baf79cd77d7aa05693b03b121d8 (patch)
treed66366053ef6b16fe88dffa7f9c37ea102192a51
parent4e2c87edb34c4f151da6899d523c93b8e8565975 (diff)
parentbb466d57ae7a630526cc17f6259669f2be693aca (diff)
downloadphp-git-f353162ca2f33baf79cd77d7aa05693b03b121d8.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Update NEWS Fixed bug #67741 (auto_prepend_file messes up __LINE__) Check variable type before its usage as IS_ARRAY. Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). Conflicts: NEWS
-rw-r--r--NEWS9
1 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 79db18bb82..8c9cf74b12 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,15 @@
. Fixed bug #68557 (RecursiveDirectoryIterator::seek(0) broken after
calling getChildren()). (Julien)
+- CGI:
+ . Fixed bug #69015 (php-cgi's getopt does not see $argv). (Laruence)
+
+- CLI:
+ . Fixed bug #67741 (auto_prepend_file messes up __LINE__). (Reeze Xia)
+
+- FPM:
+ . Fixed bug #68822 (request time is reset too early). (honghu069 at 163 dot com)
+
19 Feb 2015, PHP 5.6.6
- Core: