1
0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Commit Graph

96 Commits

Author SHA1 Message Date
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
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
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
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
Matt Ficken
87a011d372 Fix bug 61769 Random failure of php_cli_server*phpt tests 2012-05-06 18:05:02 +02: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
da85337d13 Fixed typo
report by reeze.xia@gmail.com
2012-04-21 00:11:06 +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
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
Rasmus Lerdorf
81d45bc204 And fix the test cases as well 2012-03-02 03:43:07 +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
Pierre Joye
d8c6dd182b - any other dir may not exist or may not be used 2012-01-10 07:33:36 +00:00
Xinchen Hui
2217bba732 test for bug 60591 2011-12-22 08:08:52 +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
147c414279 Fixed bug #60477 (Segfault after two multipart/form-data POST requests) 2011-12-09 05:37:41 +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
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
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
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
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
0203c31f78 change test, and added a test for post file 2011-09-21 07:51:31 +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