George Wang
6f7479251b
Merge branch 'PHP-7.1'
2016-09-19 10:52:58 -04:00
George Wang
248ef30abe
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-19 10:50:21 -04:00
George Wang
ca24c58e65
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-19 10:49:26 -04:00
George Wang
56fa36b0a8
Fix wrong year in previous commit.
2016-09-19 10:46:46 -04:00
Anatol Belski
b1f33db39f
backport 59444347
and 3d7343f6
2016-09-08 17:46:53 +02:00
Stanislav Malyshev
013425fa37
Merge branch 'PHP-7.1'
...
* PHP-7.1:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
2016-09-04 23:24:36 -07:00
Stanislav Malyshev
8c16f2262f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
2016-09-04 23:24:31 -07:00
David Carlier
19350b6b73
phpdbg: couple of network function return checks. Possible
...
overflow when copy the socket_path configuration.
2016-09-04 23:18:51 -07:00
Nikita Popov
57180cd306
Merge branch 'PHP-7.1'
2016-09-03 23:31:20 +02:00
Nikita Popov
f1bfd7fe00
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-03 23:31:05 +02:00
Nikita Popov
1ae2d074f8
Fix bug #72996
2016-09-03 23:30:23 +02:00
Anatol Belski
3e938cd8a9
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix dealloc mismatch
2016-08-29 13:49:20 +02:00
Anatol Belski
0e709fe42d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix dealloc mismatch
2016-08-29 13:43:08 +02:00
Anatol Belski
eac7f4b670
fix dealloc mismatch
2016-08-29 12:46:23 +02:00
George Wang
698b88fb17
Merge branch 'PHP-7.1'
2016-08-28 22:32:42 -04:00
George Wang
0a09eecfcc
code cleanup.
2016-08-28 22:31:08 -04:00
George Wang
413bd261ec
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-28 22:29:38 -04:00
George Wang
ca1eb585ee
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
sapi/litespeed/lsapi_main.c
2016-08-28 22:23:28 -04:00
George Wang
c73bcbefbd
Added .user.ini support.
...
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
2016-08-28 21:49:30 -04: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
Anatol Belski
53034feda5
pull ps_title behind the logic to support the current codepage
2016-08-11 13:38:28 +02:00
Nikita Popov
2fbfa7f62e
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-09 15:35:04 +02:00
Nikita Popov
842e408c67
Don't copy mime types in CLI server
...
This is both unnecessary and causes leaks in valgrind.
2016-08-09 15:34:03 +02:00
Christoph M. Becker
b0558b3004
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-28 17:00:54 +02:00
Christoph M. Becker
95190db84d
Merge branch 'PHP-5.6' into PHP-7.0
2016-07-28 16:54:36 +02:00
Christoph M. Becker
6e886f07a8
Fix #72676 : Test cli_process_title_unix fails on AIX
...
Patch provided by matthieu dot sarter dot external at atos dot net.
2016-07-28 16:51:45 +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
Anatol Belski
88d86aeb53
add missing header to fix build
2016-07-19 01:30:07 +02:00
Anatol Belski
2349332b66
correct macro names
2016-07-17 12:33:26 +02:00
Bob Weinand
517bbb14fd
Disable optimizer when it conflicts with phpdbg tests
2016-07-13 10:22:00 +02:00
Bob Weinand
7a125a4409
Remove bogus zend_signal_shutdown symbol from header
2016-07-13 01:05:32 +02:00
Bob Weinand
d08cb90462
Cleanup zend_/signal usage in phpdbg.c
2016-07-13 00:37:25 +02:00
Bob Weinand
ef6d0c8b6d
Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpoints
2016-07-12 20:50:51 +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
Bob Weinand
b00376884e
Rewrite watchpoints to be much more stable
...
This mainly involves a separate abstraction layer for elements (e.g. $a->b) and watchpoints (on pointer of the Bucket for example).
Also better comparison handling (value backup vs. page dumps).
It is not yet finished (there are sometimes false positives announced and names not yet perfect), but the functionality is working and not crashing as far as I have tested.
Future scope is also relative watchpoints, e.g. "w $this->val expression()" which does not have the symbol tables as basis, but the value (in this example: return value of expression()) as basis.
2016-07-11 23:58:20 +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
Anatol Belski
45a8824423
fix build with mod_winnt
2016-07-11 09:40:43 +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
Dmitry Stogov
d898344663
Inline simple constant functions
2016-06-30 17:04:25 +03: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