Remi Collet d42ae32738 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67

2013-05-02 09:38:38 +02:00

..

fpm

Merge branch 'PHP-5.3' into PHP-5.4

2013-05-02 09:38:12 +02:00

config.m4

Merge branch 'fuckgit' into PHP-5.4

2012-09-28 01:19:01 +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

Fixed bug #62216

2012-09-28 11:18:08 +02: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

- Fixed bug #62160 (Add process.priority to set nice(2) priorities)

2012-05-26 18:24:08 +02:00

php-fpm.service.in

Add missed file

2012-10-24 10:34:44 +08:00

status.html.in

- fix r317913

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