]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:29 +0000 (09:43 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:43:29 +0000 (09:43 -0200)
commite700cbff22bac6df9585edef7fa6fd70abc69f76
tree82809732c8dbc7675bd0e30b0c4f96d0f67f2308
parent2bf271bbb02dda150c74f7731c29571a87adea97
parent9f1075bb29a2d27c67c2b74141e59bbfc259ae28
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com