com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend_ast.c Zend/zend_vm_ def.h
Zend/zend_vm_execute.h ext/openssl/openssl. c ext/openssl/xp_ssl.c ext/session/session.c ext/sp l/spl_directory.c ext/spl/spl_iterators.c ext/stand
ard/array.c ext/standard/basic_functions.c
| From: | Anatol Belski | Date: | Mon, 04 Aug 2014 08:28:03 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend_ast.c Zend/zend_vm_ def.h Zend/zend_vm_execute.h ext/openssl/openssl. c ext/openssl/xp_ssl.c ext/session/session.c ext/sp l/spl_directory.c ext/spl/spl_iterators.c ext/stand ard/array.c ext/standard/basic_functions.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79718@lists.php.net to get a copy of this message | ||
Commit: 616275859e2b195e0ea8e90a26a0ed8801a80765
Author: Anatol Belski <ab@php.net> Mon, 4 Aug 2014 10:28:03 +0200
Parents: 5cadd9d6d08fa195f90746302b4d18ddebb79a12 38a4b934cac843146843e226470c2ed37033a985
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=616275859e2b195e0ea8e90a26a0ed8801a80765
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport: (51 commits)
backport the fix for bug #67739
fix macro
Fix bug #67705 (extensive backtracking in rule regular expression)
add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see
the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
...
Bugs:
https://bugs.php.net/67739
https://bugs.php.net/67705
https://bugs.php.net/51096
https://bugs.php.net/67715
https://bugs.php.net/67064
https://bugs.php.net/67693
Changed paths:
MM Zend/zend_ast.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
MM ext/session/session.c
MM ext/spl/spl_directory.c
MM ext/spl/spl_iterators.c
MM ext/standard/array.c
MM ext/standard/basic_functions.c
Diff: