Florian MARGAINE 8eb7e7bf7f Merge branch 'master' into issue-67910 ...

Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt

2014-09-20 10:09:21 +02:00

..

fpm

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

tests

a few typofixes

2014-02-14 17:16:17 +02:00

config.m4

Merge branch 'PHP-5.5' into PHP-5.6

2014-07-25 10:52:41 +08:00

CREDITS

…

init.d.php-fpm.in

Fix bug #64764: Add status option to fpm init.d script

2013-06-16 16:54:49 -07:00

LICENSE

…

Makefile.frag

- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)

2011-10-08 21:04:10 +00:00

php-fpm.8.in

Use minus sign instead of hyphen

2013-10-19 23:52:43 +03:00

php-fpm.conf.in

Replaces php5 with php7, without whitespace changes.

2014-09-20 10:01:44 +02: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