delta/php-git.git/sapi/fpm, branch microseconds git.php.net: repository/php-src.git Merge branch 'PHP-7.0' into PHP-7.1 2016-09-23T11:54:22+00:00 Julien Pauli jpauli@php.net 2016-09-23T11:54:22+00:00 974ba6be7a20d277723e6e7f9976219796dba7c0 * PHP-7.0: Formatting. Fix possible memory corruption in FPM SHM management fix every work call mmap Conflicts: sapi/fpm/fpm/fpm_scoreboard.c 
* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
	sapi/fpm/fpm/fpm_scoreboard.c
Merge branch 'PHP-5.6' into PHP-7.0 2016-09-23T11:53:22+00:00 Julien Pauli jpauli@php.net 2016-09-23T11:53:22+00:00 fbf87a8082392ced4385b1a128cfe1caf7adf363 * PHP-5.6: Formatting. Fix possible memory corruption in FPM SHM management fix every work call mmap 
* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
Formatting. Fix possible memory corruption in FPM SHM management 2016-09-23T11:52:58+00:00 Julien Pauli jpauli@php.net 2016-09-23T11:24:31+00:00 a22175b06f22965e0d79e2b5bb6c734950adfc5d 






fix every work call mmap
2016-09-23T11:52:58+00:00

tom916
tom916@qq.com

2016-09-16T14:37:09+00:00

807004a446c3e19bd1d12111cda841fea3db4135

fix fpm_scoreboard_free





fix fpm_scoreboard_free







Fix bug #72836 - integer overflow in base64_decode caused heap corruption
2016-08-17T05:55:41+00:00

Stanislav Malyshev
stas@php.net

2016-08-15T06:13:30+00:00

d6a43a8562ec58043fa5e26f2a58b0c239feee40












Fix some typos in PHP FPM configuration
2016-08-15T20:50:14+00:00

Matthias Endler
matthias-endler@gmx.net

2016-08-15T10:40:14+00:00

ad8b99c888c7f8adcbefd25f02ebe837c85a472f

[skip ci]





[skip ci]







Merge branch 'PHP-7.0' into PHP-7.1
2016-07-22T07:37:00+00:00

Remi Collet
remi@php.net

2016-07-22T07:37:00+00:00

d5ad4b8b1427abfaa767e4c0e60322b1e3fbbd13

* PHP-7.0:
  FPM: add test for CVE-2016-5385





* PHP-7.0:
  FPM: add test for CVE-2016-5385







Merge branch 'PHP-5.6' into PHP-7.0
2016-07-22T07:36:36+00:00

Remi Collet
remi@php.net

2016-07-22T07:36:36+00:00

9622f973a5a4e9ca42903bb48c3c467d86c578d5

* PHP-5.6:
  FPM: add test for CVE-2016-5385





* PHP-5.6:
  FPM: add test for CVE-2016-5385







FPM: add test for CVE-2016-5385
2016-07-22T07:35:09+00:00

Remi Collet
remi@php.net

2016-07-22T07:35:09+00:00

fb4a6dc0f1df106dae84c9d8f3ec53cc0da7231b












Merge branch 'PHP-7.0'
2016-07-12T08:38:51+00:00

Julien Pauli
jpauli@php.net

2016-07-12T08:38:51+00:00

556cbfb6c334f7bb31c87021af47dbb83a0c4012

* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive





* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive