com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS main/main.c
| From: | Stanislav Malyshev | Date: | Sun, 18 Aug 2013 21:21:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72978@lists.php.net to get a copy of this message | ||
Commit: bf0c6f2858226d787bb8c7abe9d24a391df53d7a
Author: Stanislav Malyshev <stas@php.net> Sun, 18 Aug 2013 14:20:38 -0700
Parents: 1794291ebe02d7a1c5387c1d404a9022925f5b47 0154db1c5fcfd0c4030a0aefb2861dc8386b4a1c
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf0c6f2858226d787bb8c7abe9d24a391df53d7a
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
new for fix #65225
Fixed #65225: PHP_BINARY incorrectly set
Bugs:
https://bugs.php.net/65225
Changed paths:
MM NEWS
MM main/main.c
Diff:
diff --cc NEWS
index 914b2a4,0d0a053..cc469dd
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,6 +1,13 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.4.19
+?? ??? 2013, PHP 5.5.3
+
+- Core:
++ . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
+ . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
+
++
+15 Aug 2013, PHP 5.5.2
- Core:
. Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference