ef1ed6ab8e
Merge branch 'PHP-7.1'
2016-12-14 18:11:51 +01:00
33e96c9d63
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-14 18:11:43 +01:00
f99bf70360
Partially fix bug #70492
...
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
b149001ffd
Merge branch 'PHP-7.1'
2016-12-06 18:30:50 +01:00
43f88f25bb
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-06 18:30:37 +01:00
7e12b5da71
Fixed issue getting executable lines from custom wrappers
...
See also krakjoe/phpdbg#161
2016-12-06 18:29:48 +01:00
143ee76fe4
Merge branch 'PHP-7.1'
2016-12-03 14:20:00 +01:00
c20299ddc4
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-03 14:18:56 +01:00
a8ec79e27f
Merge branch 'PHP-5.6' into PHP-7.0
2016-12-03 14:18:00 +01:00
cf2496140d
Fix minor typo
2016-12-03 14:15:52 +01:00
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
c406d1e9b5
Merge branch 'PHP-7.1'
2016-11-30 11:45:36 +01:00
e37412e19c
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-30 11:45:18 +01:00
344ef050aa
Fix run-tests.php to always include TEST_PHPDBG_EXECUTABLE if phpdbg available
2016-11-30 11:44:10 +01:00
7631c8766e
Merge branch 'PHP-7.1'
2016-11-30 02:57:34 +01:00
7aaa1a876e
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-30 02:57:16 +01:00
b73a3afff3
Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup)
2016-11-30 02:56:47 +01:00
26e80982a2
Fix help messages
2016-11-27 19:16:00 +09:00
5af586bec5
Remove more PHP 6 leftovers from tests
2016-11-24 22:39:39 +01:00
8efbcf18a1
Remove this old obsolete code
2016-11-21 15:18:55 +01:00
e3feeba3ae
Merge branch 'PHP-7.1'
2016-11-20 19:20:48 +01:00
110a6cc6c0
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:20:09 +01:00
bc30206b8a
Revert "Revert "Remove a few unused write warning""
...
This reverts commit ff5a65d26b
2016-11-20 19:18:50 +01:00
d512f21930
Merge branch 'PHP-7.1'
2016-11-20 19:10:29 +01:00
c58378619b
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 19:10:03 +01:00
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
b7fee22e73
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-20 14:18:54 +01:00
c65d24eaa3
Remove a few unused write warning (backport from master, oops)s
2016-11-20 14:17:14 +01:00
d37482679a
Remove a few unused write warnings
2016-11-20 14:15:02 +01:00
893a27d632
make it possible to show specific help pages without interactive session
2016-11-20 05:26:46 +00:00
56f9a93939
make it possible to show specific help pages without interactive session
2016-11-20 05:25:42 +00:00
7753d10457
make it possible to show specific help pages without interactive session
2016-11-20 05:24:14 +00:00
b6ed31959c
Merge branch 'PHP-7.1'
...
* PHP-7.1:
extend skipif
2016-11-18 02:26:44 +01:00
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
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
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
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
c2d6ffb85f
Fixed test
2016-11-17 15:57:40 +03:00
d26b8804d0
fix gcov coverage
2016-11-16 15:11:07 -05:00
7032ed37c0
fix gcov coverage
2016-11-16 15:08:42 -05:00
5e5e071214
fix gcov coverage
2016-11-16 15:07:16 -05:00
882bcb7240
Merge branch 'PHP-7.1'
2016-11-13 18:31:20 +01:00
6834b7344d
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-13 18:30:49 +01:00
22a43551a2
Fix passing of wrong values in bp export
2016-11-13 18:30:23 +01:00
5a4bad7b5f
Merge branch 'PHP-7.1'
2016-11-13 13:22:50 +01:00
ef657978b2
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-13 13:22:35 +01:00
ba75d4c50b
Properly escape all filenames when exporting breakpoints
2016-11-13 13:22:06 +01:00
57c0773cd7
Fix phpdbg breakpoint restoring after execution completes
2016-11-13 12:44:25 +01:00
1e65d0ea67
Merge branch 'PHP-7.1'
2016-11-13 12:26:13 +01:00
dbd504eaa9
Fix phpdbg ZTS shutdown with USE_ZEND_ALLOC
2016-11-13 12:25:43 +01:00
Nikita Popov