Commit Graph

2700 Commits

Author SHA1 Message Date
Pierre Joye
9fbde3c349 - 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
Pierre Joye
29d7e7e8c0 - 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
7790c4d975 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
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
2ebe3799b1 Fixed #55457 for 5.4 branch
Use ssize_t instead of long (as pierre suggestion)
2011-08-19 07:40:51 +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
Xinchen Hui
e385f3ccf4 Fixed #55457(cli built-in web server does not work with IE), introduced by r315128 2011-08-19 07:24:35 +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
3202573bef - 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
83414d2e53 - WS 2011-08-17 11:59:39 +00:00
Pierre Joye
bae911f41b - WS 2011-08-17 11:59:39 +00:00
Pierre Joye
ad76cffcde - use provided stdint.h and avoid double definitions 2011-08-17 11:56:04 +00:00
Pierre Joye
cef071fd80 - use provided stdint.h and avoid double definitions 2011-08-17 11:56:04 +00:00
Uwe Schindler
96eff17161 Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection 2011-08-11 20:25:24 +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
Dmitry Stogov
69e98c9a61 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
Ilia Alshanetsky
0c1516f174 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
Xinchen Hui
8de80c9679 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
d9845c2046 More signed 1-bit bitfields 2011-08-07 15:57:35 +00:00
Rasmus Lerdorf
46a484e739 Signed 1-bit bitfields make no sense 2011-08-07 15:52:46 +00:00
Rasmus Lerdorf
25cdff4d75 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
2b874abb74 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
Rasmus Lerdorf
1a9f66d6d4 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
Felipe Pena
9c289189d3 - 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
Jérôme Loyet
3bd0db004e - Fixed bug #55340 (segfault when using some arguments -- bug introduced by commit r313351) 2011-08-02 00:58:51 +00:00
Florian Anderiasch
a06539a10d Fix #55121 Segfault with multipart/form-data POST 2011-07-25 16:45:39 +00:00
Florian Anderiasch
48ec4ace5f Fix #55121 Segfault with multipart/form-data POST 2011-07-25 16:45:39 +00:00
Moriyoshi Koizumi
c724b2eeb1 - Give index.php a precedence over index.html. Patch by davidc. 2011-07-23 11:29:26 +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
Pierre Joye
cc1c7af037 - 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
1f396617eb - 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
b07ad1e1a2 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
06381a8f25 - 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
Moriyoshi Koizumi
81cd23df4a - 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
9620fb7e09 - 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
3d10c57cd6 - 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
9f98a430fd - 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
7505322d15 - 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
Moriyoshi Koizumi
8e42748a37 - 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
9fa7a7e554 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
251879c890 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
6d3ff0eda1 - don't write directly to stderr, use the internal logger instead (zlog) 2011-07-18 00:53:13 +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
1dc21c2fd0 remove unused variable 2011-07-18 00:19:22 +00:00
Jérôme Loyet
d70bddb02d remove unused variable 2011-07-18 00:19:22 +00:00
Jérôme Loyet
a476f4d92c - remove is_fastcgi because FPM is always fastcgi 2011-07-18 00:09:30 +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
22065bc050 - 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
a3592145f8 backport r313186 from PHP_5_4 2011-07-17 14:42:58 +00:00
Jérôme Loyet
5ba64c511f backport r313323 and r313326 from PHP_5_4 2011-07-17 14:31:32 +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
23ad275e24 MF53 2011-07-12 04:58:55 +00:00
Stanislav Malyshev
4a5959d113 MF53 2011-07-12 04:58:55 +00:00
Stanislav Malyshev
3f0abb300c MF53 2011-07-12 04:45:38 +00:00
Stanislav Malyshev
46407e6f5e MF53 2011-07-12 04:45:38 +00:00
Pierre Joye
e501b7613d - add apache 2.3 (upcoming 2.4) handler 2011-07-06 11:13:38 +00:00
Pierre Joye
fdd4aa7073 - add apache 2.3 (upcoming 2.4) handler 2011-07-06 11:13:38 +00:00
Felipe Pena
c10d148870 - Fixed bug #55076 (requires() fails in a subdirectory with the in-built webserver) 2011-07-06 01:54:54 +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
1dcd19eba0 - Implemented FR #54098 (Lowered default value for Process Manager) 2011-07-05 21:03:26 +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
af84289663 - FR #52052: Added partial syslog support (on error_log only) 2011-07-05 19:22:45 +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
035536adca - 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
a3b31f5c18 - 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
e57914c1d8 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
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
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
bc427b0eba fix comment syntax 2011-07-04 12:49:46 +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
df10314070 - Fixed bug #55118 (Imcomplete start message) 2011-07-03 14:45:41 +00:00
Felipe Pena
7711da059e - 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
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
9b64314250 - 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
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
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
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
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
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
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
4296f07fcc - Reverted php_printf -> printf change 2011-07-01 17:18:50 +00:00
Felipe Pena
71e52a5ccd - 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
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
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
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
5024c32798 fix #55072 in-built web server needs to check -t option is a directory 2011-06-29 23:29:01 +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
f7a024023f - Fixed crash on invalid addr:port (Chris Jones, Felipe) 2011-06-27 23:18:26 +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
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
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
dace636cc9 - 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
8841454a10 - Fixed crash when using -e option 2011-06-25 20:40:03 +00:00
Felipe Pena
5304004cc7 - 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
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
9424d255c9 - Fixed crash when zend_eval_string bailouts (-r 'a();')
Reported by: David Tajchreber
2011-06-25 13:15:24 +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
eeade7180a - 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
6b56f4a5b8 - Fixed layout. Tabs on the terminal don't align nicely in most cases. 2011-06-25 10:16:46 +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
7f2882cc53 Fixed a bug with calculation of REQUEST_TIME in apache2 2011-06-23 14:12:50 +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
8dcfa2f916 - 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
de14ef3442 - Fixed crash (take 2) 2011-06-23 00:40:31 +00:00
Felipe Pena
7b91a9778a - 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
Felipe Pena
10bea32e8d - 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
Pierre Joye
f027884ca1 - 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
8480b7f4be - 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
Felipe Pena
b83af94c2b - 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
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
Jérôme Loyet
b5e5abb38a 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
8f76adb750 - Missing change 2011-06-18 17:46:16 +00:00
Felipe Pena
63db6d1435 - Missing change 2011-06-18 17:46:16 +00:00
Felipe Pena
6481440f3f - Fixed ZTS build 2011-06-18 17:41:56 +00:00
Felipe Pena
17bf772378 - Fixed ZTS build 2011-06-18 17:41:56 +00:00
Felipe Pena
94cd08457b - Fixed ZTS build 2011-06-18 17:41:56 +00:00
Jérôme Loyet
23a5f873fb Added master rlimit_files and rlimit_core in the global configuration settings 2011-06-18 16:27:48 +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
886cf1a318 Added master rlimit_files and rlimit_core in the global configuration settings 2011-06-18 16:27:48 +00:00
Jérôme Loyet
6e1f77ef6b Fixed exit at FPM startup on fpm_resources_prepare 2011-06-18 16:15:15 +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
eefbc4398a 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
e63f59191d Remove timestamp in logs written by children process 2011-06-18 15:33:07 +00:00
Jérôme Loyet
22be55e6da Remove timestamp in logs written by children process 2011-06-18 15:33:07 +00:00
Jérôme Loyet
dec96a12fa missing doc in the conf file 2011-06-17 23:35:47 +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
fd0009d8d6 missing doc in the conf file 2011-06-17 23:35:47 +00:00
Jérôme Loyet
3a5d2b2129 - added xml format to the status page
- clean fpm_status.c code
2011-06-17 23:19:54 +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
Jérôme Loyet
cff7a300d1 - added xml format to the status page
- clean fpm_status.c code
2011-06-17 23:19:54 +00:00
Felipe Pena
6a504c6f6b - Fix missing change from r303357 (related to bug #48831) 2011-06-11 23:46:35 +00:00
Rasmus Lerdorf
c49d060510 Fix Apache1 build 2011-06-10 11:46:35 +00:00
Rasmus Lerdorf
02023fc8fe Fix Apache1 build 2011-06-10 11:46:35 +00:00
George Wang
0bcbaa1750 fix socket address parsing code 2011-06-08 16:51:59 +00:00
Felipe Pena
32b5f8a1a3 - 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
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
George Wang
cb7f656de7 fix CLI mode timeout 2011-05-31 22:40:42 +00:00
Ilia Alshanetsky
f5779d5e16 Fixed bug #52496 (Zero exit code on option parsing failure). 2011-05-30 15:57:50 +00:00
Ilia Alshanetsky
a65eba016e Fixed bug #52496 (Zero exit code on option parsing failure). 2011-05-30 15:57:50 +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
00169ec00f - 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
Felipe Pena
a95a021509 - 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
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
27dd44db95 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
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
e85c367bc7 its force-quit, not -exit (yawk) 2011-04-23 21:12:25 +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
Pierrick Charron
e8486cc374 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
Jim Jagielski
39d814a205 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:27:30 +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
2cfc526bcb fix compile warning 2011-02-08 08:40:39 +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
6e57a7792e - 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
5bab8ea920 - 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
977d79a724 - 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
Jérôme Loyet
f386967b77 - 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
068a78014f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +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
Jérôme Loyet
326f50b1ea - 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
Antony Dovgal
25a43268fd add missing dl() function to FPM SAPI 2011-01-14 13:53:59 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19: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
Jérôme Loyet
e77d3268d7 - 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
George Wang
cccba0fa4d fixed keyLen validation point 2010-12-10 22:51:08 +00:00