summaryrefslogtreecommitdiff
path: root/ext/odbc/php_odbc_includes.h
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-04-05 00:36:57 -0700
committerStanislav Malyshev <stas@php.net>2015-04-05 00:45:58 -0700
commitd19842f613f7e63c41d35c0f2a0ba0c3513edb62 (patch)
tree3e71d7b92ce011b41ce705fb487175b19f5c048c /ext/odbc/php_odbc_includes.h
parent8751e0fe719f90863354917dcd493f3a4b18ab02 (diff)
parentcb0d325066486efafde8d9c324e083ac3d10a174 (diff)
downloadphp-git-d19842f613f7e63c41d35c0f2a0ba0c3513edb62.tar.gz
Merge branch 'PHP-5.4.40' into PHP-5.5-security
* PHP-5.4.40: Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
Diffstat (limited to 'ext/odbc/php_odbc_includes.h')
0 files changed, 0 insertions, 0 deletions