]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:42:58 +0000 (09:42 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 22 Dec 2013 11:42:58 +0000 (09:42 -0200)
commit8e36d36ee6dc89701416c282ede0bcd92fd3aa0e
tree04d6e92d133e965424cdff31178c1da076a9b1c3
parent7e3af096b3fb383826fc7d656ceb043590a56e70
parenta05611358606ca21672c49d26c77b7b0c81cab07
Merge branch 'PHP-5.4' into PHP-5.5

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