diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-28 23:12:41 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-28 23:12:41 -0700 |
| commit | 08c63e2a56a1193a0761921a90c70e8a06d81a46 (patch) | |
| tree | 7d5499a54099f39fb5d03addd54c6a27d44c9df3 /main/php_network.h | |
| parent | a8b97086d7c5bd5df5243d11bb8b5e9406a2b6c2 (diff) | |
| parent | e55c641792df2caf813b5df3272144974e4d8fc7 (diff) | |
| download | php-git-08c63e2a56a1193a0761921a90c70e8a06d81a46.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Diffstat (limited to 'main/php_network.h')
0 files changed, 0 insertions, 0 deletions