Ferenc Kovacs d810c2139f Merge branch 'PHP-5.5' into PHP-5.6 ...

* PHP-5.5:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"

2014-06-30 18:38:54 +02:00

..

fpm

Merge branch 'PHP-5.5' into PHP-5.6

2014-06-30 18:38:54 +02:00

tests

a few typofixes

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

config.m4

fix indentation

2014-01-17 12:49:21 +04: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-29 09:15:23 -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