Lior Kaplan fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 ...

* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393

2016-02-08 20:29:24 +02:00

..

fpm

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-29 10:24:15 +01:00

tests

Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms)

2015-11-02 16:43:28 +08:00

config.m4

Merge branch 'PHP-5.6' into PHP-7.0

2015-11-23 18:56:13 +02:00

CREDITS

…

init.d.php-fpm.in

Add configtest option to fpm init.d script

2015-03-08 22:48:29 +08:00

LICENSE

…

Makefile.frag

Merge branch 'PHP-5.6' into PHP-7.0

2016-02-08 20:29:24 +02:00

php-fpm.8.in

Happy new year (Update copyright to 2016)

2016-01-03 01:44:37 +02:00

php-fpm.conf.in

split fpm config to two parts. PR#903

2014-12-14 14:21:46 +01:00

php-fpm.service.in

Add --with-fpm-systemd option to report health to systemd, and

2013-05-21 09:49:00 +02:00

status.html.in

- fix r317913

2011-10-08 20:43:12 +00:00

www.conf.in

Update www.conf.in

2015-05-12 13:52:49 +02:00