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
Adam Harvey
f11500df0c
Fix bug #55769 (Make Fails with "Missing Separator" error) via s/ /^I/.
2011-09-24 19:16:33 +00:00
Xinchen Hui
88c52b0dac
Add tests
2011-09-23 03:09:12 +00:00
Xinchen Hui
8933798d36
Add tests for bug #55755
2011-09-22 02:26:00 +00:00
Xinchen Hui
d603d05398
Fixed bug #55755 (SegFault when outputting header WWW-Authenticate)
2011-09-21 16:00:09 +00:00
Xinchen Hui
0203c31f78
change test, and added a test for post file
2011-09-21 07:51:31 +00:00
Xinchen Hui
c83594cd7a
Remove double checking, and use MAXPATHLEN instead of a fixed length
2011-09-21 06:59:47 +00:00
Xinchen Hui
f3aa34a90d
Change to a more appropriate name
2011-09-21 03:16:35 +00:00
Xinchen Hui
82be5fcc4f
Fixed bug #55747 (request headers missed in $_SERVER)
2011-09-21 03:09:42 +00:00
Shein Alexey
3c365dc3ef
Refactored and speeded up php_cli_server tests, also get rid of test hanging on ubuntu:
...
1) Prepended starting the server with "exec" so proc_terminate can correctly close it (see also this note http://www.php.net/manual/en/function.proc-get-status.php#93382 for details)
2) Moved putting down the server to the shutdown function to make it independent from tests (fatal) errors
3) Moved php cli executable into the function to make tests more readable
4) changed sleep(1) to usleep(50000) (50 ms) to make tests faster - this needs more testing and if timeout is too small should be increased
2011-09-20 14:53:46 +00:00
Xinchen Hui
1b9fbe540e
fix INI section
2011-09-20 08:13:55 +00:00
Xinchen Hui
00bab0493e
Add tests for built-in webserver
2011-09-20 07:10:46 +00:00
Xinchen Hui
5dbf73a866
Fix Bug #55726 (Changing the working directory makes router script inaccessible)
2011-09-20 07:06:55 +00:00
Xinchen Hui
6bd693543b
Fix folder
2011-09-20 05:07:15 +00:00
Dmitry Stogov
4a25a7740d
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00
Xinchen Hui
66bcb34bf4
Fixed Bug #55423(cli-server could not output correctly in some case)
2011-09-07 05:14:54 +00:00
Arpad Ray
8590f2587a
add friendly log messages (req #55109 )
2011-08-29 21:59:27 +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
Christopher Jones
ab704eb9f6
Update log, marking 5.4 and trunk as XFAIL due to bug #55496
2011-08-23 20:59:10 +00:00
Xinchen Hui
bbf96ebeb1
Added _SERVER[SERVER_SOFTWARE] for built-in server
2011-08-22 15:51:49 +00:00
Xinchen Hui
ef0e483bb3
Fixed #55463 (cli-server missing _SERVER[REMOTE_ADDR])
2011-08-22 11:55:41 +00:00
Pierre Joye
29cb4d8a09
- undefine CALLBACK (btw, generic names like that should be avoided, w/o prefix :)
2011-08-19 11:35:37 +00:00
Pierre Joye
6a0910075d
- fix build
2011-08-19 11:33:59 +00:00
Xinchen Hui
36bfb46ce6
Fixed typo when syncing changes to branch
2011-08-19 08:35:43 +00:00
Xinchen Hui
c296c9148f
Fixed #55450 (Built in web server not accepting file uploads), which might break #55121 fixing(r313677)
...
Reopened #55121 to let somebody redone the fixing(as I can't reproduce 55121 in redhat 64-bit).
2011-08-19 08:30:26 +00:00
Xinchen Hui
9cdb9a80a7
Fixed #55457 for 5.4 branch
...
Use ssize_t instead of long (as pierre suggestion)
2011-08-19 07:40:51 +00:00
Uwe Schindler
2c0ab6fc33
Bug #55403 : Don't set $_SERVER['HTTPS'] on unsecure connection
2011-08-18 19:12:49 +00:00
Pierre Joye
0fd3f882cd
- do not use 64bit integer instead of size_t (can't be alloc'ed), or when the actual possible values are 32bit or lower only
2011-08-18 09:16:04 +00:00
Pierre Joye
bae911f41b
- WS
2011-08-17 11:59:39 +00:00
Pierre Joye
cef071fd80
- use provided stdint.h and avoid double definitions
2011-08-17 11:56:04 +00:00
Uwe Schindler
acec8201a1
Bug #55403 : Don't set $_SERVER['HTTPS'] on unsecure connection
2011-08-11 20:25:24 +00:00
Dmitry Stogov
cea8df3af5
Fixed possible memory leak
2011-08-11 06:38:42 +00:00
Dmitry Stogov
a5d3c2972e
Fixed possible memory leak
2011-08-11 06:38:42 +00:00
Ilia Alshanetsky
ca739da423
Removed deadcode
2011-08-08 12:14:58 +00:00
Xinchen Hui
6c0c4896b3
Prevented the warning about truncate int to char
2011-08-08 07:12:12 +00:00
Xinchen Hui
43301dae9b
Prevented the warning about truncate int to char
2011-08-08 07:12:12 +00:00
Rasmus Lerdorf
d4a716b19d
Fix more signed 1-bit bitfield, and let's use strlcpy/strlcat instead for these
...
static string copies
2011-08-07 16:10:34 +00:00
Rasmus Lerdorf
46a484e739
Signed 1-bit bitfields make no sense
2011-08-07 15:52:46 +00:00
Rasmus Lerdorf
1c3d13e65f
Good catch Coverity
2011-08-07 03:25:19 +00:00
Rasmus Lerdorf
9eb19ae2bf
Avoid a potential double-free here
2011-08-06 23:42:52 +00:00
Felipe Pena
13eb47a8bc
- Added missing PHP_FE_END/ZEND_FE_END
2011-08-06 01:22:27 +00:00
Felipe Pena
783b05326a
- Added missing PHP_FE_END/ZEND_FE_END
2011-08-06 01:22:27 +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
Florian Anderiasch
48ec4ace5f
Fix #55121 Segfault with multipart/form-data POST
2011-07-25 16:45:39 +00:00
Moriyoshi Koizumi
8355230480
- Give index.php a precedence over index.html. Patch by davidc.
2011-07-23 11:29:26 +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
Moriyoshi Koizumi
56c563dff7
- Show PHP_VERSION in the banner. Suggested by Chris and others.
2011-07-21 07:31:29 +00:00
Moriyoshi Koizumi
7907f66e4b
Fixed bug #55071 . Maybe a bit overkill?
2011-07-20 09:00:20 +00:00
Moriyoshi Koizumi
b0683007c9
- Better error handling.
2011-07-20 08:43:12 +00:00
Moriyoshi Koizumi
a07a4af30b
- Fixed bug #55073 (PHP-CLI-webserver does not listen on ipv6 interfaces), letting getaddrinfo(3) validate IPv6 addresses.
2011-07-20 04:34:01 +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
Moriyoshi Koizumi
dacd564031
- Fixed bug #55107 (Null bytes in URL cause insecure behavior (code execution / code disclosure)).
2011-07-19 18:17:25 +00:00
Moriyoshi Koizumi
6b48551c93
- Buffers are local to the blocks where they belong.
2011-07-19 18:00:16 +00:00
Moriyoshi Koizumi
29745da338
- Print HTTP method as well in the log.
...
- Print response code also when the request is processed by a script.
- Those changes partly closes #55109 .
2011-07-19 17:47:34 +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
Stanislav Malyshev
4a5959d113
MF53
2011-07-12 04:58:55 +00:00
Stanislav Malyshev
46407e6f5e
MF53
2011-07-12 04:45:38 +00:00
Pierre Joye
fdd4aa7073
- add apache 2.3 (upcoming 2.4) handler
2011-07-06 11:13:38 +00:00
Felipe Pena
93776977d8
- Fixed bug #55076 (requires() fails in a subdirectory with the in-built webserver)
2011-07-06 01:54:54 +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
7711da059e
- Fixed bug #55118 (Imcomplete start message)
2011-07-03 14:45:41 +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
Jérôme Loyet
440727f4ed
- 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
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
d7897c2c2a
- 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
1e0cb5fec5
- 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
71e52a5ccd
- Reverted php_printf -> printf change
2011-07-01 17:18:50 +00:00
Philip Olson
18e0f8a489
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
c1abc8938d
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
54b84f832a
fix #55072 in-built web server needs to check -t option is a directory
2011-06-29 23:29:01 +00:00
Felipe Pena
6cc66ef964
- Fixed crash on invalid addr:port (Chris Jones, Felipe)
2011-06-27 23:18:26 +00:00
Jérôme Loyet
89c9a8ef44
- fixed request_timeout and slowlog_timeout from last FPM commit (r312496)
...
- typo
2011-06-27 11:33:03 +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
Jérôme Loyet
849d4e0357
- Replaced shm_slots with a real scoreboard
...
- Added several improvements to the status page
2011-06-26 15:48:11 +00:00
Felipe Pena
5304004cc7
- Fixed crash when using -e option
2011-06-25 20:40:03 +00:00
Felipe Pena
29588a6fa3
- 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
dc467a70d3
- Fixed crash when zend_eval_string bailouts (-r 'a();')
...
Reported by: David Tajchreber
2011-06-25 13:15:24 +00:00
Pierre Joye
0d7226ed60
- reflection is always enabled
2011-06-25 10:47:54 +00:00
Pierre Joye
213e1f4456
- reflection is always enabled
2011-06-25 10:47:54 +00:00
Derick Rethans
8e30050416
- Fixed layout. Tabs on the terminal don't align nicely in most cases.
2011-06-25 10:16:46 +00:00
Ilia Alshanetsky
86c44e119f
Fixed a bug with calculation of REQUEST_TIME in apache2
2011-06-23 14:12:50 +00:00
Jérôme Loyet
bbe8518456
- Added custom access log (also added per request %CPU and memory mesurement)
2011-06-23 08:03:52 +00:00
Jérôme Loyet
73b6310098
- Added custom access log (also added per request %CPU and memory mesurement)
2011-06-23 08:03:52 +00:00
Felipe Pena
34ef66d7a4
- Fix crash on cgi
2011-06-23 02:28:04 +00:00
Felipe Pena
7b91a9778a
- Fixed crash (take 2)
2011-06-23 00:40:31 +00:00
Felipe Pena
10bea32e8d
- Fixed crash on startup
2011-06-23 00:25:54 +00:00
Pierre Joye
f027884ca1
- fix build
2011-06-21 11:43:19 +00:00
Felipe Pena
8480b7f4be
- Fix memleak on `php -v'
2011-06-21 01:47:05 +00:00
Felipe Pena
b83af94c2b
- Fixed hardcoded INI
2011-06-20 23:36:25 +00:00
Moriyoshi Koizumi
5b921a87a1
- 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
955b801fea
Removed pid in debug logs written by chrildren processes
2011-06-20 00:03:39 +00:00
Jérôme Loyet
0f19777b7a
Removed pid in debug logs written by chrildren processes
2011-06-20 00:03:39 +00:00
Felipe Pena
e3da6ac3da
- Missing change
2011-06-18 17:46:16 +00:00
Felipe Pena
63db6d1435
- Missing change
2011-06-18 17:46:16 +00:00