diff options
author | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:42:58 -0200 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:42:58 -0200 |
commit | 8e36d36ee6dc89701416c282ede0bcd92fd3aa0e (patch) | |
tree | 04d6e92d133e965424cdff31178c1da076a9b1c3 /ext/mssql/php_mssql.c | |
parent | 7e3af096b3fb383826fc7d656ceb043590a56e70 (diff) | |
parent | a05611358606ca21672c49d26c77b7b0c81cab07 (diff) | |
download | php-git-8e36d36ee6dc89701416c282ede0bcd92fd3aa0e.tar.gz |
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
Diffstat (limited to 'ext/mssql/php_mssql.c')
0 files changed, 0 insertions, 0 deletions