com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/standard/file.c main/php_vari ables.c
main/streams/streams.c
| From: | Anatol Belski | Date: | Fri, 25 Apr 2014 23:26:55 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: ext/standard/file.c main/php_vari ables.c main/streams/streams.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77157@lists.php.net to get a copy of this message | ||
Commit: 2b6be486859faf1bf03fc6246f3d505c377623e9
Author: Anatol Belski <ab@php.net> Sat, 26 Apr 2014 01:26:55 +0200
Parents: f3e56c8c9eb3eb22cc9213cadf75fa7e7c5d0350 047a39c94670517239e9153bfa4680b3aebacaf3
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b6be486859faf1bf03fc6246f3d505c377623e9
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport: (168 commits)
some more after merge fixes
fixed macro names
removed /EHa as __try/__catch syntax is used anyway
fix ZEND_DEBUG usage
fixed test
updated NEWS
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data
update NEWS
update NEWS
add a test case previously broken by a bad fix
Revert "Fixed bug #64604"
updated libmagic.patch for 5.6+
updated libmagic.patch
backport this piece from 5.6, related to the #66307 fix
updated NEWS
Fixed bug #66307 Fileinfo crashes with powerpoint files
fix CFLAGS_PHPDBGS and some formatting
use a portable strndup implementation
fixed C89 compat
...
Bugs:
https://bugs.php.net/67118
https://bugs.php.net/64604
https://bugs.php.net/66307
Changed paths:
MM ext/standard/file.c
MM main/php_variables.c
MM main/streams/streams.c
Diff: