com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_language_scanner. c
Zend/zend_vm_gen.php Zend/zend_vm_opcodes.h configure.in win32/build/config.w32
| From: | Joe Watkins | Date: | Sun, 22 Dec 2013 13:11:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS Zend/Makefile.am Zend/Zend.dsp Zend/ZendTS.dsp Zend/zend_language_scanner. c Zend/zend_vm_gen.php Zend/zend_vm_opcodes.h configure.in win32/build/config.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75397@lists.php.net to get a copy of this message | ||
Commit: 2a1b60569fda7b9ca949f557c617d2555014e9fd
Author: krakjoe <joe.watkins@live.co.uk> Sun, 22 Dec 2013 13:11:20 +0000
Parents: b14f31872bd94d7c0d58048a4500dae868022324 247ec0d81f1ebe16cafa082ba3ef73ca1f31831d
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a1b60569fda7b9ca949f557c617d2555014e9fd
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at
orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
Bugs:
https://bugs.php.net/66311
Changed paths:
MM NEWS
MM Zend/Makefile.am
MM Zend/Zend.dsp
MM Zend/ZendTS.dsp
MM Zend/zend_language_scanner..c
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.h
MM configure.in
MM win32/build/config.w32
Diff: <Diff exceeded maximum size>