summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Fix #67594 - invisible colon should be stripped off header nameTjerk Meesters2014-07-121-4/+8
| | | |
* | | | Merge branch 'master' into phpngDmitry Stogov2014-07-081-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix still broken session test. Only return true/false. Fixed bug #66830 (Empty header causes PHP built-in web server to hang). Followup fix to custom session save handlers create locales and re-add test rm test for now Conflicts: ext/session/tests/session_set_save_handler_class_012.phpt
| * | | Merge branch 'PHP-5.6'Adam Harvey2014-07-071-4/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| | * | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-07-071-4/+3
| | |\ \ | | | |/ | | | | | | | | | | | | * 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-071-4/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | * 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-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into phpngDmitry Stogov2014-06-181-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (41 commits) Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 Update copyright year to 2014 NEWS Fix Request #67453 Allow to unserialize empty data. Update copyright year to 2014 Update copyright year for re2c generated files Update copyright year to 2014 Update copyright year for re2c files as well Fix patch for bug #67436 fix failed test Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function. Added tests for bug 67436 Fixed wrong XFAIL test - already fixed Fix typo in Bug #67406 NEWS entry Fix typo in Bug #67406 NEWS entry ... Conflicts: Zend/zend_compile.c ext/session/session.c ext/standard/array.c ext/standard/http_fopen_wrapper.c tests/classes/bug63462.phpt
| * | | | Merge branch 'PHP-5.6'Adam Harvey2014-06-121-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: Add 308 and 426 to the HTTP response code map in the CLI server.
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-06-121-0/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * 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-121-0/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * 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-121-0/+2
| | | | | | | | | | | | | | | | | | | | Implements FR #67429 (CLI server is missing some new HTTP response codes).
* | | | | Merge branch 'master' into phpngDmitry Stogov2014-06-121-78/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c
| * | | | Move the mime type map out of php_cli_server.c for easier generation.Adam Harvey2014-06-111-63/+1
| | | | |
| * | | | Replace the CLI server's linear search for extensions with a hash table.Adam Harvey2014-06-101-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | This doesn't make a statistically significant performance impact either way today, but gives us more scope to grow the MIME type list.
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-06-101-5/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS NEWS Fixed bug #67406 built-in web-server segfaults on startup
| | * | | 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.
| | | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
* | | | | Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-301-1/+1
| | | | |
* | | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-04-161-0/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS Fixed bug #67079 Missing MIME types for XML/XSL files
| | * | | 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
| | | | |
| | | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | | |
* | | | | Cleanup (1-st round)Dmitry Stogov2014-04-151-2/+2
| | | | |
* | | | | Fixed zend_string*/char* messDmitry Stogov2014-03-181-7/+7
| | | | |
* | | | | Fixed various CLI problemsDmitry Stogov2014-03-141-2/+2
| | | | |
* | | | | Refacting smart_strXinchen Hui2014-02-181-5/+5
| | | | |
* | | | | Use better data structures (incomplete)Dmitry Stogov2014-02-141-45/+46
|/ / / /
* | | | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-1/+1
|\ \ \ \ | |/ / /
| * | | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few ↵Kalle Sommer Nielsen2013-12-181-2/+1
| | | | | | | | | | | | | | | | TSRMLS_FETCH() calls in our various SAPIs
* | | | Kill yet another TSRMLS_FETCH() inside the CLI HTTP serverKalle Sommer Nielsen2013-12-181-3/+2
|/ / /
* | | 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.6Andrea Faulds2013-11-181-0/+79
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 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-181-0/+79
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * CLIGetAllHeadersBackport: Removed UPGRADING note Rewrote test using tcp instead of http:// stream Implemented FR #65917 (getallheaders() is not supported by the built-in...)
| | * | Implemented FR #65917 (getallheaders() is not supported by the built-in...)Andrea Faulds2013-11-121-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge branch 'PHP-5.5'Felipe Pena2013-10-051-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding) - BFN Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
| * | 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)
* | | Merge branch 'PHP-5.5'Christopher Jones2013-09-191-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Added application/pdf to PHP CLI Web Server mime types.
| * | Added application/pdf to PHP CLI Web Server mime types.Christopher Jones2013-09-191-0/+1
| | |
* | | Merge branch 'slim-postdata'Michael Wallner2013-09-171-2/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * slim-postdata: slim post data add NEWS entry; add simple test more precise condition make this work in vc11 too Use int64_t and atoll() after discussion with johannes ws Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
| * | slim post dataMichael Wallner2013-08-271-2/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-09-091-10/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * 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-091-10/+7
| | | | | | | | | | | | 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
View Lorry Controller Status