]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b14f318 247ec0d)
Merge branch 'PHP-5.5' into PHP-5.6
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:11:20 +0000 (13:11 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:11:20 +0000 (13:11 +0000)
commit2a1b60569fda7b9ca949f557c617d2555014e9fd
tree90045e96d16ca7504b1708970776cf9ad040d9fdtree | snapshot
parentb14f31872bd94d7c0d58048a4500dae868022324commit | diff
parent247ec0d81f1ebe16cafa082ba3ef73ca1f31831dcommit | diff
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
NEWS diff1 | diff2 | blob | history
Zend/Makefile.am diff1 | diff2 | blob | history
Zend/Zend.dsp diff1 | diff2 | blob | history
Zend/ZendTS.dsp diff1 | diff2 | blob | history
Zend/zend_language_scanner.c diff1 | diff2 | blob | history
Zend/zend_vm_gen.php diff1 | diff2 | blob | history
Zend/zend_vm_opcodes.h diff1 | diff2 | blob | history
configure.in diff1 | diff2 | blob | history
win32/build/config.w32 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.