php-src/sapi/fpm
Julien Pauli 974ba6be7a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
	sapi/fpm/fpm/fpm_scoreboard.c
2016-09-23 13:54:22 +02:00
..
fpm Merge branch 'PHP-7.0' into PHP-7.1 2016-09-23 13:54:22 +02:00
tests Merge branch 'PHP-5.6' into PHP-7.0 2016-07-22 09:36:36 +02:00
config.m4 Merge branch 'PHP-5.6' into PHP-7.0 2015-11-23 18:56:13 +02:00
CREDITS
init.d.php-fpm.in Add configtest option to fpm init.d script 2015-03-08 22:48:29 +08:00
LICENSE
Makefile.frag Merge branch 'PHP-5.6' into PHP-7.0 2016-02-08 20:29:24 +02:00
php-fpm.8.in Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
php-fpm.conf.in Fix some typos in PHP FPM configuration 2016-08-15 22:50:14 +02:00
php-fpm.service.in Improve php-fpm systemd unit file 2016-06-29 06:48:06 +02:00
status.html.in - fix r317913 2011-10-08 20:43:12 +00:00
www.conf.in Fix bug #72836 - integer overflow in base64_decode caused heap corruption 2016-08-16 22:55:41 -07:00