Stanislav Malyshev 5811610d71 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

2014-04-13 17:31:44 -07:00

..

fpm

add clear_env option to FPM config

2014-02-25 12:12:09 +04:00

config.m4

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06 11:06:09 -07:00

CREDITS

merge FPM SAPI from trunk (as agreed with Johannes)

2010-05-26 15:14:43 +00:00

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

merge FPM SAPI from trunk (as agreed with Johannes)

2010-05-26 15:14:43 +00:00

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

Merge branch 'PHP-5.4' into PHP-5.5

2014-04-13 17:31:44 -07: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