summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/sapi_apache2.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.4'Nikita Popov2020-06-241-1/+1
|\ | | | | | | | | * PHP-7.4: Fixed bug #79030 Use usec from apache request time
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2020-06-241-1/+1
| |\ | | | | | | | | | | | | * PHP-7.3: Fixed bug #79030 Use usec from apache request time
| | * Fixed bug #79030 Use usec from apache request timeHerbert2562020-06-241-1/+1
| | | | | | | | | | | | | | | | | | Don't unnecessarily truncate to milliseconds. Closes GH-5760.
* | | Constify char * arguments of APIstwosee2020-06-081-3/+3
| | | | | | | | | | | | Closes GH-5676.
* | | Fix MSVC level 1 (severe) warningsChristoph M. Becker2020-06-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fix (hopefully) all instances of: * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4005> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4024> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4028> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4047> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4087> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4090> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4273> * <https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4312> `zend_llist_add_element()` and `zend_llist_prepend_element()` now explicitly expect a *const* pointer. We use the macro `ZEND_VOIDP()` instead of a `(void*)` cast to suppress C4090; this should prevent accidential removal of the cast by clarifying the intention, and makes it easier to remove the casts if the issue[1] will be resolved sometime. [1] <https://developercommunity.visualstudio.com/content/problem/390711/c-compiler-incorrect-propagation-of-const-qualifie.html>
* | | Remove mention of PHP major version in Copyright headersGabriel Caruso2019-09-251-2/+0
| | | | | | | | | | | | Closes GH-4732.
* | | Merge branch 'PHP-7.4'Nikita Popov2019-07-161-5/+1
|\ \ \ | |/ /
| * | Introduce zend_stream_init_filename()Nikita Popov2019-07-161-5/+1
| | | | | | | | | | | | Avoid more ad-hoc initialization of zend_file_handle structures.
* | | Merge branch 'PHP-7.4'Dmitry Stogov2019-03-141-2/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
| * | Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.Dmitry Stogov2019-03-141-2/+1
| | |
* | | Merge branch 'PHP-7.4'Dmitry Stogov2019-03-121-0/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.4: Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
| * | Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.cDmitry Stogov2019-03-121-0/+4
| | |
* | | Remove major version from apache moduleNikita Popov2019-02-051-3/+3
|/ /
* | Remove local variablesPeter Kokot2019-02-031-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
* | Remove yearly range from copyright noticeZeev Suraski2019-01-301-1/+1
| |
* | Stop Apache if PHP wasn't started successful.Dmitry Stogov2018-10-291-1/+3
|/
* Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2018-09-301-1/+8
|\
| * Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-301-1/+8
| |\
| | * Fixed bug #75479Nikita Popov2018-09-301-1/+8
| | | | | | | | | | | | Wrap the zend_signal_init() call, so the hook arguments line up.
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2018-09-091-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Update NEWS Fix for bug #76582
| * | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2018-09-091-0/+1
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.1: Update NEWS Fix for bug #76582
| | * Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2018-09-091-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Update NEWS Fix for bug #76582
| | | * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2018-09-091-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS Fix for bug #76582
| | | | * Fix for bug #76582Stanislav Malyshev2018-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The brigade seems to end up in a messed up state if something fails in shutdown, so we clean it up.
| | * | | year++Xinchen Hui2018-01-021-1/+1
| | | | |
| * | | | year++Xinchen Hui2018-01-021-1/+1
| | | | |
* | | | | Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* | | | | year++Xinchen Hui2018-01-021-1/+1
|/ / / /
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-03-281-46/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-7.1: update NEWS update NEWS Revert "Fixed bug #61471"
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-281-46/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-7.0: update NEWS Revert "Fixed bug #61471"
| | * | Revert "Fixed bug #61471"Anatol Belski2017-03-281-46/+1
| | | | | | | | | | | | | | | | This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.
* | | | Merge branch 'PHP-7.1'Nikita Popov2017-02-081-1/+46
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-081-1/+46
| |\ \ \ | | |/ /
| | * | Fixed bug #61471Zheng SHAO2017-02-081-1/+46
| | | |
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-44/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
| | * | Revert "Merge branch 'bugfix_timeout_61471' of ↵Anatol Belski2017-01-051-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.
| | * | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| | | |
| * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| | | |
* | | | Revert "Merge branch 'bugfix_timeout_61471' of ↵Anatol Belski2017-01-151-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5. (cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15) Something went wrong, so the revert didn't land in master. Cherry-picking extra therefore.
* | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
| | | |
* | | | Merge branch 'PHP-7.1'Xinchen Hui2016-12-291-1/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.1: define php_ap_map_http_request_error function for older httpd only add old versions of httpd support typo fixed bug fixed #61471 in apache2handler
| * | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-12-291-1/+44
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: define php_ap_map_http_request_error function for older httpd only add old versions of httpd support typo fixed bug fixed #61471 in apache2handler
| | * | define php_ap_map_http_request_error function for older httpd onlyZheng SHAO2016-12-291-31/+24
| | | |
| | * | add old versions of httpd supportZheng SHAO2016-12-291-0/+34
| | | |
| | * | typo fixedZheng SHAO2016-12-171-1/+1
| | | |
| | * | bug fixed #61471 in apache2handlerZheng SHAO2016-12-171-1/+17
| | | |
* | | | Remove Netware supportKalle Sommer Nielsen2016-11-121-13/+2
|/ / / | | | | | | | | | If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
* | | fix build with mod_winntAnatol Belski2016-07-111-0/+8
| | |
* | | Pass error severity to SAPI modules and raise corresponding error level in ↵Martin Vobruba2016-07-111-3/+31
| | | | | | | | | | | | Apache
* | | Cleanup zend_signal APIDmitry Stogov2016-06-201-2/+0
|/ /
View Lorry Controller Status