Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-18 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-7.0: Remove remnants of TSMRLS_* macro calls | ||||
| * | Remove remnants of TSMRLS_* macro calls | Thomas Punt | 2017-01-18 | 1 | -1/+1 |
| | | |||||
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Better fix for bug #73360 | Anatol Belski | 2016-10-21 | 1 | -3/+3 |
| | | | | | | | | | | This also fixes the TS issue. And, it also reveals that there's an issue in the VCWD_* API to be possibly addressed. | ||||
* | | Revert "Fixed bug #73360 Unable to work in root with unicode chars" | Anatol Belski | 2016-10-21 | 1 | -3/+3 |
| | | | | | | | | This reverts commit 64fee0aecb2c804a088b896da6f736dbc19d8424. | ||||
* | | Fixed bug #73360 Unable to work in root with unicode chars | Anatol Belski | 2016-10-21 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-08-09 | 1 | -6/+2 |
|\ \ | |/ | |||||
| * | Don't copy mime types in CLI server | Nikita Popov | 2016-08-09 | 1 | -6/+2 |
| | | | | | | | | This is both unnecessary and causes leaks in valgrind. | ||||
* | | Pass error severity to SAPI modules and raise corresponding error level in ↵ | Martin Vobruba | 2016-07-11 | 1 | -2/+2 |
| | | | | | | | | Apache | ||||
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-06-24 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify ↵ | Xinchen Hui | 2016-06-24 | 1 | -4/+1 |
| | | | | | | | | router.php) | ||||
* | | Fixed compilation warnings | Dmitry Stogov | 2016-06-21 | 1 | -2/+10 |
| | | |||||
* | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions. | Dmitry Stogov | 2016-06-21 | 1 | -1/+1 |
| | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers. | ||||
* | | Improved support for zend-signals. | Dmitry Stogov | 2016-06-20 | 1 | -0/+1 |
| | | |||||
* | | improve date header code | Anatol Belski | 2016-06-02 | 1 | -15/+17 |
| | | |||||
* | | Added mandatory Date: header to built-in webserver | SeeSchloss | 2016-06-02 | 1 | -0/+8 |
|/ | |||||
* | Merge branch 'PHP-5.6.19' into PHP-7.0.4 | Stanislav Malyshev | 2016-03-01 | 1 | -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.19RC1 | Anatol Belski | 2016-02-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-02-14 | 1 | -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 bug | Anatol Belski | 2016-02-14 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| | | |||||
| * | Added support for HTTP 451 | Julien Pauli | 2015-12-23 | 1 | -0/+1 |
| | | |||||
* | | Fix bug #71005 (Segfault in php_cli_server_dispatch_router()). | Adam Harvey | 2015-12-01 | 1 | -0/+2 |
| | | | | | | | | | | | | 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' | Christoph M. Becker | 2015-09-05 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | | | | | * 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. Becker | 2015-09-05 | 1 | -2/+2 |
| | | | | | | | | | | URI paths have to be treated according to RFC 3986 by the CLI web server, not as application/x-www-form-urlencoded. | ||||
* | | Merge branch 'PHP-5.6' | Christoph M. Becker | 2015-08-14 | 1 | -0/+12 |
|\ \ | |/ | | | | | | | * PHP-5.6: Fix #70264: CLI server directory traversal | ||||
| * | Fix #70264: CLI server directory traversal | Christoph M. Becker | 2015-08-14 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | 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. Becker | 2015-08-09 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | | | * PHP-5.6: Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE added tests for bug #66606 | ||||
| * | Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE | wusuopu | 2015-08-09 | 1 | -0/+3 |
| | | | | | | | | The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field. | ||||
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 1 | -11/+11 |
| | | | | | | | | semantick changes). | ||||
* | | Merge branch 'PHP-5.6' | Christoph M. Becker | 2015-06-27 | 1 | -0/+3 |
|\ \ | |/ | | | | | | | * PHP-5.6: Fix #64878: 304 responses return Content-Type header | ||||
| * | Fix #64878: 304 responses return Content-Type header | Christoph M. Becker | 2015-06-27 | 1 | -0/+3 |
| | | | | | | | | | | According to RFC 7232 304 responses should not send a Content-Type header, so the CLI server should comply. | ||||
| * | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | |||||
| * | Fix bug #68784 | Rasmus Lerdorf | 2015-01-09 | 1 | -1/+1 |
| | | |||||
* | | cleanup more redundant S_IS* declarations | Anatol Belski | 2015-05-25 | 1 | -4/+0 |
| | | |||||
* | | Drop zend_indent() as it was never used, complete or working | Kalle Sommer Nielsen | 2015-03-27 | 1 | -1/+0 |
| | | |||||
* | | made ZEND_TSRMLS_CACHE_* macros look like function calls | Anatol Belski | 2015-02-16 | 1 | -1/+1 |
| | | | | | | | | which also comply with the current semantics for such macros | ||||
* | | remove useless condition (same as headers_list()) | Anatol Belski | 2015-02-13 | 1 | -3/+0 |
| | | |||||
* | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | |||||
* | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 1 | -1/+1 |
| | | |||||
* | | Fix bug #68784 | Rasmus Lerdorf | 2015-01-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-5.6' | Adam Harvey | 2015-01-06 | 1 | -0/+5 |
|\ \ | |/ | | | | | | | | | | | | | | | * PHP-5.6: 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/php_cli_server.c | ||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2015-01-06 | 1 | -0/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Harvey | 2015-01-06 | 1 | -0/+5 |
| | | | | | | | | | | | | Fixes bug #68745 (Invalid HTTP requests make web server segfault). | ||||
| | * | Fix php cli (-S option) inconsistent port parsing | nil0x42 | 2014-11-30 | 1 | -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 parsing | nil0x42 | 2014-11-30 | 1 | -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). | ||||
* | | | Unify HTTP status code maps | Andrea Faulds | 2014-12-21 | 1 | -56/+6 |
| | | | |||||
* | | | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -115/+115 |
| | | |