com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Nikita Popov | Date: | Fri, 03 Oct 2014 19:42:28 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82079@lists.php.net to get a copy of this message | ||
Commit: 56da3638c445b506559febb50daa02a1403b3c44
Author: Nikita Popov <nikic@php.net> Fri, 3 Oct 2014 21:42:11 +0200
Parents: 8617f2fa8d6feeda4c87e1c0f8697101f03429f2 d67c05bb899f4db42dd568376112b9144de2b5f1
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56da3638c445b506559febb50daa02a1403b3c44
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 9df8ac2,8385d3e..4ae2e28
--- a/NEWS
+++ b/NEWS
@@@ -8,7 -16,6 +8,7 @@@ PH
. Fixed bug #67633 (A foreach on an array returned from a function not doing
copy-on-write).. (Nikita)
. Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
- . Fixed bug #68188 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
++ . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
- FPM:
. Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable