summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/sapi_apache2.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2018-09-091-0/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2018-09-091-0/+1
| |\ \ | | |/
| | * Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2018-09-091-0/+1
| | |\
| | | * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2018-09-091-0/+1
| | | |\
| | | | * Fix for bug #76582Stanislav Malyshev2018-09-091-0/+1
| | * | | year++Xinchen Hui2018-01-021-1/+1
| * | | | year++Xinchen Hui2018-01-021-1/+1
* | | | | Remove unused Git attributes identPeter Kokot2018-07-251-2/+0
* | | | | year++Xinchen Hui2018-01-021-1/+1
|/ / / /
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-03-281-46/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-281-46/+1
| |\ \ \ | | |/ /
| | * | Revert "Fixed bug #61471"Anatol Belski2017-03-281-46/+1
* | | | 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
| |\ \ \ | | |/ /
| | * | Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-sr...Anatol Belski2017-01-051-44/+1
| | * | 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 https://github.com/axot/php-sr...Anatol Belski2017-01-151-44/+1
* | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-021-1/+1
* | | | Merge branch 'PHP-7.1'Xinchen Hui2016-12-291-1/+44
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-12-291-1/+44
| |\ \ \ | | |/ /
| | * | 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
|/ / /
* | | fix build with mod_winntAnatol Belski2016-07-111-0/+8
* | | Pass error severity to SAPI modules and raise corresponding error level in Ap...Martin Vobruba2016-07-111-3/+31
* | | Cleanup zend_signal APIDmitry Stogov2016-06-201-2/+0
|/ /
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
* | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-01-111-9/+9
|\ \ | |/
| * Simplify code per Anatol.Adam Harvey2016-01-111-39/+8
| * Insert bug number.Adam Harvey2016-01-111-1/+1
| * Use strtoll() when apr_off_t is 64 bits.Adam Harvey2016-01-111-9/+40
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ | |/
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
* | fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+5
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-0/+1
|\ \ | |/
| * Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-0/+1
| |\
| | * Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)Stanislav Malyshev2015-04-111-0/+1
| * | Shut up, my lovely compiler; I do not like your warningsBob Weinand2015-02-091-2/+2
| * | Bump yearXinchen Hui2015-01-151-1/+1
| |/
* | Drop VC6 support in sapi/apache2handlerKalle Sommer Nielsen2015-03-291-6/+0
* | Revive Zend Signals handler (and fixed bug #61083)Xinchen Hui2015-03-051-0/+3
* | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-3/+3