Ilia Alshanetsky 5709f7dd5b Merge branch '53' into 54 ...

* 53:
  Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).

2012-03-19 13:10:53 -04:00

..

fpm

Merge branch '53' into 54

2012-03-19 13:10:53 -04:00

config.m4

- remove experimental flag on fpm

2011-11-15 22:40:10 +00:00

CREDITS

merge FPM SAPI from trunk (as agreed with Johannes)

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

init.d.php-fpm.in

its force-quit, not -exit (yawk)

2011-04-23 21:12:25 +00: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

- extend the 'i-t' fpm argument to dump configuration file when called twice (-tt)

2010-11-14 22:22:07 +00:00

php-fpm.conf.in

Yup, these need to be escaped. Good catch.

2012-02-21 00:01:19 +00:00

status.html.in

- fix r317913

2011-10-08 20:43:12 +00:00