summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-03-03 10:20:21 +0300
committerDmitry Stogov <dmitry@zend.com>2015-03-03 10:20:21 +0300
commit5c03e05692c8c9f258cc6424d41210f392bf3635 (patch)
tree4d416184602e3fee3b4fd7fe9f89dca29be7913d
parent035d80523f3ec1c5f1c071a7b2e71cbe3ef43461 (diff)
parentbb466d57ae7a630526cc17f6259669f2be693aca (diff)
downloadphp-git-5c03e05692c8c9f258cc6424d41210f392bf3635.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: Update NEWS
-rw-r--r--NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index da1fa62ce9..5eec926c32 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,9 @@ PHP NEWS
- 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)