clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,613 Commits 493 Branches 1,365 Tags 848 MiB
de31324c22
Commit Graph

419 Commits

Author SHA1 Message Date
Adam Harvey
f63a9f6c11 Update the arguments in the prototype of fpm_socket_unix_test_connect(). 
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
 2013-01-16 10:06:56 +08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Remi Collet
bc7f2b5f41 Merge branch 'PHP-5.3' into PHP-5.5 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:37 +01:00
Remi Collet
487b7c7f32 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:13 +01:00
Remi Collet
bc492007da Fixed Bug #63581 Possible buffer overflow 
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
 2012-11-28 10:35:04 +01:00
Remi Collet
f08060a48f Fixed Bug #63581 Possible null dereference 
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).

This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
 2012-11-28 10:28:18 +01:00
Xinchen Hui
7e2c87bf2b Add missed file 2012-10-24 10:34:44 +08:00
Jerome Loyet
284ea56d4d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add missing NEWS entry
  Fixed bug #62216
 2012-09-28 11:22:59 +02:00
Jerome Loyet
b530f53c67 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62216
 2012-09-28 11:21:12 +02:00
Jerome Loyet
bb02fd5772 Fixed bug #62216 
Add PID to php-fpm init.d script
 2012-09-28 11:18:08 +02:00
Jerome Loyet
68eb608f3c - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:26:20 +02:00
Jerome Loyet
9ef925b351 - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:25:51 +02:00
Jerome Loyet
151b16cf7f - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:24:52 +02:00
Jerome Loyet
be043ab6d0 Merge branch 'fuckgit' into PHP-5.4 
* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 01:19:01 +02:00
Jerome Loyet
9ed421e3d7 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:09:31 +02:00
Jerome Loyet
72f3457161 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:48 +02:00
Jerome Loyet
e31553c204 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:08 +02:00
Jerome Loyet
c8b7ea0f57 - fix merge (fucking git merging system ... :( ) 2012-09-28 00:55:06 +02:00
Jerome Loyet
64a0e7cdc2 - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:53:05 +02:00
Jerome Loyet
2259a8f18b - add missing php-fpm.service.in 2012-09-28 00:47:56 +02:00
Jerome Loyet
b2f4e686f0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 00:39:29 +02:00
Jerome Loyet
851a04bb7b - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:33:05 +02:00
Jerome Loyet
b5eb1456aa - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:05:48 +02:00
Jerome Loyet
75c63c5503 - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-27 23:54:35 +02:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Lars Strojny
8e7081f3ac Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:02:39 +02:00
Rasmus Lerdorf
5799ebdb0c Fix bug #62654 2012-07-25 02:03:47 +02:00
Rasmus Lerdorf
5f224412fa Fix bug #62654 2012-07-24 16:28:49 -07:00
Jerome Loyet
238caeb63c - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:23:01 +02:00
Jerome Loyet
ec4a1d576b - fix missing include for unix sockets 2012-06-01 11:22:18 +02:00
Jerome Loyet
43ec708882 - Comment unused function to avoid warnings 2012-06-01 11:22:02 +02:00
Jerome Loyet
38ca8cb7a1 - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 2012-06-01 11:18:48 +02:00
Jerome Loyet
35abf3f20c - fix missing include for unix sockets 2012-06-01 11:16:53 +02:00
Jerome Loyet
59e0930d37 - Comment unused function to avoid warnings 2012-06-01 11:16:00 +02:00
Jerome Loyet
773e85a788 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:09 +02:00
Jerome Loyet
2f7bd57f93 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:36:01 +02:00
Jerome Loyet
60cca8b9c9 Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:27:45 +02:00
Jerome Loyet
e7ff3e839b Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) 2012-05-26 19:27:02 +02:00
Jerome Loyet
e052da3a6b Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:40 +02:00
Jerome Loyet
0298b92b69 - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:44:35 +02:00
Jerome Loyet
decc394a20 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:24:08 +02:00
Jerome Loyet
f6655b62d8 - Fixed bug #62160 (Add process.priority to set nice(2) priorities) 2012-05-26 18:22:12 +02:00
Jerome Loyet
0037598252 - add missing headers to avoid warnings 2012-05-26 17:38:08 +02:00
Jerome Loyet
63e11f9025 - add missing headers to avoid warnings 2012-05-26 17:37:33 +02:00
Jerome Loyet
d90003b549 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:22:54 +02:00
Jerome Loyet
a7761262f7 - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors) 2012-05-25 21:21:44 +02:00
Jerome Loyet
c2f33fb129 - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:13:57 +02:00
Jerome Loyet
bf9120ecae - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start) 2012-05-25 21:10:17 +02:00
Jerome Loyet
1299503936 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:53:04 +02:00
Jerome Loyet
5d61e56dd7 - Fixed bug #61026 (FPM pools can listen on the same address) 2012-05-23 11:52:04 +02:00
Jerome Loyet
0b44f16ea2 - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 2012-05-23 11:40:22 +02:00
Jerome Loyet
a07d76c0ba - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:31:33 +02:00
Jerome Loyet
812d248193 - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-root start) 2012-05-23 11:30:27 +02:00
Jerome Loyet
f4c38016b6 - Fix help message for '-R' 2012-05-23 10:36:45 +02:00
Jerome Loyet
757e3fc3d5 - fix help message for '-R' 2012-05-23 10:35:37 +02:00
Jerome Loyet
629273d11b - add missing help message for '-R' 2012-05-23 10:34:16 +02:00
Jerome Loyet
06c7c3674b - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 10:32:42 +02:00
Jerome Loyet
7b396c078c - Fixed bug #61835 (php-fpm is not allowed to run as root) 2012-05-23 09:49:13 +02:00
Jerome Loyet
dce259099d - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:40:37 +02:00
Jerome Loyet
faca4e08b4 - Fixed bug #61045 (fpm don't send error log to fastcgi clients) 2012-05-22 08:34:27 +02:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
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
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
eb180ac30b - Fixed bug #55340 (segfault when using some arguments -- bug introduced by commit r313351) 2011-08-02 00:58:51 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Jérôme Loyet
8a2736fd77 - Dropped restriction of not setting the same value multiple times, the last one holds (giovanni at giacobbi dot net) 2011-07-19 22:38:04 +00:00
Jérôme Loyet
3afe772423 - enhanced log messages 
- code cosmetic
 2011-07-19 22:18:08 +00:00
Jérôme Loyet
f577f22de0 order fpm configuration items the same way in php-fpm.conf.in, fpm_conf.h and fpm_conf.c 2011-07-18 21:49:38 +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
b7bee05d46 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
bbce374565 - don't write directly to stderr, use the internal logger instead (zlog) 2011-07-18 00:53:13 +00:00
Jérôme Loyet
d70bddb02d remove unused variable 2011-07-18 00:19:22 +00:00
Jérôme Loyet
0b71f4f58b - remove is_fastcgi because FPM is always fastcgi 2011-07-18 00:09:30 +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
e615a86cf0 - 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
66dd371c43 fix revision r313323 2011-07-17 14:28:31 +00:00
Jérôme Loyet
7cdef345d5 - Implemented FR #55166 (Added process.max to control the number of process FPM can fork) 2011-07-17 11:41:57 +00:00
Jérôme Loyet
2f0a379c03 - Implemented FR #55181 (Enhance security by limiting access to user defined extensions) 2011-07-12 23:00:42 +00:00
Jérôme Loyet
505537274d - Implemented FR #54098 (Lowered default value for Process Manager) 2011-07-05 21:03:26 +00:00
Jérôme Loyet
5842a4147f - FR #52052: Added partial syslog support (on error_log only) 2011-07-05 19:22:45 +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
81579a352a - 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
0494615b3c - 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
4afe3eb3f3 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
3fd5fc9cd7 - 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
aba5ecbad9 fix comment syntax 2011-07-04 12:49:46 +00:00
Jérôme Loyet
7fb6b5ca98 fix comment syntax 2011-07-04 12:49:46 +00:00
Felipe Pena
3923d02332 - Fixed crash when using -e option 2011-07-03 01:06:20 +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
b7e5a7f206 - Implemented FR #54172 (Overriding the pid file location of php-fpm) 2011-07-02 23:41:01 +00:00