Dmitry Stogov cd4b4dfc4d Merge branch 'master' into refactoring2 ...

Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c

2014-05-05 13:02:43 +04:00

..

fpm

Merge branch 'master' into refactoring2

2014-05-05 13:02:43 +04: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

…

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

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