summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-12-031-1/+1
|\
| * Fix minor typoAdrien Crivelli2016-12-031-1/+1
* | Revert "Revert "Remove a few unused write warning""Bob Weinand2016-11-204-6/+7
* | Revert "Remove a few unused write warning (backport from master, oops)s"Nikita Popov2016-11-204-6/+6
* | Remove a few unused write warning (backport from master, oops)sBob Weinand2016-11-204-6/+6
* | Merge branch 'PHP-5.6' into PHP-7.0Dmitry Stogov2016-11-171-1/+1
|\ \ | |/
| * Fixed testDmitry Stogov2016-11-171-1/+1
* | Merge branch 'pull-request/2097'Joe Watkins2016-10-171-2/+4
* | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-09-231-17/+20
|\ \ | |/
| * Formatting. Fix possible memory corruption in FPM SHM managementJulien Pauli2016-09-231-12/+16
| * fix every work call mmaptom9162016-09-231-13/+12
| * Fix bug #72836 - integer overflow in base64_decode caused heap corruptionStanislav Malyshev2016-08-161-0/+413
* | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-07-222-3/+84
|\ \ | |/
| * FPM: add test for CVE-2016-5385Remi Collet2016-07-222-3/+84
* | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-07-121-2/+2
|\ \ | |/
| * Fix #72575: using --allow-to-run-as-root should ignore missing usergooh2016-07-121-2/+2
* | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-07-112-2/+0
|\ \ | |/
| * Remove needless zeroing of anonymously mmap'd memoryJulien Pauli2016-07-111-1/+0
| * Remove needless zeroing of anonymously mmap'd memoryMichael McConville2016-07-111-1/+0
* | Fixed bug #72308 (fastcgi_finish_request and logging environment variables)Xinchen Hui2016-06-021-1/+1
* | Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2016-04-181-0/+6
|\ \ | |/
| * mark frequent intermittent fpm test with XFAILFerenc Kovacs2016-04-181-0/+6
* | fpm: call zend_signal_init() in childMickaƫl2016-02-151-0/+4
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-02-081-1/+1
|\ \ | |/
| * Align spacing in make install messagesLior Kaplan2016-02-081-1/+1
* | Merge branch 'PHP-5.6' into PHP-7.0Remi Collet2016-01-291-1/+25
|\ \ | |/
| * Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setupRemi Collet2016-01-291-1/+25
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-01-051-0/+5
| |\
| | * Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2015-12-081-0/+5
* | | Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0Anatol Belski2016-01-061-0/+5
|\ \ \
| * | | Fixed bug #70755: fpm_log.c memory leak and buffer overflowStanislav Malyshev2016-01-041-0/+5
* | | | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2016-01-041-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-031-2/+2
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-0113-15/+15
|\ \ \ | |/ /
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-0115-17/+17
| * | Added support for HTTP 451Julien Pauli2015-12-231-0/+1
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2015-11-231-1/+1
|\ \ \ | |/ /
| * | Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_i...Lior Kaplan2015-11-231-1/+1
* | | Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on s...Xinchen Hui2015-11-022-3/+33
* | | Add test_fpm_conf to skip some tests ranth than mark --xfail--Xinchen Hui2015-11-022-5/+25
* | | Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer reqe...Xinchen Hui2015-09-221-1/+1
* | | Fixed bug #70538 ("php-fpm -i" crashes)Xinchen Hui2015-09-211-2/+1
* | | Fixed bug #70538 ("php-fpm -i" crashes)Xinchen Hui2015-09-211-1/+1
* | | fix zend signal and tsrm compatzend-signal-ztsJoe Watkins2015-09-011-0/+4
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without s...Dmitry Stogov2015-06-302-2/+2
* | | Encapsulate FastCGI implementation details.Dmitry Stogov2015-06-231-13/+14
* | | FIx darwin buildStanislav Malyshev2015-05-311-1/+1
* | | 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
| |\ \ \ | | |/ /