summaryrefslogtreecommitdiff
path: root/sapi/fpm/fpm/fpm_main.c
Commit message (Expand)AuthorAgeFilesLines
* fix indentationAntony Dovgal2014-01-171-5/+5
* Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-srcAntony Dovgal2014-01-161-2/+10
|\
| * Add --force-stderr to fpmGernot Vormayr2014-01-071-2/+10
* | Merge branch 'PHP-5.6'Xinchen Hui2014-01-031-3/+3
|\ \
| * | Bump yearXinchen Hui2014-01-031-3/+3
* | | Merge branch 'PHP-5.6'Xinchen Hui2013-12-271-1/+1
|\ \ \ | |/ /
| * | Fixed bug #66358 (fpm starts segfault)Xinchen Hui2013-12-271-1/+1
* | | Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRM...Kalle Sommer Nielsen2013-12-181-1/+1
|/ /
* | fix limitation of upload size == (U)INT_MAX in CGIMichael Wallner2013-10-281-1/+4
* | Call php_module_shutdown() for php-fpm child processesDylan Arnold2013-09-091-1/+2
|/
* Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-102/+106
|\
| * fix possible null deref (detected by code coverity scan)Remi Collet2013-05-021-102/+106
| * Happy New Year~Xinchen Hui2013-01-011-3/+3
* | When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpmRemi Collet2013-04-301-1/+6
* | Added HTTP codes as of RFC 6585Jonh Wendell2013-02-171-0/+4
* | Happy New YearXinchen Hui2013-01-011-3/+3
* | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-281-2/+16
|\ \ | |/
| * - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-281-2/+16
| * - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-271-6/+10
* | - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-281-6/+10
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-051-3/+3
|\ \ | |/
| * year++Xinchen Hui2012-09-051-3/+3
| * - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and...Jerome Loyet2012-05-261-2/+2
| * - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-251-21/+22
| * - Fix help message for '-R'Jerome Loyet2012-05-231-1/+1
| * - add missing help message for '-R'Jerome Loyet2012-05-231-1/+4
| * - Fixed bug #61835 (php-fpm is not allowed to run as root)Jerome Loyet2012-05-231-1/+7
| * - Fixed bug #61045 (fpm don't send error log to fastcgi clients)Jerome Loyet2012-05-221-3/+30
| * Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)Ondřej Surý2012-03-211-2/+4
| * Always restore PG(magic_quote_gpc) on request shutdownDmitry Stogov2012-02-021-1/+3
| * - Fixed bug #60629 (memory corruption when web server closed the fcgi fd)Jérôme Loyet2012-01-031-3/+3
| * - FR #60199 (enhance FPM error log when the primary script can't be open)Jérôme Loyet2011-11-151-0/+14
| * Fixed bug #60206 (possible integer overflow in content_length)Xinchen Hui2011-11-031-1/+1
| * - Fixed bug #55533 (The -d parameter doesn't work)Jérôme Loyet2011-10-091-14/+20
| * - Backported from 5.4 branch: Jérôme Loyet2011-10-081-7/+7
| * - Backported from 5.4 branch (don't write directly to stderr, use the interna...Jérôme Loyet2011-10-081-20/+5
| * - backparted from 5.4 branch (remove is_fastcgi because FPM is always fastcgi)Jérôme Loyet2011-10-081-127/+76
| * - Backported FR #55181 from 5.4 branch (Enhance security by limiting access t...Jérôme Loyet2011-10-081-0/+6
| * fix a segfault when passing an empty value to a ini parameter from the web se...Jérôme Loyet2011-07-181-3/+9
| * - get rid of FPM_AUTOCONFIG_H which has never existed since FPM integration i...Jérôme Loyet2011-07-171-4/+0
| * - ws and cosmeticsJérôme Loyet2011-07-051-24/+25
| * - Implemented FR #54172 (Overriding the pid file location of php-fpm)Jérôme Loyet2011-07-021-2/+10
| * - Replaced shm_slots with a real scoreboardJérôme Loyet2011-06-261-6/+0
| * - Added custom access log (also added per request %CPU and memory mesurement)Jérôme Loyet2011-06-231-0/+4
| * - Fixed ZTS buildFelipe Pena2011-06-181-1/+1
| * - added xml format to the status pageJérôme Loyet2011-06-171-27/+1
| * Close [PHP-BUG] Req #54152...Jim Jagielski2011-03-091-3/+38
| * add missing dl() function to FPM SAPIAntony Dovgal2011-01-141-0/+1
| * - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has be...Jérôme Loyet2010-11-261-3/+2
| * - extend the 'i-t' fpm argument to dump configuration file when called twice ...Jérôme Loyet2010-11-141-2/+3