Commit Graph

255 Commits

Author SHA1 Message Date
Ilia Alshanetsky
5709f7dd5b Merge branch '53' into 54
* 53:
  Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
2012-03-19 13:10:53 -04:00
Ilia Alshanetsky
edb57810a7 Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). 2012-03-19 13:10:23 -04:00
Rasmus Lerdorf
69f24fb502 Yup, these need to be escaped. Good catch. 2012-02-21 00:01:19 +00:00
Rasmus Lerdorf
cc813032cd Fix bug 61149 2012-02-20 20:29:26 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Rasmus Lerdorf
a5c3078c3f Missing ifdef here
Fixes bug 60811
2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
6f27b1f1a6 Missing ifdef here
Fixes bug 60811
2012-01-19 22:35:22 +00:00
Jérôme Loyet
b9fab77d13 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
c730ed9656 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +00:00
Jérôme Loyet
0ca9fbc0de - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Jérôme Loyet
e747222100 - Fixed bug #60629 (memory corruption when web server closed the fcgi fd) 2012-01-03 22:26:11 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
b7e84d6b83 - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Felipe Pena
7439154ece - Removed C++ comment style 2011-11-19 12:16:47 +00:00
Jérôme Loyet
f8ef8946cc - Added .phar to default authorized extensions 2011-11-16 00:21:38 +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
d1312936cd - remove experimental flag on fpm 2011-11-15 22:40:10 +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
8bdf576a1f - 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
10a1121a37 - Fixed bug #60179 (php_flag and php_value does not work properly) 2011-11-03 15:47:19 +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
Xinchen Hui
d4b90b4788 Fixed bug #60206 (possible integer overflow in content_length) 2011-11-03 07:26:09 +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
da110e2065 - 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
891ca5cae3 - 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
17cbee6ffe - Fixed bug #55533 (The -d parameter doesn't work) 2011-10-09 14:36:11 +00:00
Jérôme Loyet
62fd3369cb - fix r317922 (missing PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events) in config.m4) 2011-10-09 09:22:36 +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
1034cbc758 - 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
12c1f0b0d9 - 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
fb88ef7231 - 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
81565fdf45 - 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