Commit Graph

94 Commits

Author SHA1 Message Date
Jérôme Loyet
dd243e5c75 ws 2011-10-08 14:11:37 +00:00
Jérôme Loyet
509629d8b5 - Backported from 5.4 branch (Dropped restriction of not setting the same value multiple times, the last one holds). 2011-10-08 14:07:47 +00:00
Jérôme Loyet
4e396d7333 - Backported from 5.4 branch:
* enhanced log messages
  * code cosmetic
2011-10-08 14:04:09 +00:00
Jérôme Loyet
93c3c0abfa - Backported from 5.4 branch (order fpm configuration items the same way in php-fpm.conf.in, fpm_conf.h and fpm_conf.c) 2011-10-08 14:00:07 +00:00
Jérôme Loyet
7fc36a5210 - Backported from 5.4 branch (don't write directly to stderr, use the internal logger instead (zlog)) 2011-10-08 13:57:31 +00:00
Jérôme Loyet
4ef746ae25 remove unused variable 2011-10-08 13:53:49 +00:00
Jérôme Loyet
9018d9434e - backparted from 5.4 branch (remove is_fastcgi because FPM is always fastcgi) 2011-10-08 13:52:27 +00:00
Jérôme Loyet
c6b633a32a - Backported FR #55166 from 5.4 branch (Added process.max to control the number of process FPM can fork) 2011-10-08 13:47:52 +00:00
Jérôme Loyet
c4e961f06e - Backported FR #55181 from 5.4 branch (Enhance security by limiting access to user defined extensions) 2011-10-08 13:42:31 +00:00
Jérôme Loyet
a0f2d34b19 - Backported FR #54098 from 5.4 branch (Lowered process manager default value) 2011-10-08 13:38:28 +00:00
Jérôme Loyet
eccb940419 - Backported FR #52052 from 5.4 branch (Added partial syslog support) 2011-10-08 13:35:03 +00:00
Jérôme Loyet
4a0cd3946f - commit r312812 again (dropped in r312913):
Implemented FR #54577 (Enhanced status page with full status and details
    about each processes. Also provide a web page (status.html) for
    real-time FPM status.
2011-10-08 13:29:14 +00:00
Jérôme Loyet
627540cc0b fix a segfault when passing an empty value to a ini parameter from the web server (php_(admin_)?value) 2011-07-18 21:03:44 +00:00
Jérôme Loyet
1d3696eecb remove forgotten debug log 2011-07-18 20:59:18 +00:00
Jérôme Loyet
577d81faa2 - get rid of FPM_AUTOCONFIG_H which has never existed since FPM integration into core 2011-07-17 23:33:22 +00:00
Jérôme Loyet
c4b7abb4ea - Fixed wrong value of log_level when invoking fpm with -tt 2011-07-05 18:09:07 +00:00
Jérôme Loyet
d5899d0b33 - ws and cosmetics 2011-07-05 02:42:40 +00:00
Jérôme Loyet
efcfbc953e Fixed memory leak 2011-07-05 01:43:50 +00:00
Jérôme Loyet
c4d83a413c - moved STR2STR, BOOL2STR and PM2STR from fpm_conf.h to fpm_conf.c (Giovanni Giacobbi) 2011-07-05 01:24:10 +00:00
Jérôme Loyet
46ac1e373a alloc SHM for all children at startup to ensure all SHM will be reachable from children over the ages 2011-07-04 22:39:15 +00:00
Jérôme Loyet
5c2477a0d8 child-pid can't be set when fpm_child_resources_use is called 2011-07-04 21:37:28 +00:00
Jérôme Loyet
8237737bd9 - Fixed missing Expires and Cache-Control headers for ping and status pages 2011-07-04 21:29:32 +00:00
Jérôme Loyet
4eb7fc8aa6 - revert commit 312812 until 5.3.7 is out 2011-07-04 21:22:56 +00:00
Jérôme Loyet
7fb6b5ca98 fix comment syntax 2011-07-04 12:49:46 +00:00
Jérôme Loyet
74b693f16b - Implemented FR #54172 (Overriding the pid file location of php-fpm) 2011-07-02 23:41:01 +00:00
Jérôme Loyet
6d64b2a4c9 - Implemented FR #54499 (FPM ping and status_path should handle HEAD request) 2011-07-02 16:34:39 +00:00
Jérôme Loyet
217382d4ef - Implemented FR #54577 (Enhanced status page with full status and details about each processes
- Added a web page (status.html) for real-time FPM status
- Fixed missing Expires and Cache-Control headers for ping and status pages
2011-07-02 16:10:18 +00:00
Jérôme Loyet
c9a0fbe122 - fixed request_timeout and slowlog_timeout from last FPM commit (r312496)
- typo
2011-06-27 11:33:03 +00:00
Jérôme Loyet
f5b05ce162 - Replaced shm_slots with a real scoreboard
- Added several improvements to the status page
2011-06-26 15:48:11 +00:00
Jérôme Loyet
bbe8518456 - Added custom access log (also added per request %CPU and memory mesurement) 2011-06-23 08:03:52 +00:00
Jérôme Loyet
955b801fea Removed pid in debug logs written by chrildren processes 2011-06-20 00:03:39 +00:00
Felipe Pena
e3da6ac3da - Missing change 2011-06-18 17:46:16 +00:00
Felipe Pena
6481440f3f - Fixed ZTS build 2011-06-18 17:41:56 +00:00
Jérôme Loyet
23a5f873fb Added master rlimit_files and rlimit_core in the global configuration settings 2011-06-18 16:27:48 +00:00
Jérôme Loyet
6e1f77ef6b Fixed exit at FPM startup on fpm_resources_prepare 2011-06-18 16:15:15 +00:00
Jérôme Loyet
22be55e6da Remove timestamp in logs written by children process 2011-06-18 15:33:07 +00:00
Jérôme Loyet
fd0009d8d6 missing doc in the conf file 2011-06-17 23:35:47 +00:00
Jérôme Loyet
cff7a300d1 - added xml format to the status page
- clean fpm_status.c code
2011-06-17 23:19:54 +00:00
Hannes Magnusson
e85c367bc7 its force-quit, not -exit (yawk) 2011-04-23 21:12:25 +00:00
Jim Jagielski
39d814a205 Close [PHP-BUG] Req #54152...
Apache 2.3.12 (and later) will now work correctly with PHP's fcgi
impl with this patch.
2011-03-09 18:27:30 +00:00
Antony Dovgal
2cfc526bcb fix compile warning 2011-02-08 08:40:39 +00:00
Jérôme Loyet
6e57a7792e - remove cpystrn from FPM and use strlcpy instead. 2011-01-30 13:51:20 +00:00
Jérôme Loyet
5bab8ea920 - Fixed bug #53434 (php-fpm slowlog now also logs the original request).
- Fixed the missing peace of code on revision 307842
2011-01-29 11:41:45 +00:00
Jérôme Loyet
977d79a724 - Fixed bug #53434 (php-fpm slowlog now also logs the original request). 2011-01-29 11:38:19 +00:00
Jérôme Loyet
f386967b77 - Fixed bug #53777 (php-fpm log format now match php_error log format). 2011-01-29 10:13:24 +00:00
Jérôme Loyet
326f50b1ea - Enforce security in the fastcgi protocol parsing. 2011-01-17 22:22:39 +00:00
Antony Dovgal
25a43268fd add missing dl() function to FPM SAPI 2011-01-14 13:53:59 +00:00
Jérôme Loyet
e77d3268d7 - Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 2010-12-18 11:22:11 +00:00
Jérôme Loyet
4c76006fe3 - Fixed bug #53412 (segfault when using -y) 2010-11-30 19:37:10 +00:00
Jérôme Loyet
f13f4bc872 - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed) 2010-11-26 13:46:15 +00:00