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
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
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
587497e3a9
define php_ap_map_http_request_error function for older httpd only
2016-12-29 16:07:05 +09:00
d92606a4be
add old versions of httpd support
2016-12-29 00:41:56 +09:00
1bf67622f8
Merge branch 'PHP-7.1'
2016-12-27 21:52:56 +01:00
937115f8c5
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-27 21:52:33 +01:00
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
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
afb6ca2566
Finish remaining replacement uint => uint32_t
...
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
5d7ce72747
Merge branch 'PHP-7.1'
2016-12-22 00:42:05 +01:00
728502fc29
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 00:40:54 +01:00
3b2b080cbc
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
2016-12-22 00:39:24 +01:00
942d4d5614
Merge branch 'PHP-7.1'
2016-12-21 02:43:04 +01:00
7e2146293b
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 02:42:38 +01:00
becda86ae5
Fix issue with -- in phpdbg command line
2016-12-21 02:42:23 +01:00
c3ee875aec
Merge branch 'PHP-7.1'
2016-12-20 20:18:53 +01:00
8b06b7e266
Fixed bug #73794 (Crash (out of memory) when using run and # command separator)
2016-12-20 20:18:36 +01:00
e4db84f231
Merge branch 'PHP-7.1'
2016-12-20 19:49:25 +01:00
3273f15412
Fix segfault in ZTS mode when just printing and exiting in phpdbg
2016-12-20 19:49:04 +01:00
fb98907d2d
typo fixed
2016-12-17 20:26:09 +09:00
9b65a10256
bug fixed #61471 in apache2handler
2016-12-17 13:37:58 +09:00
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
Xinchen Hui