diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-28 23:11:08 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-28 23:11:55 -0700 |
| commit | e55c641792df2caf813b5df3272144974e4d8fc7 (patch) | |
| tree | 177ae3952b0f1d5457961353ab57da4cb4712ccd /ext/mysqlnd/php_mysqlnd.c | |
| parent | b38ca3adeeee502d2fb1be9b8956c60a3d7c1f0e (diff) | |
| parent | b206b0e29d2cf9a41b94befedfefd806a71d0846 (diff) | |
| download | php-git-e55c641792df2caf813b5df3272144974e4d8fc7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions