summaryrefslogtreecommitdiff
path: root/sapi/fpm/fpm/fpm_main.c
Commit message (Expand)AuthorAgeFilesLines
* fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+4
* Encapsulate FastCGI implementation details.Dmitry Stogov2015-06-231-13/+14
* Seems useless nowXinchen Hui2015-05-271-0/+2
* Merge branch 'master' into merge-fastcgiXinchen Hui2015-05-271-1/+1
|\
| * Merge branch 'PHP-5.6'Xinchen Hui2015-05-261-1/+1
| |\
| | * Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-05-261-1/+1
| | |\
| | | * Fixed C89Xinchen Hui2015-05-261-1/+1
* | | | Micro optimizationsXinchen Hui2015-05-261-11/+11
* | | | Avoid multipy allocating of request envXinchen Hui2015-05-241-0/+1
* | | | Use weak function for fcgi_logXinchen Hui2015-05-231-0/+7
* | | | Fixed fpm-side (tests passes)Xinchen Hui2015-05-231-31/+64
|/ / /
* | | Merged fastcgi.* reated changes from sapi/cgiDmitry Stogov2015-05-131-64/+71
* | | Drop zend_indent() as it was never used, complete or workingKalle Sommer Nielsen2015-03-271-1/+0
* | | Revert "Cleanup globals initialization"Xinchen Hui2015-02-131-1/+1
* | | Revert "Remove useless TSRMLS by merge"Xinchen Hui2015-02-131-1/+1
* | | Remove useless TSRMLS by mergeXinchen Hui2015-02-131-1/+1
* | | Cleanup globals initializationXinchen Hui2015-02-131-1/+1
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-01-271-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-271-1/+1
| |\ \ | | |/
| | * fcgi_write in fpm returns ssizt_t, but it returns int in cgiXinchen Hui2015-01-271-1/+1
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-01-271-1/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-271-1/+5
| |\ \ | | |/
| | * Also Fixed #68571 in CGI SAPI, and some cleanupXinchen Hui2015-01-271-5/+5
| | * Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src int...Xinchen Hui2015-01-271-1/+5
| | |\
| | | * follow C89 formatredfoxli2014-12-101-1/+2
| | | * fix-bug-68571-to-php5.5redfoxli2014-12-091-1/+4
| | * | Bump yearXinchen Hui2015-01-151-3/+3
| | |/
| * | bump yearXinchen Hui2015-01-151-3/+3
* | | Remove dl() on fpm-fcgiNikita Popov2015-01-261-12/+1
* | | bump yearXinchen Hui2015-01-151-3/+3
* | | Faster sorting algoXinchen Hui2015-01-141-1/+1
* | | trailing whitespace removalStanislav Malyshev2015-01-101-11/+11
* | | Unify HTTP status code mapsAndrea Faulds2014-12-211-53/+5
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-126/+125
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
* | | Merge branch 'PHP-5.6'Remi Collet2014-09-151-0/+11
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-09-151-0/+11
| |\ \ | | |/
| | * Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when us...Remi Collet2014-09-151-0/+11
| | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-281-3/+8
| | * Bump yearXinchen Hui2014-01-031-3/+3
* | | Fixed incompatible pointer type (int64)Xinchen Hui2014-08-261-4/+4
* | | Remove ZEND_ACC_INTERACTIVE and CG(interactive)Nikita Popov2014-08-251-1/+0
* | | Merge branch 'master' into phpngDmitry Stogov2014-08-141-0/+28
|\ \ \
| * \ \ Merge branch 'PHP-5.6'Ferenc Kovacs2014-08-121-0/+28
| |\ \ \ | | |/ /
| | * | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-091-3/+8
| | * | Revert "Merge branch 'pull-request/694' into PHP-5.6"David Zuelke2014-08-091-1/+24
* | | | Merge branch 'master' into testDmitry Stogov2014-07-011-24/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-06-301-24/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'pull-request/694' into PHP-5.6Ferenc Kovacs2014-06-301-24/+1
| | |\ \
| | | * | Fix SetHandler proxy:fcgi:// incompatibilitiesDavid Zülke2014-06-121-24/+1