clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,029 Commits 494 Branches 1,367 Tags 813 MiB
ada46c75f4
Commit Graph

2961 Commits

Author SHA1 Message Date
Xinchen Hui
65062b47f3 Fix bug #61430 for trunk 2012-04-17 11:23:28 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
 2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
David Soria Parra
443e3b4c93 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61461 (missing checks around malloc() calls).

Conflicts:
	NEWS
 2012-03-21 12:15:33 +01: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
9dcfb8c73f Fixed bug #61461 (missing checks around malloc() calls). 2012-03-20 21:07:08 -04:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Xinchen Hui
1a42558832 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Minor change, test using php mail address as account
 2012-03-20 15:42:25 +08:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00
Xinchen Hui
a0d149bc50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Use newdoc instead of escape char
  adapt makedist to git
 2012-03-20 15:27:41 +08:00
Xinchen Hui
30bd2494a2 Use newdoc instead of escape char 2012-03-20 15:26:58 +08: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
Xinchen Hui
4ff1126846 Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) 2012-03-11 08:56:14 +00:00
Xinchen Hui
40cd3d54b9 Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router) 2012-03-11 08:56:14 +00:00
Xinchen Hui
024420e90b Add Moriyoshi Koizumi and I to the cli SAPI credits 2012-03-11 08:41:40 +00:00
Xinchen Hui
0d076c3c77 Add Moriyoshi Koizumi and I to the cli SAPI credits 2012-03-11 08:41:40 +00:00
Rasmus Lerdorf
81d45bc204 And fix the test cases as well 2012-03-02 03:43:07 +00:00
Rasmus Lerdorf
16748fe0fa CLI Server was sending "Connection: closed" instead of "Connection: close" 2012-03-02 03:38:04 +00:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
730b54a374 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
bdbcc1789d more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00: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
Nikita Popov
0a91432828 Fix cli server tests broken by r323078 
Needs to be merged to 5.4 after r323078 is merged.
 2012-02-18 11:59:13 +00:00
Dmitry Stogov
106e88b3db Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov
2e94124494 Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Gustavo André dos Santos Lopes
6af0bdc2a3 - Connection: close, not "closed". 2012-02-05 11:45:01 +00:00
Dmitry Stogov
87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00
Michael Wallner
7aedbed543 fix usage of php_output_(de)activate; I guess this code doesn't bother about one more hack; 2012-01-31 10:47:21 +00:00
Michael Wallner
93c549913f fix usage of php_output_(de)activate; I guess this code doesn't bother about one more hack; 2012-01-31 10:47:21 +00:00
Michael Wallner
c64a69c8b8 MFH: r322963 
fix headers print to stdout/stderr if no output written; 
fix crashes and invalid usage of output control in cli server while passing by
 2012-01-31 09:58:26 +00:00
Michael Wallner
29c8658dc8 fix headers print to stdout/stderr if no output written; need to make some more testsbefore committing to PHP_5_4; fix crashes and invalid usage of output control in cli server while passing by 2012-01-31 08:51:24 +00:00
Rasmus Lerdorf
a5c3078c3f Missing ifdef here 
Fixes bug 60811
 2012-01-19 22:35:22 +00:00
Rasmus Lerdorf
5d90aa1299 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
Pierre Joye
3893b152ed - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Pierre Joye
d8c6dd182b - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Jérôme Loyet
0a67d26633 - Fixed bug #60659 (FPM does not clear auth_user on request accept) 2012-01-04 21:18:26 +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
0eb2eec938 - 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
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
George Wang
f9d84f4f6b fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:22 +00:00
George Wang
3c1df3349a fixed a crash in cli mode when apache_request_headers() is called 2011-12-31 18:15:06 +00:00
Xinchen Hui
2217bba732 test for bug 60591 2011-12-22 08:08:52 +00:00
Xinchen Hui
256dfd87ad test for bug 60591 2011-12-22 08:08:52 +00:00
Xinchen Hui
77b97de8df Fix bug #60591 (Memory leak when access a non-exists file) 2011-12-22 07:39:44 +00:00
Xinchen Hui
68147465af Fix bug #60591 (Memory leak when access a non-exists file) 2011-12-22 07:39:44 +00:00
Xinchen Hui
80ab69876c Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) 2011-12-16 19:25:03 +00:00
Xinchen Hui
8b16b7bd4b Fixed bug #60523 (PHP Errors are not reported in browsers using built-in SAPI) 2011-12-16 19:25:03 +00:00
Xinchen Hui
9751092fbc add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
e29c46a50d add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
a469096235 fix memory leak 2011-12-09 14:05:26 +00:00
Xinchen Hui
8fff0e86d7 fix memory leak 2011-12-09 14:05:26 +00:00
Xinchen Hui
3f60731a09 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +00:00
Xinchen Hui
147c414279 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +00:00
Pierre Joye
31eaf9043d - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +00:00
Pierre Joye
653e68233a - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +00:00
Felipe Pena
22028c78f8 - Removed C++ comment style 2011-11-19 12:16:47 +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
Pierrick Charron
5020d4a5cf Don't load php.ini file to test the built-in web server 2011-11-18 06:15:25 +00:00
Pierrick Charron
3bfd03b6b6 Don't load php.ini file to test the built-in web server 2011-11-18 06:15:25 +00:00
Xinchen Hui
319e1eea13 revert my previous change, tests hangs on windows 2011-11-17 02:32:21 +00:00
Xinchen Hui
f2c6e116d2 revert my previous change, tests hangs on windows 2011-11-17 02:32:21 +00:00
Xinchen Hui
33078757e2 improve the test, let it say about errors 2011-11-17 02:22:06 +00:00
Xinchen Hui
347876158c improve the test, let it say about errors 2011-11-17 02:22:06 +00:00
George Wang
25ccd72217 keep code to be compatible with PHP4 2011-11-16 04:00:28 +00:00
George Wang
56728f11a8 keep code to be compatible with PHP4 2011-11-16 03:58:57 +00:00
George Wang
dfd357db55 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:46:54 +00:00
George Wang
badd6a91d4 keep PHP_5_4 in sync with PHP_5_3 branch 2011-11-16 03:44:42 +00:00
Jérôme Loyet
8046729671 - Added .phar to default authorized extensions 2011-11-16 00:21:38 +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
62aaa5ac24 - remove experimental flag on fpm 2011-11-15 22:40:10 +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
1546456cdd - 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
Xinchen Hui
f42ea8557c MFH, fix test 2011-11-15 03:19:54 +00:00
Xinchen Hui
f8503b4332 Fixed bug #60159 (Router returns false, but POST is not passed to requested 
resource) and bug #55759 (mem leak when use built-in server)
 2011-11-15 03:15:19 +00:00
Xinchen Hui
f8386e349f Fixed bug #60159 (Router returns false, but POST is not passed to requested 
resource) and bug #55759 (mem leak when use built-in server)
 2011-11-15 03:15:19 +00:00
Pierre Joye
2a600a3b75 - fix bug #60272, typo 2011-11-11 18:50:52 +00:00
Pierre Joye
fcbfbea8d2 - fix bug #60272, typo 2011-11-11 18:50:52 +00:00
Peter Cowburn
1c0765195e broaden php version wildcard in cli server tests (missed a few) 2011-11-11 11:33:23 +00:00
Peter Cowburn
5c1c2d725f broaden php version wildcard in cli server tests (missed a few) 2011-11-11 11:33:23 +00:00
Peter Cowburn
2a41f272e4 broaden php version wildcard in cli server tests 2011-11-11 11:26:51 +00:00
Peter Cowburn
9886e865a3 broaden php version wildcard in cli server tests 2011-11-11 11:26:51 +00:00
Jérôme Loyet
b4ccb69736 - Fixed bug #60179 (php_flag and php_value does not work properly) 2011-11-03 15:47:19 +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
d7d0d0724c 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
Xinchen Hui
bba44800ae Fixed bug #60189 (php logo can not be displayed) 2011-11-01 13:06:41 +00:00
Xinchen Hui
ceac9dc490 Fixed bug #60189 (php logo can not be displayed) 2011-11-01 13:06:41 +00:00
Xinchen Hui
c0402915e7 Fixed Bug #60180 ($_SERVER["PHP_SELF"] incorrect) 2011-11-01 12:24:02 +00:00
Xinchen Hui
ac789e0bb6 Fixed Bug #60180 ($_SERVER["PHP_SELF"] incorrect) 2011-11-01 12:24:02 +00:00
Xinchen Hui
091f279eb0 Fixed bug #60146 (Last 2 lines of page not being output) 2011-10-29 02:14:04 +00:00
Xinchen Hui
62270fef73 Fixed bug #60146 (Last 2 lines of page not being output) 2011-10-29 02:14:04 +00:00
Xinchen Hui
6f0d8245a4 Fix test faild on windows due to DEFAULT_SLASH 2011-10-25 10:56:11 +00:00
Xinchen Hui
14b2cc32fc Fix test faild on windows due to DEFAULT_SLASH 2011-10-25 10:56:11 +00:00
Xinchen Hui
67ae60f4f5 Fix test, now can run on windows 2011-10-25 10:54:39 +00:00
Xinchen Hui
688ba01bc4 Fix test, now can run on windows 2011-10-25 10:54:39 +00:00
Xinchen Hui
08d372716c A better fix, sorry for previous thoughtlessness commit. 2011-10-24 03:47:42 +00:00
Xinchen Hui
c0c0c7c753 A better fix, sorry for previous thoughtlessness commit. 2011-10-24 03:47:42 +00:00
Xinchen Hui
d8911efbb6 Fixed PATH_INFO of /index.php/foo/bar 2011-10-24 03:28:59 +00:00
Xinchen Hui
f216bce2ff Fixed PATH_INFO of /index.php/foo/bar 2011-10-24 03:28:59 +00:00
Ferenc Kovacs
8747d2245d using %s-dev instead of the exact version number 2011-10-23 20:38:53 +00:00
Ferenc Kovacs
145437e016 using %s-dev instead of the exact version number 2011-10-23 20:38:53 +00:00
Xinchen Hui
7c1e64e2a6 add tests for PATH_INFO 
update php_cli_server.inc to support no router server
 2011-10-23 13:57:25 +00:00
Xinchen Hui
455bc9df4c add tests for PATH_INFO 
update php_cli_server.inc to support no router server
 2011-10-23 13:57:25 +00:00
Xinchen Hui
0f178b7796 fix memory leak 2011-10-23 03:02:24 +00:00
Xinchen Hui
a6bc3f6c59 fix memory leak 2011-10-23 03:02:24 +00:00
Xinchen Hui
cd216d38be Fixed bug #60112 If URI does not contain a file, index.php is not served 
This is a windows Issue.
and after this fix, previously 404 request like "localhost/foo/bar"
now could server correctly with request_uri "index.php" and PATH_INFO "/foo/bar/"
 2011-10-23 02:54:06 +00:00
Xinchen Hui
8d467563e2 Fixed bug #60112 If URI does not contain a file, index.php is not served 
This is a windows Issue.
and after this fix, previously 404 request like "localhost/foo/bar"
now could server correctly with request_uri "index.php" and PATH_INFO "/foo/bar/"
 2011-10-23 02:54:06 +00:00
Ferenc Kovacs
64ec41f7d4 stream_socket_server("unix://..." has a length limit, so it is better to use the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106 2011-10-22 21:44:05 +00:00
Ferenc Kovacs
263ab7e2d4 stream_socket_server("unix://..." has a length limit, so it is better to use the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106 2011-10-22 21:44:05 +00:00
Ferenc Kovacs
e509dfec9c stream_socket_server("unix://..." has a length limit, so it is better to use the tmp dir instead of the current test dir for the socket file. see https://bugs.php.net/bug.php?id=60106 2011-10-22 21:44:05 +00:00
Moriyoshi Koizumi
2cf34bc9fc Add SERVER_PROTOCOL variable to $_SERVER. Patch by kuzuha. Thanks. 2011-10-21 05:24:30 +00:00
Moriyoshi Koizumi
c34ef62773 Add SERVER_PROTOCOL variable to $_SERVER. Patch by kuzuha. Thanks. 2011-10-21 05:24:30 +00:00
Ferenc Kovacs
8bbbfadcfe there is a length limit on the shebang line, ignore the tests for >= 127 2011-10-20 18:09:44 +00:00
Ferenc Kovacs
465cb32c4c there is a length limit on the shebang line, ignore the tests for >= 127 2011-10-20 18:09:44 +00:00
Ferenc Kovacs
99bb66404d there is a length limit on the shebang line, ignore the tests for >= 127 2011-10-20 18:09:44 +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
280a177a97 - 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
c15987bdd4 - 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
d24cd92a22 - 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
ec369966df - 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
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
4e2664a602 - 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
d64c8e78ca - 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
d546fae741 - 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
7b57d87400 - 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
Adam Harvey
f75c7302cb 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
8b65d7b80c Add tests 2011-09-23 03:09:12 +00:00
Xinchen Hui
32dba92b66 Add tests for bug #55755 2011-09-22 02:26:00 +00:00
Xinchen Hui
8933798d36 Add tests for bug #55755 2011-09-22 02:26:00 +00:00
Xinchen Hui
75f721f4a0 Fixed bug #55755 (SegFault when outputting header WWW-Authenticate) 2011-09-21 16:00:09 +00:00
Xinchen Hui
d603d05398 Fixed bug #55755 (SegFault when outputting header WWW-Authenticate) 2011-09-21 16:00:09 +00:00
Xinchen Hui
8d97573973 change test, and added a test for post file 2011-09-21 07:51:31 +00:00
Xinchen Hui
0203c31f78 change test, and added a test for post file 2011-09-21 07:51:31 +00:00
Xinchen Hui
8c161dcd4b Remove double checking, and use MAXPATHLEN instead of a fixed length 2011-09-21 06:59:47 +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
f0e38127b8 Change to a more appropriate name 2011-09-21 03:16:35 +00:00
Xinchen Hui
f3aa34a90d Change to a more appropriate name 2011-09-21 03:16:35 +00:00
Xinchen Hui
86a48c6ca9 Fixed bug #55747 (request headers missed in $_SERVER) 2011-09-21 03:09:42 +00:00
Xinchen Hui
82be5fcc4f Fixed bug #55747 (request headers missed in $_SERVER) 2011-09-21 03:09:42 +00:00
Shein Alexey
2cf4f98c93 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
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
0d74e0f091 fix INI section 2011-09-20 08:13:55 +00:00
Xinchen Hui
1b9fbe540e fix INI section 2011-09-20 08:13:55 +00:00
Xinchen Hui
552bfa8156 Add tests for built-in webserver 2011-09-20 07:10:46 +00:00
Xinchen Hui
00bab0493e Add tests for built-in webserver 2011-09-20 07:10:46 +00:00
Xinchen Hui
eb233a26f7 Fix Bug #55726 (Changing the working directory makes router script inaccessible) 2011-09-20 07:06:55 +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
3aa8140ebd Fix folder 2011-09-20 05:07:15 +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
Dmitry Stogov
e43ff1359e 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
Xinchen Hui
0b16d13352 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
Arpad Ray
88e36378ff 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
Christopher Jones
7a280ee650 Update log, marking 5.4 and trunk as XFAIL due to bug #55496 2011-08-23 20:59:10 +00:00
Xinchen Hui
f7c6c67d19 Added _SERVER[SERVER_SOFTWARE] for built-in server 2011-08-22 15:51:49 +00:00
Xinchen Hui
bbf96ebeb1 Added _SERVER[SERVER_SOFTWARE] for built-in server 2011-08-22 15:51:49 +00:00
Xinchen Hui
1e0e85ec1a Fixed #55463 (cli-server missing _SERVER[REMOTE_ADDR]) 2011-08-22 11:55:41 +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
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