Commit: d813af06187c42d89b68d49ba1acf0c207026e8f Author: pascalc <pascal.chev...@free.fr> Tue, 11 Dec 2012 16:05:12 +0100 Committer: Lars Strojny <lstro...@php.net> Fri, 14 Dec 2012 13:59:06 +0100 Parents: e5b1ebc082416330cd6f6b8f457d825aab2674eb Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d813af06187c42d89b68d49ba1acf0c207026e8f Log: update test for supported Mime Types checking Changed paths: M sapi/cli/tests/bug61977.phpt Diff: diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt index 2f19806..09a6ba6 100644 --- a/sapi/cli/tests/bug61977.phpt +++ b/sapi/cli/tests/bug61977.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #61977 (Need CLI web-server support for files with .htm & svg extensions) +Bug #61977 test CLI web-server support for Mime Type File extensions mapping --SKIPIF-- <?php include "skipif.inc"; @@ -8,145 +8,40 @@ include "skipif.inc"; <?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 +/* + * If a Mime Type is added in php_cli_server.c, add it to this array and update + * the EXPECTF section accordingly + */ +$mimetypes = ['html', 'htm', 'svg', 'css', 'js', 'png', 'webm', 'ogv', 'ogg']; + +function test_mimetypes($mimetypes) { + foreach ($mimetypes as $mimetype) { + 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(__DIR__ . "/foo.{$mimetype}", ''); + $header = <<<HEADER +GET /foo.{$mimetype} HTTP/1.1 Host: {$host} -HEADER -)) { - while (!feof($fp)) { - $text = fgets($fp); - if (strncasecmp("Content-type:", $text, 13) == 0) { - echo "foo.svg => ", $text; +HEADER; + if (fwrite($fp, $header)) { + while (!feof($fp)) { + $text = fgets($fp); + if (strncasecmp("Content-type:", $text, 13) == 0) { + echo "foo.{$mimetype} => ", $text; + } + } + @unlink(__DIR__ . "/foo.{$mimetype}"); + fclose($fp); } - } + } } -@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); +test_mimetypes($mimetypes); ?> --EXPECTF-- foo.html => Content-Type: text/html; charset=UTF-8 @@ -155,3 +50,6 @@ 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 +foo.webm => Content-Type: video/webm +foo.ogv => Content-Type: video/ogg +foo.ogg => Content-Type: audio/ogg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
