summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-01-011-0/+82
|\ | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c
| * Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-011-0/+82
| | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
| * Happy New YearXinchen Hui2013-01-014-5/+5
| |
* | Happy New YearXinchen Hui2013-01-014-5/+5
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Lars Strojny2012-12-142-134/+35
|\ \ | |/
| * update test for supported Mime Types checkingpascalc2012-12-141-133/+31
| |
| * update list of common Mime Types in PHP development server to support Web ↵pascalc2012-12-141-1/+4
| | | | | | | | audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
* | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-141-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Fixed test sapi/cli/tests/006.phpt
| * Fixed test sapi/cli/tests/006.phptAnatoliy Belsky2012-11-141-1/+1
| | | | | | | | Third param in preg_match_all() is optional for a while )
* | Merge branch 'PHP-5.4'Xinchen Hui2012-10-103-33/+21
|\ \ | |/
| * Implemented FR #63242 (Default error page in PHP built-in web server uses ↵Xinchen Hui2012-10-103-33/+21
| | | | | | | | outdated html/css)
* | Merge branch 'PHP-5.4'Xinchen Hui2012-10-101-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
| |\
| | * Remove executable permission on phptXinchen Hui2012-10-101-0/+0
| | |
* | | Merge branch 'PHP-5.4'Lars Strojny2012-09-183-0/+48
|\ \ \ | |/ /
| * | Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserverLars Strojny2012-09-183-0/+48
| | |
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-09-154-22/+71
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Respond with 501 to unknown request methods
| * | Respond with 501 to unknown request methodsNiklas Lindgren2012-09-154-22/+71
| | | | | | | | | | | | | | | | | | | | | | | | Fixed typo Moved 501 response from dispatch to event_read_request Return return value of send_error_page
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-09-051-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-051-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/interbase/interbase.rc
* | | Merge branch 'PHP-5.4'Felipe Pena2012-08-161-1/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
| * | - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not ↵Felipe Pena2012-08-161-1/+4
| | | | | | | | | | | | set)
* | | Merge branch 'pull-request/132'Stanislav Malyshev2012-08-052-70/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | * pull-request/132: OK, bye bye JavaScript, let's just include credits before license Nicer (JSLint-compliant!) credits reveal JavaScript Removed now-unnecessary expose_php checks for logo Fixed small misalignment in prev commit Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
| * | Removed Logo GUIDs and replaced with Data URIs and div hidden with JSAndrew Faulds2012-07-142-70/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - removed php_logo_guid() - removed php_egg_logo_guid() - removed php_real_logo_guid() - removed zend_logo_guid() - removed logo GUID handling - removed logo GUIDs from source - added logo data URIs instead for phpinfo() - added credits to phpinfo() page, but hidden by default
* | | Fixed bug #62725 (Calling exit() in a shutdown function does not return the ↵Xinchen Hui2012-08-021-3/+3
| | | | | | | | | | | | | | | | | | exit value) The fix is make 5.4 behavior consistent with 5.3
* | | Sleep a little bit more, in some slow machine (like gcov), it will take a ↵Xinchen Hui2012-08-011-1/+1
| | | | | | | | | | | | little more time to setup server
* | | Implemented FR #62700 (have the console output 'Listening on ↵Xinchen Hui2012-07-311-1/+1
| | | | | | | | | | | | http://localhost:8000')
* | | Fix Bug #62612 readline extension compilation failsJohannes Schlüter2012-07-221-0/+2
| | |
* | | Improve error message for ssl requestXinchen Hui2012-07-221-1/+5
|/ /
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-271-0/+3
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Fix memleak in CLI Conflicts: sapi/cli/php_cli.c
| * Fix memleak in CLIJohannes Schlüter2012-06-271-0/+3
| |
* | Fix potential leak in cli serverstealth352012-06-161-0/+3
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-291-1/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt sync with HEAD Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) - Fixed bug #62160 (Add process.priority to set nice(2) priorities) - add missing headers to avoid warnings - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) Conflicts: NEWS sapi/fpm/fpm/fpm_main.c
| * Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phptMatt Ficken2012-05-291-1/+10
| |
* | Correct test titleXinchen Hui2012-05-091-1/+1
| |
* | Implemented FR #61977 (Need CLI web-server support for files with .htm & svg ↵Xinchen Hui2012-05-092-5/+164
| | | | | | | | extensions)
* | Fix test failed, the fsockopen will be refused immediately if the server is ↵Xinchen Hui2012-05-091-10/+7
| | | | | | | | not set up.
* | TypoDavid Soria Parra2012-05-081-1/+1
| |
* | Fix bug 61769 Random failure of php_cli_server*phpt testsMatt Ficken2012-05-062-2/+25
| |
* | correct variable nameXinchen Hui2012-05-061-14/+14
| |
* | Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4Xinchen Hui2012-04-302-3/+30
|\ \ | |/ | | | | | | | | | | | | | | * origin/PHP-5.3: Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). - BFN Conflicts: sapi/cli/php_cli.c
| * Fixed bug #61546 (functions related to current script failed when chdir() in ↵Xinchen Hui2012-04-302-3/+30
| | | | | | | | cli sapi).
| * more verbose skip reason in test files with not so obvious extension ↵Olivier DOUCET2012-02-253-3/+3
| | | | | | | | requirements
| * - Year++Felipe Pena2012-01-013-4/+4
| |
| * stream_socket_server("unix://..." has a length limit, so it is better to use ↵Ferenc Kovacs2011-10-221-1/+1
| | | | | | | | the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106
| * there is a length limit on the shebang line, ignore the tests for >= 127Ferenc Kovacs2011-10-201-0/+4
| |
| * Update log, marking 5.4 and trunk as XFAIL due to bug #55496Christopher Jones2011-08-231-7/+27
| |
| * Prevented the warning about truncate int to charXinchen Hui2011-08-081-1/+1
| |
| * - reflection is always enabledPierre Joye2011-06-251-11/+0
| |
| * - Fix missing change from r303357 (related to bug #48831)Felipe Pena2011-06-111-1/+1
| |
View Lorry Controller Status