summaryrefslogtreecommitdiff
path: root/sapi/cli
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-068-10/+48
|\ | | | | | | | | | | | | | | | | * PHP-5.5: Handle NULL strings in sapi_cli_server_register_variable(). Allow CLI server test scripts to specify the name of the router file. Conflicts: sapi/cli/tests/php_cli_server.inc
| * Handle NULL strings in sapi_cli_server_register_variable().Adam Harvey2015-01-062-0/+39
| | | | | | | | Fixes bug #68745 (Invalid HTTP requests make web server segfault).
| * Allow CLI server test scripts to specify the name of the router file.Adam Harvey2015-01-066-10/+9
| | | | | | | | | | This is required to write tests that behave differently when an index.php isn't present in the document root. (Such as the one I'm about to commit.)
| * Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
* | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
* | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-291-5/+5
|\ \ | |/ | | | | | | * PHP-5.5: fix test with readline on mac
| * fix test with readline on macFerenc Kovacs2014-11-291-5/+5
| |
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | Merge branch 'PHP-5.5' into PHP-5.6Johannes Schlüter2014-09-271-2/+0
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
| |\
| | * This test should passJohannes Schlüter2014-09-271-2/+0
| | |
| * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
* | | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-17/+17
| | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-07-121-4/+8
|\ \ \ | |/ /
| * | Fix #67594 - invisible colon should be stripped off header nameTjerk Meesters2014-07-121-4/+8
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-07-072-4/+46
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| * | 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.
* | | Update copyright year to 2014Lior Kaplan2014-06-181-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-06-181-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014
| * | 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.5' into PHP-5.6Adam Harvey2014-06-122-0/+51
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Add 308 and 426 to the HTTP response code map in the CLI server.
| * | 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).
* | | fix merge from php 5.5 (already fixed, differently)Remi Collet2014-06-101-5/+3
|\ \ \ | |/ /
| * | 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.
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-161-0/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #67079 Missing MIME types for XML/XSL files
| * | Fixed bug #67079 Missing MIME types for XML/XSL filesAnatol Belski2014-04-161-0/+3
| | |
* | | add missing skip to the output, so we actually skip this testFerenc Kovacs2014-04-071-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-02-281-10/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: man page: long option name is --strip, not --stripped --global have be removed in 5.2
| * | 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
| | |
* | | Implement RFC https://wiki.php.net/rfc/default_encodingYasuo Ohgaki2014-02-1318-26/+26
| | |
* | | Bump yearXinchen Hui2014-01-038-9/+9
| | |
* | | cli: don't cast away const in select() timeout argumentArd Biesheuvel2013-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout argument to select() is modified to reflect the time remaining when the function returns on a non-timeout condition. Passing a pointer to const data and casting away the const-ness is asking for trouble, but for some reason, this trouble manifests itself only on non-x86 architectures [whose implementation of select() in glibc is different from the one supplied for x86] Fix this by passing a stack copy of the timeout argument to select()
* | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2013-11-261-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed a wrong test
| * | Fixed a wrong testJulien Pauli2013-11-261-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Andrea Faulds2013-11-182-0/+147
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Removed UPGRADING note Rewrote test using tcp instead of http:// stream Implemented FR #65917 (getallheaders() is not supported by the built-in...)
| * | 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
* | | | Merge branch 'PHP-5.5' into PHP-5.6Christopher Jones2013-11-151-0/+36
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: This is CLI web server change. Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990
| * | | 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
* | | Fixed assumption that the temporary directory is located in /tmpLevi Morrison2013-10-111-1/+1
| | |
* | | Merge branch 'PHP-5.5'Anatol Belski2013-10-071-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: added fixed tests for ICU >= 51.2 fixed failing tests for ICU >= 51.2 FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions. - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding) - BFN
View Lorry Controller Status