summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* Remove remnants of TSMRLS_* macro callsThomas Punt2017-01-181-1/+1
|
* Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-131-3/+3
| | | | | 1. Increased sleep time from 25ms to 50ms 2. Added sleep to shutdown handlers
* Fixed #73902 mention router support in usage output for php-cliJoe Watkins2017-01-101-1/+1
|
* Update copyright headers to 2017Sammy Kaye Powers2017-01-049-10/+10
|
* Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-0/+3
| | | | This allows us to unfork a bunch of tests for Windows.
* Makes the sapi web server and curl tests more reliableMitch Hagstrand2016-12-272-18/+56
| | | | | | | | 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.
* Don't copy mime types in CLI serverNikita Popov2016-08-091-6/+2
| | | | This is both unnecessary and causes leaks in valgrind.
* Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-281-1/+6
|\
| * Fix #72676: Test cli_process_title_unix fails on AIXChristoph M. Becker2016-07-281-1/+6
| | | | | | | | Patch provided by matthieu dot sarter dot external at atos dot net.
* | MFH: Fixed fd leak (the origin commit can not be cherry-picked)Xinchen Hui2016-06-281-1/+3
| |
* | Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify ↵Xinchen Hui2016-06-241-4/+1
| | | | | | | | router.php)
* | fix size_t signed comparisonJoe Watkins2016-04-291-1/+1
| |
* | Fixed failed with libeditXinchen Hui2016-04-151-0/+3
| |
* | Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not ↵Sean DuBois2016-03-152-4/+46
| | | | | | | | properly set $argi and $argn
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-03-034-5/+23
|\ \ | |/
| * Fixed bug #69953Christoph M. Becker2016-03-034-5/+23
| | | | | | | | Added support for MKCALENDAR request method in CLI web server.
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | Also re bug #71575.
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-03-031-0/+4
|\ \ | |/
| * Disable upload_2G test on travisNikita Popov2016-03-031-0/+4
| |
| * fix ts buldAnatol Belski2016-02-181-1/+1
| |
* | Merge branch 'PHP-5.6.19' into PHP-7.0.4Stanislav Malyshev2016-03-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.19: fix test file Fix version update NEWS Update NEWS Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() fix ts buld prep for 5.6.19RC1 5.6.20 is next Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize Conflicts: configure.in ext/wddx/wddx.c main/php_version.h
| * | fix ts buldphp-5.6.19RC1Anatol Belski2016-02-181-1/+1
| |/
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-02-141-0/+13
|\ \ | |/ | | | | | | * PHP-5.6: Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
| * Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bugAnatol Belski2016-02-141-0/+13
| |
* | be more precise about the meaning of -nJoe Watkins2016-02-101-1/+1
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-181-5/+5
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: fork test fix test fork test fork test for win32 fork test
| * fix testAnatol Belski2016-01-181-5/+5
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-031-1/+1
| |
* | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-018-9/+9
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-018-9/+9
| |
| * Added support for HTTP 451Julien Pauli2015-12-231-0/+1
| |
* | Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).Adam Harvey2015-12-012-0/+48
| | | | | | | | | | | | We didn't initialise the retval variable in php_cli_server_dispatch_router(); let's now initialise it to be IS_UNDEF, as the following if condition expects.
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2015-11-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | * 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
| * Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: ↵Lior Kaplan2015-11-231-2/+2
| | | | | | | | php_register_internal_extensions)
| * Ensure the test failsXinchen Hui2015-11-111-0/+4
| |
* | Update mime type generator script to keep track of additional mime-typesReeze Xia2015-11-152-1/+13
| |
* | Added support for CSS/JavaScript source mapsThorsten Rinne2015-11-151-0/+1
| | | | | | Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
* | Ensure the test failsXinchen Hui2015-11-111-0/+4
| |
* | Fixed bug #70863 Incorect logic to increment_function for proxy objectsAnatol Belski2015-11-061-1/+1
| |
* | Add NTS/ZTS information to php -vBob Weinand2015-09-301-8/+11
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2015-09-111-0/+41
|\ \ | |/
| * Add test XFAIL for bug #70470Xinchen Hui2015-09-111-0/+41
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-09-052-2/+23
|\ \ | |/ | | | | | | | | | | | | * PHP-5.6: Fix #68291: 404 on urls with '+' Resolved conflicts: sapi/cli/php_cli_server.c
| * Fix #68291: 404 on urls with '+'Christoph M. Becker2015-09-052-2/+23
| | | | | | | | | | URI paths have to be treated according to RFC 3986 by the CLI web server, not as application/x-www-form-urlencoded.
* | fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+4
| |
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-142-0/+33
|\ \ | |/ | | | | | | * PHP-5.6: Fix #70264: CLI server directory traversal
| * Fix #70264: CLI server directory traversalChristoph M. Becker2015-08-142-0/+33
| | | | | | | | | | | | | | | | On Windows the built-in webserver doesn't prevent directory traversal when backslashes are used as path component separators. Even though that is not a security issue (the CLI webserver is meant for testing only), we fix that by replacing backslashes in the path with slashes on Windows, because backslashes may be valid characters for file names on other systems, but not on Windows.
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-08-093-0/+66
|\ \ | |/ | | | | | | | | * PHP-5.6: Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE added tests for bug #66606
View Lorry Controller Status