Felipe Pena
b7e84d6b83
- Removed C++ comment style
2011-11-19 12:16:47 +00:00
George Wang
56728f11a8
keep code to be compatible with PHP4
2011-11-16 03:58:57 +00:00
George Wang
badd6a91d4
keep PHP_5_4 in sync with PHP_5_3 branch
2011-11-16 03:44:42 +00:00
Jérôme Loyet
e5ccae408e
- Added .phar to default authorized extensions
2011-11-16 00:21:38 +00:00
Jérôme Loyet
bc169ba823
- FR #60199 (enhance FPM error log when the primary script can't be open)
2011-11-15 22:29:59 +00:00
Jérôme Loyet
0e25118cc4
- Fixed bug #60179 (php_flag and php_value does not work properly)
2011-11-03 15:47:19 +00:00
Xinchen Hui
a391535e00
Fixed bug #60206 (possible integer overflow in content_length)
2011-11-03 07:26:09 +00:00
Ferenc Kovacs
263ab7e2d4
stream_socket_server("unix://..." has a length limit, so it is better to use the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106
2011-10-22 21:44:05 +00:00
Ferenc Kovacs
8bbbfadcfe
there is a length limit on the shebang line, ignore the tests for >= 127
2011-10-20 18:09:44 +00:00
Jérôme Loyet
92039e00b0
- ensure request_terminate_timeout >= request_slowlog_timeout
2011-10-09 15:21:06 +00:00
Jérôme Loyet
f58cf75068
- Fixed bug #55526 (Heartbeat causes a lot of unnecessary events)
2011-10-09 15:12:26 +00:00
Jérôme Loyet
3982cda83b
- Fixed bug #55533 (The -d parameter doesn't work)
2011-10-09 14:36:11 +00:00
Jérôme Loyet
e7c6f9c62d
- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)
2011-10-08 21:04:10 +00:00
Jérôme Loyet
95bd5f1872
- fix r317913
2011-10-08 20:43:12 +00:00
Jérôme Loyet
0c2752169c
- Fixed bug #55486 (status show BIG processes number)
2011-10-08 19:50:26 +00:00
Jérôme Loyet
4d554c45b9
- Fixed bug #55577 (status.html does not install)
2011-10-08 19:31:32 +00:00
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
Christopher Jones
04b5bb7d3c
Update log, marking 5.4 and trunk as XFAIL due to bug #55496
2011-08-23 20:59:10 +00:00
Uwe Schindler
2c0ab6fc33
Bug #55403 : Don't set $_SERVER['HTTPS'] on unsecure connection
2011-08-18 19:12:49 +00:00
Dmitry Stogov
cea8df3af5
Fixed possible memory leak
2011-08-11 06:38:42 +00:00
Xinchen Hui
6c0c4896b3
Prevented the warning about truncate int to char
2011-08-08 07:12:12 +00:00
Felipe Pena
13eb47a8bc
- Added missing PHP_FE_END/ZEND_FE_END
2011-08-06 01:22:27 +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