archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-5.4'

Browse source 
* PHP-5.4:
  Implemented FR #61977 (Need CLI web-server support for files with .htm & svg extensions)
This commit is contained in:
Xinchen Hui 2012-05-09 11:28:09 +08:00
commit 67075609d3
2 changed files with 164 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sapi/cli/php_cli_server.c
View file

@ -251,15 +251,17 @@ static php_cli_server_http_reponse_status_code_pair template_map[] = {
}; };
static php_cli_server_ext_mime_type_pair mime_type_map[] = { static php_cli_server_ext_mime_type_pair mime_type_map[] = {
{ "html", "text/html" },
{ "htm", "text/html" },
{ "js", "text/javascript" },
{ "css", "text/css" },
{ "gif", "image/gif" }, { "gif", "image/gif" },
{ "png", "image/png" },
{ "jpe", "image/jpeg" },
{ "jpg", "image/jpeg" }, { "jpg", "image/jpeg" },
{ "jpeg", "image/jpeg" }, { "jpeg", "image/jpeg" },
{ "css", "text/css" }, { "png", "image/png" },
{ "html", "text/html" }, { "jpe", "image/jpeg" },
{ "svg", "image/svg+xml" },
{ "txt", "text/plain" }, { "txt", "text/plain" },
{ "js", "text/javascript" },
{ NULL, NULL } { NULL, NULL }
}; };

157
sapi/cli/tests/bug61977.phpt Normal file
View file

@ -0,0 +1,157 @@
--TEST--
Bug #60159 (Router returns false, but POST is not passed to requested resource)
--SKIPIF--
<?php
include "skipif.inc";
?>
--FILE--
<?php
include "php_cli_server.inc";
php_cli_server_start('<?php ?>', true);
$doc_root = __DIR__;
list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
$port = intval($port)?:80;
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.html', '');
if(fwrite($fp, <<<HEADER
GET /foo.html HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.html => ", $text;
}
}
}
@unlink($doc_root . '/foo.html');
fclose($fp);
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.htm', '');
if(fwrite($fp, <<<HEADER
GET /foo.htm HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.htm => ", $text;
}
}
}
@unlink($doc_root . '/foo.htm');
fclose($fp);
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.svg', '');
if(fwrite($fp, <<<HEADER
GET /foo.svg HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.svg => ", $text;
}
}
}
@unlink($doc_root . '/foo.svg');
fclose($fp);
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.css', '');
if(fwrite($fp, <<<HEADER
GET /foo.css HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.css => ", $text;
}
}
}
@unlink($doc_root . '/foo.css');
fclose($fp);
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.js', '');
if(fwrite($fp, <<<HEADER
GET /foo.js HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.js => ", $text;
}
}
}
@unlink($doc_root . '/foo.js');
fclose($fp);
$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
if (!$fp) {
die("connect failed");
}
file_put_contents($doc_root . '/foo.png', '');
if(fwrite($fp, <<<HEADER
GET /foo.png HTTP/1.1
Host: {$host}
HEADER
)) {
while (!feof($fp)) {
$text = fgets($fp);
if (strncasecmp("Content-type:", $text, 13) == 0) {
echo "foo.png => ", $text;
}
}
}
@unlink($doc_root . '/foo.png');
fclose($fp);
?>
--EXPECTF--
foo.html => Content-Type: text/html; charset=UTF-8
foo.htm => Content-Type: text/html; charset=UTF-8
foo.svg => Content-Type: image/svg+xml
foo.css => Content-Type: text/css; charset=UTF-8
foo.js => Content-Type: text/javascript; charset=UTF-8
foo.png => Content-Type: image/png