Commit Graph

2306 Commits

Author SHA1 Message Date
Jérôme Loyet
a3b31f5c18 - ws and cosmetics 2011-07-05 02:42:40 +00:00
Jérôme Loyet
e57914c1d8 Fixed memory leak 2011-07-05 01:43:50 +00:00
Jérôme Loyet
d12fab2d4b - 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
bc427b0eba fix comment syntax 2011-07-04 12:49:46 +00:00
Felipe Pena
df10314070 - Fixed bug #55118 (Imcomplete start message) 2011-07-03 14:45:41 +00:00
Felipe Pena
96d927c6ac - Fixed crash when using -e option 2011-07-03 01:06:20 +00:00
Jérôme Loyet
9b64314250 - Implemented FR #54172 (Overriding the pid file location of php-fpm) 2011-07-02 23:41:01 +00:00
Jérôme Loyet
b06e62d4fe - Fix php_escape_html_entities_ex call (int * has been changed to size_t *) 2011-07-02 16:40:59 +00:00
Jérôme Loyet
710ff963f4 - Implemented FR #54499 (FPM ping and status_path should handle HEAD request) 2011-07-02 16:34:39 +00:00
Jérôme Loyet
2fb5b8200b - 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
Felipe Pena
4296f07fcc - Reverted php_printf -> printf change 2011-07-01 17:18:50 +00:00
Philip Olson
7497a0eb4a Updated name to 'PHP Development Server', and CTRL-C to Ctrl-C, as per PHP bug #55071 2011-06-30 23:50:56 +00:00
David Soria Parra
cdad24cda5 correct error message for a missing document root in the cli webserver
the document root is always a directory.
2011-06-29 23:44:02 +00:00
David Soria Parra
5024c32798 fix #55072 in-built web server needs to check -t option is a directory 2011-06-29 23:29:01 +00:00
Felipe Pena
f7a024023f - Fixed crash on invalid addr:port (Chris Jones, Felipe) 2011-06-27 23:18:26 +00:00
Jérôme Loyet
527313919b - fixed request_timeout and slowlog_timeout from last FPM commit (r312496)
- typo
2011-06-27 11:33:03 +00:00
Jérôme Loyet
dace636cc9 - Replaced shm_slots with a real scoreboard
- Added several improvements to the status page
2011-06-26 15:48:11 +00:00
Felipe Pena
8841454a10 - Fixed crash when using -e option 2011-06-25 20:40:03 +00:00
Felipe Pena
7b1f738b70 - Fixed crash when calling sapi_shutdown() and sapi hasn't been started
Reported by: David Tajchreber
2011-06-25 14:17:17 +00:00
Felipe Pena
9424d255c9 - Fixed crash when zend_eval_string bailouts (-r 'a();')
Reported by: David Tajchreber
2011-06-25 13:15:24 +00:00
Pierre Joye
eeade7180a - reflection is always enabled 2011-06-25 10:47:54 +00:00
Derick Rethans
6b56f4a5b8 - Fixed layout. Tabs on the terminal don't align nicely in most cases. 2011-06-25 10:16:46 +00:00
Ilia Alshanetsky
7f2882cc53 Fixed a bug with calculation of REQUEST_TIME in apache2 2011-06-23 14:12:50 +00:00
Jérôme Loyet
8dcfa2f916 - Added custom access log (also added per request %CPU and memory mesurement) 2011-06-23 08:03:52 +00:00
Felipe Pena
de14ef3442 - Fixed crash (take 2) 2011-06-23 00:40:31 +00:00
Felipe Pena
b9fff0d5b7 - Fixed crash on startup 2011-06-23 00:25:54 +00:00
Pierre Joye
bdb5422951 - fix build 2011-06-21 11:43:19 +00:00
Felipe Pena
1521c79647 - Fix memleak on `php -v' 2011-06-21 01:47:05 +00:00
Felipe Pena
7b3350347a - Fixed hardcoded INI 2011-06-20 23:36:25 +00:00
Moriyoshi Koizumi
7dfef17c54 - Add built-in web server to CLI SAPI. See the RFC for detail. 2011-06-20 20:27:39 +00:00
Jérôme Loyet
b5e5abb38a Removed pid in debug logs written by chrildren processes 2011-06-20 00:03:39 +00:00
Felipe Pena
8f76adb750 - Missing change 2011-06-18 17:46:16 +00:00
Felipe Pena
17bf772378 - Fixed ZTS build 2011-06-18 17:41:56 +00:00
Jérôme Loyet
8f0fdbb9e8 Added master rlimit_files and rlimit_core in the global configuration settings 2011-06-18 16:27:48 +00:00
Jérôme Loyet
7236ea5a46 Fixed exit at FPM startup on fpm_resources_prepare 2011-06-18 16:15:15 +00:00
Jérôme Loyet
b813d1ff23 Remove timestamp in logs written by children process 2011-06-18 15:33:07 +00:00
Jérôme Loyet
35458820ad missing doc in the conf file 2011-06-17 23:35:47 +00:00
Jérôme Loyet
ade2d21f72 - added xml format to the status page
- clean fpm_status.c code
2011-06-17 23:19:54 +00:00
Rasmus Lerdorf
c49d060510 Fix Apache1 build 2011-06-10 11:46:35 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
61bbd09524 - Fixed crash in fastcgi (related to zend signals changes) 2011-06-05 17:02:46 +00:00
Ilia Alshanetsky
7acafb506a Fixed bug #52496 (Zero exit code on option parsing failure). 2011-05-30 15:57:50 +00:00
Felipe Pena
184f80ff66 - Fixed bug #54529 (SAPI crashes on apache_config.c:197)
patch by: hebergement at riastudio dot fr
2011-05-23 01:47:06 +00:00
Rasmus Lerdorf
e0df4e3dba Fix a couple of warnings. Use %zu to printf a time_t and get_request_time
actually returns a double, not a time_t.
2011-05-16 15:52:31 +00:00
Pierrick Charron
1bf6d03020 # Fix phpt 2011-05-05 18:30:14 +00:00
Antony Dovgal
829d08e50c fix CLI tests failing because of new OB API 2011-05-04 08:24:16 +00:00
Hannes Magnusson
cc8ac4ec00 its force-quit, not -exit (yawk) 2011-04-23 21:12:25 +00:00
Pierrick Charron
1368364469 Fix common typos in the source code (Reported in Bug #54065)
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Jim Jagielski
24126fa2df 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:53:22 +00:00
Pierre Joye
1dc32a24ce -not needed, buildconf helps... 2011-02-22 13:09:15 +00:00
Pierre Joye
cb8d9f9c19 - missing files 2011-02-22 12:59:50 +00:00
Johannes Schlüter
960e265b6c Declare vars first. Fix Windows build. 2011-02-22 12:51:43 +00:00
Felipe Pena
b98ceb5e40 - Fixed build 2011-02-19 16:32:00 +00:00
Johannes Schlüter
6c734a6b4c - Implement FR#53878 Interactive shell should work with shared readline extension
# This is useful w/ distributors who like to build all things shared or don't
# provide the readline extension. Or if a user pefers readline's behavior over
# libedit which might be used by the  distributor.
2011-02-19 16:04:30 +00:00
Antony Dovgal
09ee5944ab fix compile warning 2011-02-08 08:40:39 +00:00
Jérôme Loyet
d7e9fdc199 - remove cpystrn from FPM and use strlcpy instead. 2011-01-30 13:51:20 +00:00
Jérôme Loyet
147382033a - 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
4aa36e8914 - Fixed bug #53434 (php-fpm slowlog now also logs the original request). 2011-01-29 11:38:19 +00:00
Jérôme Loyet
ca3126f1cc - Fixed bug #53777 (php-fpm log format now match php_error log format). 2011-01-29 10:13:24 +00:00
Felipe Pena
bc049ccb62 - Fix missing mkdir for bindir (patch by David Tajchreber) 2011-01-23 22:40:35 +00:00
Dmitry Stogov
10cfbb814f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +00:00
Jérôme Loyet
970fe5b71e - Enforce security in the fastcgi protocol parsing. 2011-01-17 22:22:39 +00:00
Antony Dovgal
a89c446488 add missing dl() function to FPM SAPI 2011-01-14 13:53:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Jérôme Loyet
e1dee992ee - Fixed bug #53527 (php-fpm --test doesn't set a valuable return value). 2010-12-18 11:22:11 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Jérôme Loyet
8e65f50698 - Fixed bug #53412 (segfault when using -y) 2010-11-30 19:37:10 +00:00
Jérôme Loyet
f7cd7afd33 - Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed) 2010-11-26 13:46:15 +00:00
Jérôme Loyet
ac08cb6492 - fix (log with level < WARNING before daemonizing were not written to /dev/stderr) 2010-11-16 22:53:47 +00:00
Jérôme Loyet
cb2bb12de5 - Fixed #53310 (sparc < v9 won't is not supported) 2010-11-16 22:02:36 +00:00
Jérôme Loyet
69ba9c82af - extend the 'i-t' fpm argument to dump configuration file when called twice (-tt) 2010-11-14 22:22:07 +00:00
Jérôme Loyet
ae01a576b3 - Fixed #52691 (allow multiple instance of FPM using a custom prefix) 2010-11-14 22:01:34 +00:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
# Bug #53271, Bug #52410
2010-11-13 23:13:07 +00:00
Jérôme Loyet
e3b4bf5685 - Fixed #52660 (custom process title for FPM) 2010-11-12 00:30:35 +00:00
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
b72460a42f - 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
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
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
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
b38d57249e - 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
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
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
Ilia Alshanetsky
f89effd2a8 Updated _SERVER['REQUEST_TIME'] to include microsecond precision. 2010-11-06 17:14:21 +00:00
Dmitry Stogov
bd8f3908c4 Reverted wrong patch 2010-09-20 10:45:22 +00:00
Kalle Sommer Nielsen
210fe80bd5 Fix incompatible types, we need to use a char here for recv() 2010-09-19 19:18:30 +00:00
Pierre Joye
14e77486e0 - unused, double declared 2010-09-15 22:25:44 +00:00
Jérôme Loyet
8b9ed0d369 - remove a memory leak (missing efree()) 2010-09-14 15:33:43 +00:00
Pierre Joye
b6d8462ab2 - fix #48831 php -i has different output to php --ini 2010-09-14 10:36:21 +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
75891691ed - Fixed bug #52498 (libevent was not only linked to php-fpm) 2010-09-07 21:12:28 +00:00
Dmitry Stogov
c290767ed7 Fixed bug #46723 (FastCGI persistent connection is incredibly slow due to TCP ack delay). 2010-09-06 11:11:40 +00:00
Felipe Pena
7396657fc1 - Fixed compiler warning (missing return statement) 2010-09-01 23:21:03 +00:00
Dmitry Stogov
6bc16cce8f Reduced overhead of FastCGI using near-perfect hash function and predcalculated hash values. 2010-09-01 15:34:48 +00:00
Dmitry Stogov
001d83dc47 invalid length 2010-09-01 14:42:43 +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
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