diff options
author | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:43:10 -0200 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:43:10 -0200 |
commit | 9f1075bb29a2d27c67c2b74141e59bbfc259ae28 (patch) | |
tree | 525b9ee833a85428d6c8af2be652963b40c24a67 /sapi/phpdbg/phpdbg_utils.c | |
parent | 0525dce3c8f38847acf461fc7cd26a036a7a9ee5 (diff) | |
parent | 8e36d36ee6dc89701416c282ede0bcd92fd3aa0e (diff) | |
download | php-git-9f1075bb29a2d27c67c2b74141e59bbfc259ae28.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions