com php-src: Merge branch 'master' into phpng: ext/date/php_d ate.c
| From: | Dmitry Stogov | Date: | Thu, 05 Jun 2014 16:54:50 +0000 |
| Subject: | com php-src: Merge branch 'master' into phpng: ext/date/php_d ate.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78711@lists.php.net to get a copy of this message | ||
Commit: 717839735f92489227144fc6ae9ef1b4f637816a
Author: Dmitry Stogov <dmitry@zend.com> Thu, 5 Jun 2014 20:54:50 +0400
Parents: 1b8916886b5b3b88ebe016ea311951b21db93ddd e16097626a7e86e0baa9fa7d17477b6ffc13c706
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=717839735f92489227144fc6ae9ef1b4f637816a
Log:
Merge branch 'master' into phpng
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
Bugs:
https://bugs.php.net/67118
https://bugs.php.net/87
Changed paths:
MM ext/date/php_date.c
Diff: