clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 05:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,986 Commits 494 Branches 1,367 Tags 784 MiB
c0e9767131
Commit Graph

255 Commits

Author SHA1 Message Date
Jérôme Loyet
b772fae900 - Fixed #52692 (Added '-t/--test' to php-fpm to check and validate FPM conf file) 2010-11-11 23:27:15 +00:00
Jérôme Loyet
5a416465a0 - Fixed #52692 (Added '-t/--test' to php-fpm to check and validate FPM conf file) 2010-11-11 23:27:15 +00:00
Jérôme Loyet
b72460a42f - Fixed bug #52693 (configuration file errors are not logged to stderr) 2010-11-11 22:48:46 +00:00
Jérôme Loyet
da29092159 - Fixed bug #52693 (configuration file errors are not logged to stderr) 2010-11-11 22:48:46 +00:00
Jérôme Loyet
306d08a0f5 - get rid of ZLOG_STUFF code redundancy 2010-11-11 21:38:18 +00:00
Jérôme Loyet
7bc07ff884 - get rid of ZLOG_STUFF code redundancy 2010-11-11 21:38:18 +00:00
Jérôme Loyet
7eb3062619 - comment out fpm_php_set_fcgi_mgmt_vars to remove compilation warning 2010-11-11 21:30:55 +00:00
Jérôme Loyet
8dd82c5fde - comment out fpm_php_set_fcgi_mgmt_vars to remove compilation warning 2010-11-11 21:30:55 +00:00
Jérôme Loyet
e1b87cce1f - Fixed #52045 (FPM tries to open php.ini from the current dir) 
- Add php_ini_ignore_cwd to _sapi_module_struct
 2010-11-11 17:24:27 +00:00
Jérôme Loyet
71a8b75c51 - remove useless check 2010-11-11 12:56:44 +00:00
Jérôme Loyet
b896c87bb5 - remove useless check 2010-11-11 12:56:44 +00:00
Jérôme Loyet
9f1ad0a2e2 - add missing timer* macros (for solaris) 
- ws
 2010-11-11 12:55:05 +00:00
Jérôme Loyet
8977fc8ace - add missing timer* macros (for solaris) 
- ws
 2010-11-11 12:49:11 +00:00
Jérôme Loyet
b38d57249e - add "listen queue len" stat (thx to Andrei Nigmatulin) 2010-11-11 02:34:47 +00:00
Jérôme Loyet
0a1e29d74b - add "listen queue len" stat (thx to Andrei Nigmatulin) 2010-11-11 02:34:47 +00:00
Jérôme Loyet
469746fa03 - syntax and minor optimizations 2010-11-11 01:01:56 +00:00
Jérôme Loyet
7e56681670 - syntax and minor optimizations 2010-11-11 01:01:56 +00:00
Jérôme Loyet
a2c55a138d - don't call shutdown functions after child ends softly, let the master process call them 2010-11-10 23:54:14 +00:00
Jérôme Loyet
07abcdc031 - don't call shutdown functions after child ends softly, let the master process call them 2010-11-10 23:54:14 +00:00
Jérôme Loyet
f407fc4e01 - correct time comparison for determining the last idle child 2010-11-07 21:47:14 +00:00
Jérôme Loyet
f0621d39cd - correct time comparison for determining the last idle child 2010-11-07 21:47:14 +00:00
Jérôme Loyet
b41d13ba98 - change signal from SIGTERM to SIGQUIT for killing a child process by the dynamic process manager 2010-11-07 19:45:51 +00:00
Jérôme Loyet
0399b83ccb - change signal from SIGTERM to SIGQUIT for killing a child process by the dynamic process manager 2010-11-07 19:41:28 +00:00
Jérôme Loyet
8b9ed0d369 - remove a memory leak (missing efree()) 2010-09-14 15:33:43 +00:00
Jérôme Loyet
8c1582c9ad - remove a memory leak (missing efree()) 2010-09-14 15:33:43 +00:00
Jérôme Loyet
9a1623dc5f - remove FPM specific version which is irrelevant since FPM integration into core. 2010-09-07 22:03:43 +00:00
Jérôme Loyet
a7e18ea855 - remove FPM specific version which is irrelevant since FPM integration into core. 2010-09-07 22:03:43 +00:00
Jérôme Loyet
c725c054d6 - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Jérôme Loyet
75891691ed - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Jérôme Loyet
6b2b7046ed - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they were not available). 2010-09-01 08:17:18 +00:00
Jérôme Loyet
70d7d86505 - Fixed bug #52725 (gcc builtin atomic functions were sometimes used when they were not available). 2010-09-01 08:17:18 +00:00
Jérôme Loyet
5fd50c99cb - add 'max children reached' to the FPM status page. It shows how many times 
a pool has reached the max_children parameter.
 2010-08-31 14:49:16 +00:00
Jérôme Loyet
4d62c8c501 - add 'max children reached' to the FPM status page. It shows how many times 
a pool has reached the max_children parameter.
 2010-08-31 14:49:16 +00:00
Jérôme Loyet
cbd21afae9 - Add libevent version to the startup debug log in FPM. 2010-08-31 09:41:04 +00:00
Jérôme Loyet
b212312a93 - Add libevent version to the startup debug log in FPM. 2010-08-31 09:41:04 +00:00
Jérôme Loyet
0605d5f309 - Changed listen.backlog in the FPM configuration file to default to 128 
instead of -1 (except on FreeBSD and OpenBSD). This is the same value 
  as the one used in the cgi sapi. This patch completes revision 302725.
 2010-08-31 09:33:53 +00:00
Jérôme Loyet
bf28d740e3 - Changed listen.backlog in the FPM configuration file to default to 128 
instead of -1 (except on FreeBSD and OpenBSD). This is the same value 
  as the one used in the cgi sapi. This patch completes revision 302725.
 2010-08-31 09:33:53 +00:00
Jérôme Loyet
d5a12aef12 - only one process (for all pools) could be killed by the 'dynamic' process manager. Now it's one process per pool which can be killed by the 'dynamic' process manager. 
- rename nonsense variable (i)
 2010-08-30 15:21:31 +00:00
Jérôme Loyet
a7057e4e49 - only one process (for all pools) could be killed by the 'dynamic' process manager. Now it's one process per pool which can be killed by the 'dynamic' process manager. 
- rename nonsense variable (i)
 2010-08-30 15:21:31 +00:00
Jérôme Loyet
266e369184 - Changed listen.backlog in the FPM configuration file to default to 128 
instead of -1. This is the same value as the one used in the cgi sapi.
 2010-08-23 23:22:36 +00:00
Jérôme Loyet
f9c6bb1ad8 - Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers). 2010-08-23 20:40:44 +00:00
Jérôme Loyet
f5e38e30b6 - Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers). 2010-08-23 20:40:44 +00:00
Jérôme Loyet
6db49b7864 - Fix #52407 (use __sync_bool_compare_and_swap in fpm_atomic.h if gcc >= 4.1 is used - credit to geissert) 2010-08-21 06:46:18 +00:00
Jérôme Loyet
6b8f3c0c59 - Fix #52407 (use __sync_bool_compare_and_swap in fpm_atomic.h if gcc >= 4.1 is used - credit to geissert) 2010-08-21 06:46:18 +00:00
Jérôme Loyet
1f3aaf508c - typo (thx to sixd) 2010-08-20 17:00:57 +00:00
Jérôme Loyet
06228b2cab - typo (thx to sixd) 2010-08-20 17:00:57 +00:00
Jérôme Loyet
99a4506787 Fix #52609 (INI scanner did not use ZEND_INI_SCANNER_NORMAL) 2010-08-20 08:33:57 +00:00
Jérôme Loyet
72064e1a28 Fix #52609 (INI scanner did not use ZEND_INI_SCANNER_NORMAL) 2010-08-20 08:33:57 +00:00
Kalle Sommer Nielsen
34b631f679 Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's 2010-08-18 13:34:40 +00:00
Jérôme Loyet
5fe988518a BUG: all value comparaisons were not case insensitive in the conf file parser 2010-08-02 21:46:52 +00:00
Jérôme Loyet
eb2266197f BUG: all value comparaisons were not case insensitive in the conf file parser 2010-08-02 21:46:52 +00:00
Jérôme Loyet
c80e055c9c typo 2010-08-02 09:28:54 +00:00
Jérôme Loyet
71eee6b1d4 typo 2010-08-02 09:28:54 +00:00
Jérôme Loyet
1c50d5385d correct php-fpm.conf: slowlog has no default value 2010-08-02 09:02:48 +00:00
Jérôme Loyet
5181210a7a correct php-fpm.conf: slowlog has no default value 2010-08-02 09:02:48 +00:00
Jérôme Loyet
51dd4c2feb - Fixed bug #52476 (move php-fpm man page from section 1 to section 8) 2010-07-29 22:07:00 +00:00
Jérôme Loyet
4445c85d4f - Fixed bug #52476 (move php-fpm man page from section 1 to section 8) 2010-07-29 22:07:00 +00:00
Raphael Geissert
197ab331eb Fix required facilities for php-fpm's init script 
$all should only be used in rare, and very specific, cases.
 2010-07-29 19:13:42 +00:00
Raphael Geissert
444bba79ba Fix required facilities for php-fpm's init script 
$all should only be used in rare, and very specific, cases.
 2010-07-29 19:13:42 +00:00
Antony Dovgal
336b5af34b fix typos and use correct directive names in error messages 2010-07-06 11:37:19 +00:00
Antony Dovgal
388a9ccaf0 fix typos and use correct directive names in error messages 2010-07-06 11:37:19 +00:00
Jérôme Loyet
ffdd175918 - Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM daemon) 2010-06-19 16:31:19 +00:00
Jérôme Loyet
84d268f63b - Fixed bug #52086 (No new line at the end of a included file crahes the PHP FPM daemon) 2010-06-19 16:31:19 +00:00
Antony Dovgal
3896e7403d improve ptrace() test 
change error to warning - there can be no trace method available at all
 2010-06-16 08:58:42 +00:00
Antony Dovgal
b95170580c improve ptrace() test 
change error to warning - there can be no trace method available at all
 2010-06-16 08:58:42 +00:00
Jérôme Loyet
12e8eef760 Fix #52067, chroot and chdir path were not checked at startup. If configured with unexistant directories, FPM entered in an error loop. 2010-06-13 10:30:35 +00:00
Jérôme Loyet
205775507a Fix #52067, chroot and chdir path were not checked at startup. If configured with unexistant directories, FPM entered in an error loop. 2010-06-13 10:30:35 +00:00
Antony Dovgal
61344366ae support both 'warn' and 'warning' as error levels 2010-06-08 18:59:11 +00:00
Antony Dovgal
3c9e1e6d70 support both 'warn' and 'warning' as error levels 2010-06-08 18:59:11 +00:00
Antony Dovgal
04d673472f fix micro-memleaks (happened once per process) 2010-06-08 12:02:55 +00:00
Antony Dovgal
a8be1c1d4b fix micro-memleaks (happened once per process) 2010-06-08 12:02:55 +00:00
Michael Wallner
0ed3973331 fix fpm build 2010-06-01 13:51:05 +00:00
Jérôme Loyet
dbe35d87d6 fix commit 299383 2010-05-29 22:00:43 +00:00
Jérôme Loyet
27c2c35953 fix commit 299383 2010-05-29 22:00:43 +00:00
Jérôme Loyet
e750930899 typo (thx to Brian P. Mercer) 2010-05-29 10:39:35 +00:00
Jérôme Loyet
bc4c3fdd83 typo (thx to Brian P. Mercer) 2010-05-29 10:39:35 +00:00
Jérôme Loyet
8cf687608e bug: include paths were not evaluated to to full path 2010-05-27 22:31:28 +00:00
Jérôme Loyet
66ef4d185c bug: include paths were not evaluated to to full path 2010-05-27 22:31:28 +00:00
Jérôme Loyet
ce03ced4d7 typo 2010-05-27 22:18:58 +00:00
Jérôme Loyet
167f758aca typo 2010-05-27 20:59:21 +00:00
Antony Dovgal
4d005a8e65 merge FPM SAPI from trunk (as agreed with Johannes) 2010-05-26 15:14:43 +00:00
Jérôme Loyet
c350a3f761 change the startup libevent info log from notice to debug 2010-05-19 20:12:56 +00:00
Jérôme Loyet
257a8dac20 fix undefined value for log_level when not set in the conf file 2010-05-19 20:11:56 +00:00
Jérôme Loyet
962e95df52 - set hard and soft limit (instead of only the soft limit) when setting rlimit_core or rlimit_files 
- remove the debug log about getrlimit on the main process wich is meaningless when rlmit_* settings are set
 2010-05-19 18:37:25 +00:00
Jérôme Loyet
d3e1b1dbc3 - #51821, fix --with-libevent-dir (patch by tony2001) 2010-05-19 11:29:31 +00:00
Antony Dovgal
b9bec41ce1 fix external build 2010-05-14 15:22:38 +00:00
Jérôme Loyet
3e51f4a966 Fix #51799, when glob returns nothing, it was handle as an error instead of a warning. 2010-05-12 18:29:09 +00:00
Jérôme Loyet
ef9ea5f967 Fix #51736, wrong checks on dynamic parameters 2010-05-08 08:52:32 +00:00
Antony Dovgal
47aa194a10 merge the fix for #51688 2010-04-30 08:20:57 +00:00
Jérôme Loyet
34ba9e39fa Add PHP_VALUE and PHP_ADMIN_VALUE interpretation from fastcgi headers. 
It works as php_value and php_admin_value from the main conf file or apache sapi.

See bug (request) #51595
 2010-04-23 16:05:52 +00:00
Jérôme Loyet
acf5fba0fb Remove unused functions / variables / #if 0 blocks 2010-04-23 15:09:28 +00:00
Jérôme Loyet
757d7ace9a typo 2010-04-23 13:56:14 +00:00
Jérôme Loyet
0b2a196431 typo and errors in php-fpm.conf 2010-04-23 08:06:49 +00:00
Jérôme Loyet
7ac145d9f3 correct wrong comparison (thx to felipe) 2010-04-22 07:14:06 +00:00
Felipe Pena
696f6c7c93 - Fix ZTS build 2010-04-21 23:22:20 +00:00
Jérôme Loyet
3defa292f2 switch the configuration syntax from xml to ini 
It's been describe in the RFC: http://wiki.php.net/rfc/fpm/ini_syntax
 2010-04-21 22:56:33 +00:00
Jérôme Loyet
bae9248602 typo 2010-04-20 23:31:13 +00:00
Jérôme Loyet
5556956899 Add a check request_method. If fcgi protocol is not followed, a segfault can occur. 2010-04-20 23:28:20 +00:00
Jérôme Loyet
ca8756478a Change php_defines in configuration file to php_value,php_admin_value,php_flag,php_admin_flag (as in the apache sapi). 
php_admin* sets values as ZEND_INI_SYSTEM mode while php_* sets values as ZEND_INI_USER
 2010-04-20 21:13:40 +00:00
Jérôme Loyet
213436c3fb true/false was not a valid value for boolean directives 2010-04-19 20:45:03 +00:00
Jérôme Loyet
5a211da7af correct path in the man page 2010-04-19 18:02:36 +00:00
Antony Dovgal
b299e90b79 use new type + const static 2010-04-13 12:16:26 +00:00
Antony Dovgal
d77d6153ec re-add updated FPM 2010-04-13 12:13:46 +00:00
Antony Dovgal
3ebdadf8f6 prepare to re-add newer FPM version 2010-04-13 12:13:24 +00:00
Antony Dovgal
06b9943842 add FPM sapi to trunk 2010-04-12 11:22:24 +00:00