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
Anatol Belski
c698299550
Interned strings unification for TS/NTS
...
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings
- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end
There is no runtime interning.
With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
2017-03-04 10:39:13 +01:00
Joe Watkins
c564924d31
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
...
This reverts commit 008fb28eaf
.
2017-02-27 19:21:10 +00:00
Joe Watkins
61ecad0f53
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:31 +00:00
Joe Watkins
7aa59a4440
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf
fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:54:48 +00: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
Nikita Popov
4ec80663a6
Merge branch 'PHP-7.1'
2017-02-08 01:10:54 +01:00
Nikita Popov
f352c50026
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-08 01:10:48 +01:00
Zheng SHAO
80c8d84af3
Fixed bug #61471
2017-02-08 01:10:13 +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
Bob Weinand
d4dd540233
Merge branch 'PHP-7.1'
2017-01-25 13:01:48 +01:00
Bob Weinand
d0272ef1ef
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-25 13:01:10 +01:00
Bob Weinand
c44efbbbb1
Fix copying too much leading to potential segfault
2017-01-25 13:00:48 +01: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
409467dc2f
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Remove remnants of TSMRLS_* macro calls
2017-01-18 17:46:35 +00:00
Joe Watkins
bbe21ccf38
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Remove remnants of TSMRLS_* macro calls
2017-01-18 17:46:11 +00:00
Thomas Punt
fb8486f3bd
Remove remnants of TSMRLS_* macro calls
2017-01-18 17:42:45 +00:00
Anatol Belski
ca4cfcc631
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
...
This reverts commit a8931df672
, reversing
changes made to f2f35a2b27
.
(cherry picked from commit 57736cc937
)
Something went wrong, so the revert didn't land in master.
Cherry-picking extra therefore.
2017-01-15 17:18:00 +01: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
Anatol Belski
bdfe07c2e7
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
2017-01-12 22:08:20 +01:00
Anatol Belski
aacba43056
Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()
2017-01-12 22:06:03 +01:00
Anatol Belski
e65760f878
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 17:25:26 +01:00
Anatol Belski
9f3b3a55fe
Fixed bug #73904 php-cgi fails to load -c specified php.ini file
2017-01-12 14:15:21 +01:00
Joe Watkins
e54ee3eaa4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed #73902 mention router support in usage output for php-cli
2017-01-10 06:21:14 +00:00
Joe Watkins
aadc84f6f7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #73902 mention router support in usage output for php-cli
2017-01-10 06:20:56 +00:00
Joe Watkins
125ee6a68e
Fixed #73902 mention router support in usage output for php-cli
2017-01-10 06:19:34 +00:00
Joe Watkins
64e80f5358
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Use proper file extension for the README
2017-01-08 21:05:36 +00:00
Joe Watkins
c846daef28
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Use proper file extension for the README
2017-01-08 21:05:24 +00:00
Markus Staab
5b5483dc8e
Use proper file extension for the README
2017-01-08 21:05:06 +00:00
Joe Watkins
14be227325
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix 404 links in Litespeed README - Bug 73890
2017-01-08 20:28:22 +00:00
Joe Watkins
230b387e8a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix 404 links in Litespeed README - Bug 73890
2017-01-08 20:28:05 +00:00
Peter Kokot
7f1247004e
Fix 404 links in Litespeed README - Bug 73890
2017-01-08 20:27:48 +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
Anatol Belski
34c1040e22
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
2017-01-05 14:02:43 +01:00
Anatol Belski
57736cc937
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
...
This reverts commit a8931df672
, reversing
changes made to f2f35a2b27
.
2017-01-05 13:59:01 +01: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
Nikita Popov
52da05c535
Merge branch 'PHP-7.1'
2017-01-01 21:17:00 +01:00
Nikita Popov
a5027d43dd
Merge branch 'PHP-7.0' into PHP-7.1
2017-01-01 21:09:27 +01:00
Nikita Popov
935b5cb11e
Flush stderr on win32 in cli_log_message
...
This allows us to unfork a bunch of tests for Windows.
2017-01-01 21:09:02 +01: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
Xinchen Hui
40727d7ce9
Merge branch 'PHP-7.1'
...
* PHP-7.1:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
2016-12-29 15:56:38 +08:00
Xinchen Hui
716fa9c24d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
2016-12-29 15:56:26 +08:00
Xinchen Hui
a8931df672
Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0
...
* 'bugfix_timeout_61471' of https://github.com/axot/php-src :
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
2016-12-29 15:46:47 +08:00
Zheng SHAO
587497e3a9
define php_ap_map_http_request_error function for older httpd only
2016-12-29 16:07:05 +09:00
Zheng SHAO
d92606a4be
add old versions of httpd support
2016-12-29 00:41:56 +09:00
Nikita Popov
1bf67622f8
Merge branch 'PHP-7.1'
2016-12-27 21:52:56 +01:00
Nikita Popov
937115f8c5
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-27 21:52:33 +01:00
Mitch Hagstrand
2d51267c07
Makes the sapi web server and curl tests more reliable
...
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
runs on Windows also.
2016-12-27 21:52:05 +01:00
Anatol Belski
758af77e9d
Path handling related refactorings
...
Primarily related to the path handling datatypes, to avoid unnecessary
casts, where possible. Also some rework to avoid code dup. Probably
more places are to go, even not path related, primarily to have less
casts and unsigned integers where possible. That way, we've not only
less warnings and casts, but are also safer with regard to the
integer overflows. OFC it's not a panacea, but still significantly
reduces the vulnerability potential.
2016-12-22 14:56:47 +01: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
Bob Weinand
5d7ce72747
Merge branch 'PHP-7.1'
2016-12-22 00:42:05 +01:00
Bob Weinand
728502fc29
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 00:40:54 +01:00
Bob Weinand
3b2b080cbc
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
2016-12-22 00:39:24 +01:00
Bob Weinand
942d4d5614
Merge branch 'PHP-7.1'
2016-12-21 02:43:04 +01:00
Bob Weinand
7e2146293b
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 02:42:38 +01:00
Bob Weinand
becda86ae5
Fix issue with -- in phpdbg command line
2016-12-21 02:42:23 +01:00
Bob Weinand
c3ee875aec
Merge branch 'PHP-7.1'
2016-12-20 20:18:53 +01:00
Bob Weinand
8b06b7e266
Fixed bug #73794 (Crash (out of memory) when using run and # command separator)
2016-12-20 20:18:36 +01:00
Bob Weinand
e4db84f231
Merge branch 'PHP-7.1'
2016-12-20 19:49:25 +01:00
Bob Weinand
3273f15412
Fix segfault in ZTS mode when just printing and exiting in phpdbg
2016-12-20 19:49:04 +01:00
Zheng SHAO
fb98907d2d
typo fixed
2016-12-17 20:26:09 +09:00
Zheng SHAO
9b65a10256
bug fixed #61471 in apache2handler
2016-12-17 13:37:58 +09:00
Nikita Popov
ef1ed6ab8e
Merge branch 'PHP-7.1'
2016-12-14 18:11:51 +01:00
Nikita Popov
33e96c9d63
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-14 18:11:43 +01:00
Nikita Popov
f99bf70360
Partially fix bug #70492
...
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
Bob Weinand
b149001ffd
Merge branch 'PHP-7.1'
2016-12-06 18:30:50 +01:00
Bob Weinand
43f88f25bb
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-06 18:30:37 +01:00
Bob Weinand
7e12b5da71
Fixed issue getting executable lines from custom wrappers
...
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +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
Nuno Lopes
d5a2af6d1c
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
2016-11-30 14:41:26 -05:00
Bob Weinand
c406d1e9b5
Merge branch 'PHP-7.1'
2016-11-30 11:45:36 +01:00
Bob Weinand
e37412e19c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-30 11:45:18 +01:00
Bob Weinand
344ef050aa
Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available
2016-11-30 11:44:10 +01:00
Bob Weinand
7631c8766e
Merge branch 'PHP-7.1'
2016-11-30 02:57:34 +01:00
Bob Weinand
7aaa1a876e
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-30 02:57:16 +01:00
Bob Weinand
b73a3afff3
Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup)
2016-11-30 02:56:47 +01:00
Yoshio HANAWA
26e80982a2
Fix help messages
2016-11-27 19:16:00 +09:00
Nikita Popov
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
Kalle Sommer Nielsen
8efbcf18a1
Remove this old obsolete code
2016-11-21 15:18:55 +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
Joe Watkins
893a27d632
make it possible to show specific help pages without interactive session
2016-11-20 05:26:46 +00:00
Joe Watkins
56f9a93939
make it possible to show specific help pages without interactive session
2016-11-20 05:25:42 +00:00
Joe Watkins
7753d10457
make it possible to show specific help pages without interactive session
2016-11-20 05:24:14 +00:00
Anatol Belski
b6ed31959c
Merge branch 'PHP-7.1'
...
* PHP-7.1:
extend skipif
2016-11-18 02:26:44 +01:00
Anatol Belski
b2b63ce993
extend skipif
...
This test won't pass on Windows. The main reason is that the multiline
input is not really possible to create on cmd. But also, because of the
single quotes. And without multiline data piping, it doesn't make sense.
2016-11-18 02:23:17 +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
Nuno Lopes
d26b8804d0
fix gcov coverage
2016-11-16 15:11:07 -05:00
Nuno Lopes
7032ed37c0
fix gcov coverage
2016-11-16 15:08:42 -05:00
Nuno Lopes
5e5e071214
fix gcov coverage
2016-11-16 15:07:16 -05:00
Bob Weinand
882bcb7240
Merge branch 'PHP-7.1'
2016-11-13 18:31:20 +01:00
Bob Weinand
6834b7344d
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-13 18:30:49 +01:00
Bob Weinand
22a43551a2
Fix passing of wrong values in bp export
2016-11-13 18:30:23 +01:00
Bob Weinand
5a4bad7b5f
Merge branch 'PHP-7.1'
2016-11-13 13:22:50 +01:00
Bob Weinand
ef657978b2
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-13 13:22:35 +01:00
Bob Weinand
ba75d4c50b
Properly escape all filenames when exporting breakpoints
2016-11-13 13:22:06 +01:00
Mitch Hagstrand
57c0773cd7
Fix phpdbg breakpoint restoring after execution completes
2016-11-13 12:44:25 +01:00
Bob Weinand
1e65d0ea67
Merge branch 'PHP-7.1'
2016-11-13 12:26:13 +01:00
Bob Weinand
dbd504eaa9
Fix phpdbg ZTS shutdown with USE_ZEND_ALLOC
2016-11-13 12:25:43 +01:00
Joe Watkins
6c7e795c15
phpdbg standard input changes
2016-11-13 08:00:15 +00:00
Joe Watkins
a2bc7cf9ca
Merge branch 'master' of git.php.net:/php-src
2016-11-12 17:30:41 +00:00
Joe Watkins
6c0e1ca4fa
update phpdbg with stdin code change
2016-11-12 17:30:16 +00:00
Andrea Faulds
3ed8b7a87b
Use "Standard input code" instead of "php://stdin"
2016-11-12 17:26:20 +00:00
Andrea Faulds
a103aa2dbd
Show "php://stdin" instead of "-" in error messages
2016-11-12 17:26:20 +00:00
Kalle Sommer Nielsen
2104bea5d7
Remove Netware support
...
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Michele Locati
33301d5bae
Add VT100 support for Windows
...
Fix function names prefix
Use Unicode version of GetFinalPathNameByHandle
Use EG(windows_version_info) instead of RtlGetVersion
Use the specified handle_id instead of STD_OUTPUT_HANDLE
Switch from stream name to stream resource
Allow running tests capturing only stdout and/or stderr
Add tests for stream_vt100_support function
Export Win32 console functions
Fix x64 build
Use zend_long instead of long long, use GetConsole instead of GetFinalPathNameByHandleW to check if a handle is a valid console stream
Always use zend_long on any platform
Use _get_osfhandle to determine the standard handle
Accept stream names
Raise warnings in case of invalid stream parameter
Return true if disabling VT100 support on a not-console/redirected stream or on old Windows versions
Remove php_win32_console_os_supports_vt100
Differentiate stdin vs stdout/stderr
Simplify setting flag
Allow avoid piping STDIN
Let stream_vt100_support accept only resources
Fix run-tests
Revert console flags in case of failure
Simplify logic of stream_vt100_support when setting the flag
Return true if succeeded, false otherwise
Drop support for STDIN
More comprehensive tests for stream_vt100_support
Remove old tests
Fix name of included file and use absolute paths
Enable ENABLE_VIRTUAL_TERMINAL_PROCESSING on Windows by default
Remove tests for stream_vt100_support
Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support
Add tests for stream_isatty
Add tests for sapi_windows_vt100_support
Return null from stream_isatty is neither Windows nor Posix
Fallback to S_ISCHR if neither Windows nor Posix
Avoid defining argc since it's only used once
Better comment about php_win32_console_fileno_is_console
Use events instead of cNumberOfEvents
Do not restore previous console mode
We need to restore previous console mode on failing SetConsole calls only for STDIN
Don't configure STDOUT/STDERR on Windows with PHP_CLI_WIN32_NO_CONSOLE
2016-10-28 19:23:00 +02:00
Anatol Belski
6c55c39d8e
Merge branch 'PHP-7.1'
...
* PHP-7.1:
yet another uninitialized pointer
2016-10-27 02:46:18 +02:00
Anatol Belski
931ea5c872
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
yet another uninitialized pointer
2016-10-27 02:45:48 +02:00
Anatol Belski
e586c7c612
yet another uninitialized pointer
2016-10-27 02:42:30 +02:00
Anatol Belski
c3f08add5e
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix uninitialized pointer
2016-10-27 02:20:35 +02:00
Anatol Belski
4e3eb4a5f8
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix uninitialized pointer
2016-10-27 02:20:12 +02:00
Anatol Belski
b9993c8b6c
fix uninitialized pointer
2016-10-27 02:15:14 +02:00
Anatol Belski
5e480021a7
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Better fix for bug #73360
Revert "Fixed bug #73360 Unable to work in root with unicode chars"
2016-10-21 21:34:09 +02:00
Anatol Belski
2860fd40d6
Better fix for bug #73360
...
This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.
2016-10-21 21:29:35 +02:00
Anatol Belski
fbf46d36ca
Revert "Fixed bug #73360 Unable to work in root with unicode chars"
...
This reverts commit 64fee0aecb
.
2016-10-21 20:15:16 +02:00
Anatol Belski
04bba0c078
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73360 Unable to work in root with unicode chars
2016-10-21 16:00:49 +02:00
Anatol Belski
64fee0aecb
Fixed bug #73360 Unable to work in root with unicode chars
2016-10-21 15:22:59 +02: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
Bob Weinand
efcbeb0603
Merge branch 'PHP-7.1'
2016-10-16 15:46:44 +02:00
Bob Weinand
f8c2089651
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 15:46:33 +02:00
Bob Weinand
d82da7de3a
Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)
2016-10-16 15:41:37 +02:00
Bob Weinand
b1c6299b34
Merge branch 'PHP-7.1'
2016-10-16 13:48:25 +02:00
Bob Weinand
47bd3d982e
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 13:48:13 +02:00
Bob Weinand
e93eaee164
Fixed bug #70776 (Simple SIGINT does not have any effect)
2016-10-16 13:47:49 +02:00
Bob Weinand
0399a43265
Merge branch 'PHP-7.1'
2016-10-16 12:34:20 +02:00
Bob Weinand
601ab6e9d0
Fix searching for catch blocks
...
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number
2016-10-16 12:34:10 +02:00
Bob Weinand
8af4882193
Merge branch 'PHP-7.1'
2016-10-14 12:25:34 +02:00
Bob Weinand
386aff451b
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-14 12:25:16 +02:00
Bob Weinand
466870e2b0
Fix memory leak when compiling files in phpdbg
2016-10-14 12:24:28 +02:00
Bob Weinand
990e2ce2a0
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
...
(cherry picked from commit d14498a475
)
2016-10-14 02:03:46 +02:00
Anatol Belski
5ce2230266
use already exported symbol
...
(cherry picked from commit ce3e792c2c
)
2016-10-14 02:01:22 +02:00
Bob Weinand
f40c03168e
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
...
(cherry picked from commit 457e686262
)
2016-10-14 01:54:18 +02:00
Nikita Popov
6baaccc9b6
Merge branch 'PHP-7.0' into PHP-7.1
...
(cherry picked from commit 9669ec707a
)
2016-10-14 01:53:25 +02:00
Bob Weinand
06df34072e
Fix accidental PHPDBG_ABI break
...
(cherry picked from commit 671d8054f8
)
2016-10-14 01:50:48 +02:00
Bob Weinand
11e7447e04
Merge branch 'PHP-7.0' into PHP-7.1
...
(cherry picked from commit 37ae5f3931
)
2016-10-14 01:48:03 +02:00
Bob Weinand
1630934070
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-13 14:10:19 +02:00
Bob Weinand
d14498a475
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
2016-10-13 14:09:56 +02:00
Anatol Belski
afbb3b858a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
use already exported symbol
Revert "export symbol missing by phpdbg"
2016-10-13 10:08:10 +02:00
Anatol Belski
ce3e792c2c
use already exported symbol
2016-10-13 09:55:37 +02:00
Bob Weinand
457e686262
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
2016-10-12 22:57:41 +02:00
Bob Weinand
fe49fd7dad
Update NEWS
...
Also add missing include.inc test file
2016-10-12 22:54:32 +02:00
Nikita Popov
9669ec707a
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-12 22:46:28 +02:00
Nikita Popov
fe378c27cc
Fix phpdbg tests after lineno change
2016-10-12 22:41:59 +02:00
Bob Weinand
671d8054f8
Fix accidental PHPDBG_ABI break
2016-10-12 22:16:11 +02:00
Bob Weinand
37ae5f3931
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-12 20:19:10 +02:00
Bob Weinand
5aae01104f
Add stdin command and -s command line parameter to phpdbg
...
This allows reading the initial script file from stdin instead of being forced to put the script into a file in order to run it with phpdbg.
Especially important for programmatic execution of phpdbg.
Also adding tests/include_once.phpt and tests/set_exception_handler.phpt as I seem to have forgotten to git add them sometime long ago...
2016-10-12 20:15:49 +02:00
Bob Weinand
d7474e13bd
Merge branch 'PHP-7.1'
2016-10-06 10:36:40 +02:00
Bob Weinand
c9d3b9fb47
Use better fix for preventing too early freeing of interned strings
...
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle
2016-10-06 10:36:25 +02:00
Bob Weinand
38beb0e8d8
Merge branch 'PHP-7.1'
2016-10-05 12:22:39 +02:00
Bob Weinand
abfd811ea4
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-05 12:20:06 +02:00
Bob Weinand
4790da5475
Update run command for allowing STDIN
2016-10-05 12:14:02 +02:00
Bob Weinand
eaff72f31b
Remove phpdbg fix targeting 7.1 which landed in 7.0
2016-10-05 12:08:20 +02:00
Bob Weinand
007cf7d7d3
Merge branch 'PHP-7.1'
2016-10-03 12:55:45 +02:00
Bob Weinand
8fcc938e56
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-03 12:55:23 +02:00
Bob Weinand
8908df690f
Fix crash on Linux due to double fclose()
2016-10-03 12:55:06 +02:00
Bob Weinand
29941e1811
Merge branch 'PHP-7.1'
2016-10-02 12:46:45 +01:00
Bob Weinand
f58cf8b24d
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-02 12:46:22 +01:00
Bob Weinand
417a8ef6b4
Fix run command args passing when inmidst execution
2016-10-02 12:45:20 +01:00
Bob Weinand
1c74398520
Merge branch 'PHP-7.1'
2016-10-01 19:14:46 +01:00
Bob Weinand
3fe1010cee
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-01 19:14:26 +01:00
Bob Weinand
9d537951c5
Add proper escape sequences and reading stdin from file in phpdbg run command
2016-10-01 19:05:19 +01:00
Bob Weinand
948c1a912a
Merge branch 'PHP-7.1'
2016-10-01 10:47:53 +01:00
Bob Weinand
a5129bcb5b
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-01 10:47:31 +01:00
Bob Weinand
3280a29ee5
Fix invalid access to interned strings after they are freed in phpdbg
2016-10-01 10:46:21 +01:00
Bob Weinand
b1a1902a0f
Merge branch 'PHP-7.1'
2016-09-28 13:26:49 +02:00
Bob Weinand
e5d75d7268
Add phpdbg generator command
2016-09-28 13:26:08 +02: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
Anatol Belski
8f256bebef
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function
2016-09-23 11:25:33 +02:00
Bob Weinand
a137a1e255
Merge branch 'PHP-7.0'
2016-09-23 03:29:56 +02:00
Bob Weinand
cf35dae6e2
phpdbg next command must stop when leaving function
2016-09-23 03:29:37 +02:00
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
Oleg Efimov
ba65b37b26
Allow to configure php-fpm slow log trace callers limit
2016-09-06 12:27:57 +03: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