From 6e7d69047fd73c54b222095f821787fd6af7bf68 Mon Sep 17 00:00:00 2001
From: pascalc <pascal.chevrel@free.fr>
Date: Tue, 11 Dec 2012 12:45:00 +0100
Subject: [PATCH 1/2] update list of common Mime Types in PHP development
 server to support Web audio/video formats (Webm ,and Ogg containers) + have
 jpeg mime types listed together

---
 sapi/cli/php_cli_server.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index d0d4cefb909e..9fc2817c277a 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -259,10 +259,13 @@ static php_cli_server_ext_mime_type_pair mime_type_map[] = {
 	{ "gif", "image/gif" },
 	{ "jpg", "image/jpeg" },
 	{ "jpeg", "image/jpeg" },
-	{ "png", "image/png" },
 	{ "jpe", "image/jpeg" },
+	{ "png", "image/png" },
 	{ "svg", "image/svg+xml" },
 	{ "txt", "text/plain" },
+	{ "webm", "video/webm" },
+	{ "ogv", "video/ogg" },
+	{ "ogg", "audio/ogg" },
 	{ NULL, NULL }
 };
 

From 6ff7c3dfee7a6f32aed3fa137bddd03f0fecd12a Mon Sep 17 00:00:00 2001
From: pascalc <pascal.chevrel@free.fr>
Date: Tue, 11 Dec 2012 16:05:12 +0100
Subject: [PATCH 2/2] update test for supported Mime Types checking

---
 sapi/cli/tests/bug61977.phpt | 164 +++++++----------------------------
 1 file changed, 31 insertions(+), 133 deletions(-)

diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt
index 2f198060f545..09a6ba6d2309 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