diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-01 11:43:27 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-09-01 11:43:27 -0700 |
| commit | 53d274beb0fc5716ccc41236ae6eb30c54d5eda5 (patch) | |
| tree | 08319510a99bda5d702d90d903eb0fbe2ecc0278 /ext/mysqlnd/php_mysqlnd.c | |
| parent | e2291e4b1a21aa7317b1a4653a8ae7d4836b5588 (diff) | |
| parent | 33d3acaae79845e8bd587b4d0799ef2dca07fdc3 (diff) | |
| download | php-git-53d274beb0fc5716ccc41236ae6eb30c54d5eda5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.5.29
* PHP-5.5:
Improve fix for #70172
Add CVE IDs asigned (post release) to PHP 5.4.43
Add CVE IDs asigned to #69085 (PHP 5.4.39)
Conflicts:
ext/pcre/php_pcre.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions