clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,535 Commits 494 Branches 1,367 Tags 800 MiB
1222f51ebd
Commit Graph

582 Commits

Author SHA1 Message Date
Lars Strojny
d0e96a5575 Merge branch 'PHP-5.4' 2012-09-18 22:17:36 +02:00
Lars Strojny
aa133ea282 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver 2012-09-18 22:16:51 +02:00
Stanislav Malyshev
6cc9d99dc2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Respond with 501 to unknown request methods
 2012-09-15 23:11:55 -07:00
Niklas Lindgren
27542db4e7 Respond with 501 to unknown request methods 
Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page
 2012-09-15 23:11:12 -07:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Felipe Pena
f84947c688 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
 2012-08-16 15:45:40 -03:00
Felipe Pena
2e1d31d123 - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set) 2012-08-16 15:45:21 -03:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132' 
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
 2012-08-05 21:15:53 -07:00
Xinchen Hui
d1f0662e4d Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value) 
The fix is make 5.4 behavior consistent with 5.3
 2012-08-02 23:03:38 +08:00
Xinchen Hui
36100060b3 Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server 2012-08-01 23:54:01 +08:00
Xinchen Hui
0988ae3c43 Implemented FR #62700 (have the console output 'Listening on http://localhost:8000') 2012-07-31 22:42:28 +08:00
Johannes Schlüter
860b3ffe75 Fix Bug #62612 readline extension compilation fails 2012-07-22 23:28:32 +02:00
Xinchen Hui
a88eca53f7 Improve error message for ssl request 2012-07-22 19:20:23 +08:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS 
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
 2012-07-14 21:44:21 +01:00
Johannes Schlüter
9a86784859 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
 2012-06-27 11:46:57 +02:00
Johannes Schlüter
bc0972e78d Fix memleak in CLI 2012-06-27 11:42:43 +02:00
stealth35
11a202ef50 Fix potential leak in cli server 2012-06-16 00:56:54 +03:00
Anatoliy Belsky
c4f9b01422 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
	NEWS
	sapi/fpm/fpm/fpm_main.c
 2012-05-29 12:19:20 +02:00
Matt Ficken
4054890b26 Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt 2012-05-29 11:41:44 +02:00
Xinchen Hui
d394c17293 Correct test title 2012-05-09 11:28:57 +08:00
Xinchen Hui
1e60d0c105 Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions) 2012-05-09 11:27:39 +08:00
Xinchen Hui
7b2ab56997 Fix test failed, the fsockopen will be refused immediately if the server is not set up. 2012-05-09 11:21:24 +08:00
David Soria Parra
2cb0ed1328 Typo 2012-05-08 22:08:54 +02:00
Matt Ficken
87a011d372 Fix bug 61769 Random failure of php_cli_server*phpt tests 2012-05-06 18:05:02 +02:00
Xinchen Hui
ad3a42c26c correct variable name 2012-05-06 20:37:03 +08:00
Xinchen Hui
fd518ffc7e Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
 2012-04-30 12:15:43 +08:00
Xinchen Hui
bae56a87f8 Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). 2012-04-30 12:09:22 +08:00
Xinchen Hui
8d44b91731 typo in test 2012-04-21 10:15:35 +08:00
Xinchen Hui
b999e91f5b Make css string constant 2012-04-21 09:31:00 +08:00
Xinchen Hui
da85337d13 Fixed typo 
report by reeze.xia@gmail.com
 2012-04-21 00:11:06 +08:00
Xinchen Hui
cc58373d4d Improved performance while sending error page 
this also fixed bug #61785 (Memory leak when access a non-exists file without router)
 2012-04-21 00:01:10 +08:00
Felipe Pena
0a46d63f7e - Fixed expected test result (patch by ab@php.net in #61769) 2012-04-19 20:15:11 -03:00
Felipe Pena
d5bd45429c - Fix test title 2012-04-19 20:05:30 -03:00
Ilia Alshanetsky
9dcfb8c73f Fixed bug #61461 (missing checks around malloc() calls). 2012-03-20 21:07:08 -04:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00
Xinchen Hui
30bd2494a2 Use newdoc instead of escape char 2012-03-20 15:26:58 +08: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
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
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
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +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
Pierre Joye
d8c6dd182b - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui
2217bba732 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
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
e29c46a50d add $_SERVER["SERVER_NAME"] since it's handy 2011-12-09 16:16:31 +00:00
Xinchen Hui
8fff0e86d7 fix memory leak 2011-12-09 14:05:26 +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
653e68233a - implement FR #60390, SERVER_PORT missing 2011-11-25 21:18:40 +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
f2c6e116d2 revert my previous change, tests hangs on windows 2011-11-17 02:32:21 +00:00
Xinchen Hui
347876158c improve the test, let it say about errors 2011-11-17 02:22:06 +00:00
Xinchen Hui
f42ea8557c MFH, fix test 2011-11-15 03:19:54 +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
fcbfbea8d2 - fix bug #60272, typo 2011-11-11 18:50:52 +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
9886e865a3 broaden php version wildcard in cli server tests 2011-11-11 11:26:51 +00:00
Xinchen Hui
ceac9dc490 Fixed bug #60189 (php logo can not be displayed) 2011-11-01 13:06:41 +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
6f0d8245a4 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
08d372716c 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
Ferenc Kovacs
8747d2245d 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
a6bc3f6c59 fix memory leak 2011-10-23 03:02:24 +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
Moriyoshi Koizumi
2cf34bc9fc 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
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
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
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
9eb19ae2bf Avoid a potential double-free here 2011-08-06 23:42:52 +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
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
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
Felipe Pena
93776977d8 - Fixed bug #55076 (requires() fails in a subdirectory with the in-built webserver) 2011-07-06 01:54:54 +00:00
Felipe Pena
7711da059e - Fixed bug #55118 (Imcomplete start message) 2011-07-03 14:45:41 +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
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
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
Felipe Pena
6a504c6f6b - Fix missing change from r303357 (related to bug #48831) 2011-06-11 23:46:35 +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
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
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
Felipe Pena
bc049ccb62 - Fix missing mkdir for bindir (patch by David Tajchreber) 2011-01-23 22:40:35 +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