mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 11:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
112,705 Commits 500 Branches 1,381 Tags 811 MiB
bbdbc2658c
Commit Graph

885 Commits

Author SHA1 Message Date
Gabriel Caruso
ded3d984c6 Use EXPECT instead of EXPECTF when possible 
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
 2018-02-20 21:53:48 +01:00
Gabriel Caruso
21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Gabriel Caruso
2d48d734a2 Fix some misspellings 2018-02-06 16:59:00 +01:00
Lee Hsun
4b19f710e1 Set max_requests to 0 
The value will always be overwritten by fpm_run(), and the default
value there is 0 and not 500.
 2018-02-03 16:15:12 +01:00
motecshine
0e10bed83e Remove double include of fpm_scoreboard.h 2018-01-15 12:22:04 +01:00
Gabriel Caruso
471da3eddc Trailing whitespaces on sapi/* 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-04 02:39:54 -02:00
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a76eeea736 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
 2018-01-03 16:02:15 +08:00
Xinchen Hui
0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Happy new year (Update copyright to 2018)
 2018-01-03 16:00:34 +08:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Dmitry Stogov
c890d469fa Use array specific functions 2017-12-07 15:20:17 +03:00
Sebastian Ramadan
7d5691cd69 Fix some printf() specifier usages 
Use PRIu32 when printing uint32_t.
Fix some %u/%d confusions.
Add some casts where types are not standardized.
 2017-11-21 22:50:27 +01:00
Dmitry Stogov
00fc9e80c6 Disable RC_DEBUG for FPM initialisation 2017-11-03 00:48:04 +03:00
Peter Kokot
39ea632f74 Join untracked files to root .gitignore 2017-10-05 12:36:47 +02:00
Joe Watkins
17cf32ef45
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Typo in status.html
 2017-10-03 07:22:26 +01:00
Joe Watkins
6e39258302
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Typo in status.html
 2017-10-03 07:22:15 +01:00
Joe Watkins
d0cda9d0bd
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Typo in status.html
 2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475
Typo in status.html 
feet needs -> fit needs
 2017-10-03 07:21:53 +01:00
Remi Collet
c26d8ecf58 Merge branch 'PHP-7.2' 
* PHP-7.2:
  rename test
 2017-09-19 07:27:04 +02:00
Remi Collet
ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet
ce59da1997 Merge branch 'PHP-7.2' 
* PHP-7.2:
  NEWS
  Fixed Bug #75212 php_value acts like php_admin_value
 2017-09-18 18:09:40 +02:00
Remi Collet
cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Fabien Potencier
cbda84f87c Fixed typo in FPM error message 2017-08-23 22:16:47 +02:00
Joe Watkins
515b396889
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +01:00
Joe Watkins
b44484b912
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e
Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Sara Golemon
d316ba2d65 Remove user=foo from FPM test config 
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
 2017-05-24 15:07:24 -07:00
Sara Golemon
d8d1c78ed0 Skip FPM tests when running as root (unless requested) 
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.

Extend that logic into the test runner so that
we don't fail for stupid reasons.

If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
 2017-05-24 13:58:18 -07:00
Xinchen Hui
282d09a740 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix typo: exectute => execute
 2017-05-09 11:02:02 +08:00
Xinchen Hui
15dbe775d1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo: exectute => execute
 2017-05-09 11:01:52 +08:00
Andrew Marcinkevičius
abad134681 Fix typo: exectute => execute 2017-05-08 13:59:05 +03:00
Sara Golemon
b63c45c69e Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails 
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.

Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.

If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
 2017-03-08 11:02:54 -08:00
Joe Watkins
78ae563a48
Merge branch 'PHP-7.1' 
* PHP-7.1:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:49:22 +00:00
Joe Watkins
46d0933668
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration
 2017-02-22 06:48:48 +00:00
Coenraad Loubser
9eaf551c86
pull-request/2393: 
stop make install from clobbering default dot d configuration
 2017-02-22 06:47:23 +00:00
Nikita Popov
5383c9d9e5 Merge branch 'PHP-7.1' 2017-02-12 00:06:47 +01:00
Nikita Popov
6d5ea20e0b Merge branch 'PHP-7.0' into PHP-7.1 2017-02-12 00:06:35 +01:00
Denis Yeldandi
9814be4bc2 Fixed bug #69860 2017-02-12 00:06:04 +01:00
Jakub Zelenka
10cd88588e Merge branch 'PHP-7.1' 2017-01-29 20:46:20 +00:00
Jakub Zelenka
1dab39b9aa Merge branch 'PHP-7.0' into PHP-7.1 2017-01-29 20:44:51 +00:00
Jakub Zelenka
df16579642 Try fpm path for testing in sbin as it is default target 2017-01-29 20:43:58 +00:00
Joe Watkins
5c6bf3598a
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:57:01 +00:00
Joe Watkins
9aad38038e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix Bug #69865 php-fpm does not close stderr when using syslog
 2017-01-23 16:56:08 +00:00
Michael Wallner
80a851b4dd
Fix Bug #69865 php-fpm does not close stderr when using syslog 2017-01-23 16:55:15 +00:00
Antony Dovgal
b5cfe11c5b use correct shift and fix slowlog bt in 7.1 2017-01-23 14:52:21 +03:00
Antony Dovgal
9d7054693e use correct shift and fix slowlog bt in 7.1 2017-01-23 14:50:09 +03:00
Joe Watkins
28391c30ca
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:31 +00:00
Joe Watkins
19363de12f
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability
 2017-01-13 06:45:17 +00:00
Mitch Hagstrand
fd92b91188
Increase wait time for tests involving sockets to improve Travis relability 
1. Increased sleep time from 25ms to 50ms
2. Added sleep to shutdown handlers
 2017-01-13 06:45:04 +00:00
Joe Watkins
b2da9230f2
Merge branch 'PHP-7.1' 
* PHP-7.1:
  improve FPM tests (mostly for systemd build)
 2017-01-08 19:03:33 +00:00
Joe Watkins
8961c78524
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve FPM tests (mostly for systemd build)
 2017-01-08 19:03:10 +00:00
Remi Collet
eb02876e74
improve FPM tests (mostly for systemd build) 2017-01-08 19:02:50 +00:00
Nikita Popov
53ff546054 Merge branch 'PHP-7.1' 2017-01-07 22:54:26 +01:00
Nikita Popov
bb2ab75555 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-07 22:54:16 +01:00
Nikita Popov
a46bbdda2e Fixed bug #67583 
As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.
 2017-01-07 22:53:28 +01:00
Mitch Hagstrand
06c8538f87
Fixes for session and fpm tests to make them more reliable in Travis CI 
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Fixed user session GC function to return number of sessions removed
3. Disabled session GC in session_set_save_handler_basic.phpt
 2017-01-07 07:13:44 +00:00
Joe Watkins
f60ebd13b3
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixes for session and fpm tests in PHP7.0 branch
 2017-01-07 07:10:46 +00:00
Mitch Hagstrand
3401f553b9 Fixes for session and fpm tests in PHP7.0 branch 
1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age
 2017-01-06 19:55:57 -08:00
Joe Watkins
7c94b3b743
Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix inappropriate warning in FPM log
 2017-01-06 05:55:36 +00:00
Joe Watkins
de3649e2a3
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix inappropriate warning in FPM log
 2017-01-06 05:55:14 +00:00
Joe Watkins
6a03b43e5f
Merge branch 'pull-request/1311' into PHP-7.0 
* pull-request/1311:
  fix inappropriate warning in FPM log
 2017-01-06 05:54:42 +00:00
Joe Watkins
4aada085eb
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix php-fpm.service.in
 2017-01-05 06:54:52 +00:00
Joe Watkins
c370024c2c
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix php-fpm.service.in
 2017-01-05 06:54:37 +00:00
Joe Watkins
b037c43497
Merge branch 'pull-request/1256' into PHP-7.0 
* pull-request/1256:
  Fix php-fpm.service.in
 2017-01-05 06:54:19 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Joe Watkins
5a15c9470c
Merge branch 'pull-request/2117' 
* pull-request/2117:
  Allow to configure php-fpm slow log trace callers limit
 2017-01-01 15:47:36 +00:00
Anatol Belski
afb6ca2566 Finish remaining replacement uint => uint32_t 
Tthe core should be normalized now, no uints anymore
 2016-12-22 14:32:02 +01:00
Christoph M. Becker
143ee76fe4 Merge branch 'PHP-7.1' 2016-12-03 14:20:00 +01:00
Christoph M. Becker
c20299ddc4 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-03 14:18:56 +01:00
Christoph M. Becker
a8ec79e27f Merge branch 'PHP-5.6' into PHP-7.0 2016-12-03 14:18:00 +01:00
Adrien Crivelli
cf2496140d Fix minor typo 2016-12-03 14:15:52 +01:00
Bob Weinand
e3feeba3ae Merge branch 'PHP-7.1' 2016-11-20 19:20:48 +01:00
Bob Weinand
110a6cc6c0 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 19:20:09 +01:00
Bob Weinand
bc30206b8a Revert "Revert "Remove a few unused write warning"" 
This reverts commit ff5a65d26b.

(With zend_ prefix now)
 2016-11-20 19:18:50 +01:00
Nikita Popov
d512f21930 Merge branch 'PHP-7.1' 2016-11-20 19:10:29 +01:00
Nikita Popov
c58378619b Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 19:10:03 +01:00
Nikita Popov
ff5a65d26b Revert "Remove a few unused write warning (backport from master, oops)s" 
This reverts commit c65d24eaa3.
 2016-11-20 19:09:05 +01:00
Bob Weinand
b7fee22e73 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 14:18:54 +01:00
Bob Weinand
c65d24eaa3 Remove a few unused write warning (backport from master, oops)s 2016-11-20 14:17:14 +01:00
Bob Weinand
d37482679a Remove a few unused write warnings 2016-11-20 14:15:02 +01:00
Dmitry Stogov
e5d76c956a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 16:00:07 +03:00
Dmitry Stogov
79d9c12bf9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 15:59:35 +03:00
Dmitry Stogov
3817a2e6d5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test
  Updated NEWS
  Improvement for bug73297
  Simplify ext/standard/tests/http/bug73297.phpt
  http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
  Add failing test for bug#73297
 2016-11-17 15:58:38 +03:00
Dmitry Stogov
c2d6ffb85f Fixed test 2016-11-17 15:57:40 +03:00
Joe Watkins
caa9ed28cc Merge branch 'pull-request/2097' 2016-10-17 16:05:32 +01:00
Joe Watkins
96ed946b2b Merge branch 'pull-request/2097' 2016-10-17 16:03:12 +01:00
Joe Watkins
63166412a2 Merge branch 'pull-request/2097' 2016-10-17 16:02:51 +01:00
Julien Pauli
983f1e3618 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:54:46 +02:00
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
Julien Pauli
fbf87a8082 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:53:22 +02:00
Julien Pauli
a22175b06f Formatting. Fix possible memory corruption in FPM SHM management 2016-09-23 13:52:58 +02:00
tom916
807004a446 fix every work call mmap 
fix fpm_scoreboard_free
 2016-09-23 13:52:58 +02:00
Oleg Efimov
ba65b37b26 Allow to configure php-fpm slow log trace callers limit 2016-09-06 12:27:57 +03:00
Sara Golemon
fd8e203fa2 Add .gitignore for fpm generated files 2016-08-21 12:53:01 -07:00
Stanislav Malyshev
d6a43a8562 Fix bug #72836 - integer overflow in base64_decode caused heap corruption 2016-08-16 22:55:41 -07:00
Matthias Endler
ad8b99c888 Fix some typos in PHP FPM configuration 
[skip ci]
 2016-08-15 22:50:14 +02:00
Remi Collet
d5ad4b8b14 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  FPM: add test for CVE-2016-5385
 2016-07-22 09:37:00 +02:00
Remi Collet
9622f973a5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  FPM: add test for CVE-2016-5385
 2016-07-22 09:36:36 +02:00
Remi Collet
fb4a6dc0f1 FPM: add test for CVE-2016-5385 2016-07-22 09:35:09 +02:00
Julien Pauli
556cbfb6c3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive
 2016-07-12 10:38:51 +02:00
Julien Pauli
3c356aa7cb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive
 2016-07-12 10:38:22 +02:00
gooh
fb49f137ec Fix #72575: using --allow-to-run-as-root should ignore missing user 
directive

Trying to start PHP-FPM with the --allow-to-run-as-root flag will not
work when the user directive is not given in the FPM worker pool
configuration. Parsing the config will fail. Consequently, FPM cannot
start.

The check is in place to prevent FPM from getting started with root
privileges by accident. Prior to #61295 the check would also prevent
any non-root user to start PHP-FPM without a user directive present.

This patch adds an additional check to the config parser, checking for
the --allow-to-run-as-root flag to be present. If so, parsing will no
longer abort for root users even if the user directive is missing.

I will also update the PHP docs since they still state the user
directive is a mandatory setting which it is not since #61295.
 2016-07-12 10:36:17 +02:00
Julien Pauli
51e7415575 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:59:24 +02:00
Julien Pauli
fc2c301fe2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:58:55 +02:00
Julien Pauli
2552cf248d Remove needless zeroing of anonymously mmap'd memory 2016-07-11 14:58:12 +02:00
Michael McConville
9dd5d96332 Remove needless zeroing of anonymously mmap'd memory 
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
 2016-07-11 14:56:17 +02:00
Martin Vobruba
2809a676b5 Pass error severity to SAPI modules and raise corresponding error level in Apache 2016-07-11 09:34:48 +02:00
Remi Collet
d53fa7f451 Improve php-fpm systemd unit file 
- use PrivateTmp, now available everwhere, for better security
- add comment about how to customize the unit file
 2016-06-29 06:48:06 +02:00
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Dmitry Stogov
1433162083 Fixed compilation warnings 2016-06-21 20:12:29 +03:00
Dmitry Stogov
22ecd4428a Fixed compilation warnings 2016-06-21 17:56:07 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions. 
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
 2016-06-21 16:00:37 +03:00
Dmitry Stogov
c8706331b5 Cleanup zend_signal API 2016-06-20 14:58:42 +03:00
Xinchen Hui
0ed4034881 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72308 (fastcgi_finish_request and logging environment variables)
 2016-06-02 14:17:00 +08:00
Xinchen Hui
31ce3a661a Fixed bug #72308 (fastcgi_finish_request and logging environment variables) 2016-06-02 14:16:32 +08:00
Ferenc Kovacs
1380a6c2ff Merge branch 'PHP-7.0' 
* PHP-7.0:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:05:16 +02:00
Ferenc Kovacs
8f35ee49ee Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:04:55 +02:00
Ferenc Kovacs
3a16f511d9 mark frequent intermittent fpm test with XFAIL 2016-04-18 09:04:27 +02:00
Mickaël
0c2e184eac fpm: call zend_signal_init() in child 
This addresses bug #71269.

When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).

This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083.
 2016-02-15 13:23:37 +08:00
Xinchen Hui
2b6f06b70c Merge branch 'patch-1' of https://github.com/mickael9/php-src 
* 'patch-1' of https://github.com/mickael9/php-src:
  fpm: call zend_signal_init() in child
 2016-02-15 13:23:01 +08:00
Lior Kaplan
85ce6a7d38 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Align spacing in make install messages
 2016-02-08 20:33:17 +02:00
Lior Kaplan
fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
 2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02:00
Remi Collet
e846801c79 Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:58 +01:00
Remi Collet
c0802af52c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:15 +01:00
Remi Collet
07d2dcdf09 Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup 
Only needed with Apache version < 2.4.12 (ex RHEL-7)
 2016-01-29 10:20:42 +01:00
Mickaël
b0780d3f41 fpm: call zend_signal_init() in child 
This addresses bug #71269.

When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).

This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083.
 2016-01-09 04:54:02 +01:00
Anatol Belski
ea130bfd59 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update NEWS
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-06 06:10:39 +01:00
Anatol Belski
c0928be7f8 Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0 
* phpsec/PHP-7.0:
  add NEWS entries for 7.0.2
  re-apply the patch from 1785d2b805
  Improve fix for bug #70976
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  fix merge mistake
  Fixed #70728
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
 2016-01-06 06:09:12 +01:00
Stanislav Malyshev
13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-05 19:38:29 -08:00
Julien Pauli
928d2cb3a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Happy new year (Update copyright to 2016)
 2016-01-04 18:14:08 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Stanislav Malyshev
2eaa755660 Fixed bug #70755: fpm_log.c memory leak and buffer overflow 2016-01-04 17:36:42 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Julien Pauli
ea12ff149c Added support for HTTP 451 2015-12-23 11:31:18 +01:00
Bob Weinand
817ed01320 Merge PR #1638 (Fix naming of global section in fpm_conf_dump()) 2015-12-16 16:46:17 +01:00
Stanislav Malyshev
be19dbcb84 Fixed bug #70755: fpm_log.c memory leak and buffer overflow 2015-12-08 00:10:07 -08:00
Lior Kaplan
c1b374554c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)
 2015-11-23 19:02:41 +02:00
Lior Kaplan
9642710a09 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4
 2015-11-23 18:56:13 +02:00
Lior Kaplan
d6b78a3511 Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions) 2015-11-23 18:40:47 +02:00
Gordon Oheim
0dc8a8cac0 Fix naming 
The global section is named "General", but the correct section name is "global". It is "global" in #1313 and also "global" in https://github.com/php/php-src/blob/master/sapi/fpm/php-fpm.conf.in. The commit fixes the naming. However, the proposed change might break any tooling that relies on finding "General" in the output though.
 2015-11-13 15:01:10 +01:00