summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-07-072-4/+46
|\ | | | | | | | | * PHP-5.4: Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| * Fixed bug #66830 (Empty header causes PHP built-in web server to hang).Adam Harvey2014-07-072-4/+46
| | | | | | | | | | | | | | | | We had an infinite loop in sapi_cli_server_send_headers(): while iterating over the linked list of headers, when an empty header was hit, continue would go to the next iteration of the loop without updating h to be the next value in the linked list. Updating it to always increment regardless of whether the header is actually valid or not fixes the issue.
* | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-181-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: Update copyright year to 2014 Update copyright year to 2014
| * Update copyright year to 2014Lior Kaplan2014-06-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-122-0/+51
|\ \ | |/ | | | | | | * PHP-5.4: Add 308 and 426 to the HTTP response code map in the CLI server.
| * Add 308 and 426 to the HTTP response code map in the CLI server.Adam Harvey2014-06-122-0/+51
| | | | | | | | Implements FR #67429 (CLI server is missing some new HTTP response codes).
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-3/+3
|\ \ | |/ | | | | | | | | * PHP-5.4: NEWS Fixed bug #67406 built-in web-server segfaults on startup
| * Fixed bug #67406 built-in web-server segfaults on startupRemi Collet2014-06-101-3/+3
| | | | | | | | | | | | | | | | Reproduce on aarch64. From select man page: "select() may update the timeout argument to indicate how much time was left." So "const" is not ok.
* | Fixed bug #67079 Missing MIME types for XML/XSL filesAnatol Belski2014-04-161-0/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-02-281-10/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: man page: long option name is --strip, not --stripped --global have be removed in 5.2
| * man page: long option name is --strip, not --strippedRemi Collet2014-02-281-1/+1
| |
| * --global have be removed in 5.2Remi Collet2014-02-281-9/+0
| |
| * Bump yearXinchen Hui2014-01-034-5/+5
| |
* | Bump yearXinchen Hui2014-01-038-9/+9
| |
* | Fixed a wrong testJulien Pauli2013-11-261-1/+1
| |
* | Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5Andrea Faulds2013-11-182-0/+147
|\ \ | | | | | | | | | | | | | | | | | | * CLIGetAllHeadersBackport: Removed UPGRADING note Rewrote test using tcp instead of http:// stream Implemented FR #65917 (getallheaders() is not supported by the built-in...)
| * | Rewrote test using tcp instead of http:// streamAndrea Faulds2013-11-121-17/+39
| | |
| * | Implemented FR #65917 (getallheaders() is not supported by the built-in...)Andrea Faulds2013-11-122-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Implemented apache_request_headers() and getallheaders() alias in CLI server - Implemented apache_response_headers() in CLI server using FastCGI code Conflicts: NEWS UPGRADING
* | | This is CLI web server change. Added some common MIME types to theChristopher Jones2013-11-151-0/+36
|/ / | | | | | | | | | | | | | | existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990 A router can be used to add to, or override, the MIME type lookups, see http://php.net/manual/en/features.commandline.webserver.php
* | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-051-0/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding) - BFN
| * - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer ↵Felipe Pena2013-10-051-0/+1
| | | | | | | | encoding)
* | Fixed bug #65678 the test cli_process_title_windows will fails on particular ↵Anatol Belski2013-09-201-3/+4
| | | | | | | | | | | | environnement Patch by Pierre Renaudet
* | Added application/pdf to PHP CLI Web Server mime types.Christopher Jones2013-09-191-0/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-09-092-10/+55
|\ \ | |/ | | | | | | | | | | | | | | | | * PHP-5.4: Handle CLI server request headers case insensitively. 5.4.21 now Conflicts: configure.in main/php_version.h
| * Handle CLI server request headers case insensitively.Adam Harvey2013-09-092-10/+55
| | | | | | | | Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
* | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | uninitialized' warnings.
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-142-12/+13
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Add built-in web server to invocation list Terminology: change embedded web server to built-in web server to align with cli usage Align -B and -E parameter names with cli usage (begin_code and end_code) Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
| * Add built-in web server to invocation listLior Kaplan2013-07-141-1/+2
| |
| * Terminology: change embedded web server to built-in web server to align with ↵Lior Kaplan2013-07-141-3/+3
| | | | | | | | cli usage
| * Align -B and -E parameter names with cli usage (begin_code and end_code)Lior Kaplan2013-07-141-8/+8
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-07-021-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fix typo in php man page
| * fix typo in php man pageRemi Collet2013-07-021-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-07-021-0/+2
|\ \ | |/ | | | | | | | | | | * PHP-5.4: Fixed Bug #65142 Missing phar man page NEWS Fixed Bug #65143 Missing php-cgi man page
| * Fixed Bug #65143 Missing php-cgi man pageRemi Collet2013-07-021-0/+2
| | | | | | | | | | | | | | Currently php-cgi man page is a simple redirect to php (CLI) man page. Could be splited / improved in the future.
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-06-204-18/+151
|\ \ | |/ | | | | | | | | * PHP-5.4: Fix the spelling of the php_cli_server_http_response_status_code_pair typedef. Change the search in get_status_string() to correctly handle unknown codes.
| * Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.Adam Harvey2013-06-201-8/+8
| | | | | | | | | | Specifically: php_cli_server_http_reponse_status_code_pair → php_cli_server_http_response_status_code_pair.
| * Change the search in get_status_string() to correctly handle unknown codes.Adam Harvey2013-06-204-13/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This previously used a buggy implementation of binary search that would loop infinitely for unknown codes when searching in reason arrays of particular sizes (such as the one we have at the moment). Since C provides bsearch(), we'll just use that instead, since libc authors hopefully get this right. There was also an additional bug that was masked by the first one: the design was that an unknown code would result in get_status_string() returning NULL, which would then result in a segfault in append_http_status_line(), since it assumed that it would always receive a valid string pointer that could be handed off to smart_str_appends_ex(). We'll now return a placeholder in that case. Fixes bug #65066 (Cli server not responsive when responding with 422 http status code).
| * Forgot to fix the test on 5.4Nikita Popov2013-03-281-1/+1
| |
* | leave a sane environment behind (even if empty) when exitingNuno Lopes2013-04-071-0/+4
| | | | | | | | some OS atexit() handlers call getenv()
* | missed part of the patchXinchen Hui2013-03-291-0/+1
| |
* | Fixed bug #64544 (Valgrind warnings after using putenv)Xinchen Hui2013-03-292-5/+27
| | | | | | | | | | The frozen_envion is needed, since if an item in environ is updated (like the test script HOME one), invalid free still shows up
* | Merge branch 'pull-request/313' into PHP-5.5Keyur Govande2013-03-292-5/+9
|\ \ | | | | | | | | | | | | * pull-request/313: Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
| * | Patch for Bug #64544.Keyur Govande2013-03-292-5/+9
| | | | | | | | | | | | | | | | | | The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
* | | Fix Bug #64545: PHP Error in ef93a93ee21bce9218188Nikita Popov2013-03-281-1/+1
| | | | | | | | | | | | Test was using die "Foo" instead of die("Foo").
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-2/+7
|\ \ \ | | |/ | |/|
| * | Attempt to fix SKIPXinchen Hui2013-03-281-2/+7
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-1/+1
|\ \ \ | |/ /
| * | Fix test on Mac (\D shows up)Xinchen Hui2013-03-281-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-0/+62
|\ \ \ | |/ /