Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c

2013-08-04 16:06:24 -07:00

..

fpm

HASH_KEY_NON_EXISTANT fix

2013-07-21 20:09:53 -07:00

config.m4

Merge branch 'PHP-5.4' into PHP-5.5

2013-05-21 09:53:51 +02: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

- Fixed bug #63085 (Systemd integration and daemonize)

2012-09-28 00:53:05 +02:00

php-fpm.conf.in

non living code related typo fixes

2013-08-04 16:05:36 -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