From 5ac9c1f23e2a0580beeb834474ccac9dbc146f1e Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Tue, 22 Apr 2008 17:03:10 +0000
Subject: [PATCH] remove unreachable code, add test for no file extension and
 unknown file extension with Phar::webPhar

---
 ext/phar/phar_object.c                         |   4 ----
 ext/phar/tests/files/frontcontroller8.phar     | Bin 554 -> 649 bytes
 ext/phar/tests/files/frontcontroller8.phar.inc |   2 ++
 ext/phar/tests/frontcontroller26.phpt          |  14 ++++++++++++++
 ext/phar/tests/frontcontroller27.phpt          |  14 ++++++++++++++
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 ext/phar/tests/frontcontroller26.phpt
 create mode 100644 ext/phar/tests/frontcontroller27.phpt

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 4fd99e2345..d582f453b3 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -56,10 +56,6 @@ static int phar_file_type(HashTable *mimes, char *file, char **mime_type TSRMLS_
 {
 	char *ext;
 	phar_mime_type *mime;
-	if (!mime_type) {
-		/* assume PHP */
-		return 0;
-	}
 	ext = strrchr(file, '.');
 	if (!ext) {
 		*mime_type = "text/plain";
diff --git a/ext/phar/tests/files/frontcontroller8.phar b/ext/phar/tests/files/frontcontroller8.phar
index bd1070fc4fe253b025d21006e9553f4695202400..17648c208be08ddc435c6d84874761e29497d2cb 100644
GIT binary patch
delta 248
zcmZ3*(#bmEG^;iv0|Upz3-a!{l6)R43=9ms?b+JffPx^v4#bIudIcE;#Tq~+NC}8;
zzT)o#Q^E>TqL)>W4$=!$FxiYzju}LUGpc~;I!1*MkVYY(eC<5Nm&h9P@>45Hm>?QG
zK=c}|$v0pMxPkoAyzIRE@;p7DGEt~95Uty~RABNd#uVd>OdETk>lDfoi{evCa|<+-
lGBTAkt&ec0s(ss&<H`Sj>8iUeGcI%LEb<2#@9yO51OT=8I#vJx

delta 153
zcmeBVUBxotH0xsq1_ri?7v$X!U*_>(0djcTv$eM|0vSNS4#bIudIcE;#Tq~+NC}8;
zzT)o#Q^E>TqL)>W4$=!$FxiYzju}LUGpc~;Iz|N^kVYY(eC<5Nmy<s+rpQPdrSLqu
b_+fpz$|=<a-AU8(eOjI{0TsAA`8ojr;<+n{

diff --git a/ext/phar/tests/files/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc
index 243da136c1..70bd421d97 100644
--- a/ext/phar/tests/files/frontcontroller8.phar.inc
+++ b/ext/phar/tests/files/frontcontroller8.phar.inc
@@ -7,6 +7,8 @@ $a['a.jpg'] = 'hio2';
 $a['a.php'] = '<?php function hio(){}';
 $a['fronk.gronk'] = 'hio3';
 $a['404.php'] = 'My 404 is rawesome';
+$a['noext'] = 'hi';
+$a['unknown.ext'] = '<?php var_dump("hi");';
 $a->setStub('<?php
 Phar::webPhar("whatever", "index.php", "404.php", array("jpg" => "foo/bar", "phps" => Phar::PHP, "php" => Phar::PHPS));
 echo "oops did not run\n";
diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt
new file mode 100644
index 0000000000..a8097b0886
--- /dev/null
+++ b/ext/phar/tests/frontcontroller26.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Phar front controller with unknown extension mime type
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--ENV--
+SCRIPT_NAME=/frontcontroller26.php
+REQUEST_URI=/frontcontroller26.php/unknown.ext
+PATH_INFO=/unknown.ext
+--FILE_EXTERNAL--
+files/frontcontroller8.phar
+--EXPECTHEADERS--
+Content-type: application/octet-stream
+--EXPECTF--
+<?php var_dump("hi");
\ No newline at end of file
diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt
new file mode 100644
index 0000000000..78c9536410
--- /dev/null
+++ b/ext/phar/tests/frontcontroller27.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Phar front controller with no extension
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--ENV--
+SCRIPT_NAME=/frontcontroller27.php
+REQUEST_URI=/frontcontroller27.php/noext
+PATH_INFO=/noext
+--FILE_EXTERNAL--
+files/frontcontroller8.phar
+--EXPECTHEADERS--
+Content-type: text/plain
+--EXPECTF--
+hi
\ No newline at end of file
-- 
2.50.1