Michael Wallner c0477fbcb5 Squashed commit of the following: ...

commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line

2015-01-30 23:01:26 +01:00

..

fpm

Squashed commit of the following:

2015-01-30 23:01:26 +01:00

tests

These tests all assume that IPV6 is available.

2015-01-09 17:24:48 -08:00

config.m4

split fpm config to two parts. PR#903

2014-12-14 14:21:46 +01: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

split fpm config to two parts. PR#903

2014-12-14 14:21:46 +01:00

php-fpm.8.in

Fixed bug #68452 php-fpm man page is oudated (-O)

2014-11-19 16:49:05 +01:00

php-fpm.conf.in

split fpm config to two parts. PR#903

2014-12-14 14:21:46 +01: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

www.conf.in

Still -1 on *BSD now

2015-01-04 22:08:35 -05:00