8 files changed, 2 insertions, 47 deletions
diff --git a/tests/docroot/Makefile.am b/tests/docroot/Makefile.am
index f99830c7..8df229fd 100644
--- a/tests/docroot/Makefile.am
+++ b/tests/docroot/Makefile.am
@@ -3,10 +3,6 @@ EXTRA_DIST=\
 	404.html \
 	404.pl \
 	cgi.pl \
-	exec-date.shtml \
 	index.html \
 	index.txt \
-	prefix.fcgi \
-	ssi-include.shtml \
-	ssi-include.txt \
-	ssi.shtml
+	prefix.fcgi
diff --git a/tests/docroot/exec-date.shtml b/tests/docroot/exec-date.shtml
deleted file mode 100644
index 2c8535bc..00000000
--- a/tests/docroot/exec-date.shtml
+++ /dev/null
@@ -1 +0,0 @@
-<!--#exec cmd="expr 1 + 1"-->
diff --git a/tests/docroot/ssi-include.shtml b/tests/docroot/ssi-include.shtml
deleted file mode 100644
index 317c6e3a..00000000
--- a/tests/docroot/ssi-include.shtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!--#echo var=SCRIPT_NAME-->
-<!--#echo var='SCRIPT_NAME'-->
-<!--#echo var="SCRIPT_NAME"-->
-<!--#include virtual="ssi-include.txt" -->
-<!--#include file="ssi-include.txt" -->
diff --git a/tests/docroot/ssi-include.txt b/tests/docroot/ssi-include.txt
deleted file mode 100644
index 3ea09a82..00000000
--- a/tests/docroot/ssi-include.txt
+++ /dev/null
@@ -1 +0,0 @@
-ssi-include
diff --git a/tests/docroot/ssi.shtml b/tests/docroot/ssi.shtml
deleted file mode 100644
index 473c5c65..00000000
--- a/tests/docroot/ssi.shtml
+++ /dev/null
@@ -1 +0,0 @@
-<!--#echo var="SCRIPT_NAME" -->
diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf
index dcfb7dc4..eb4d86b5 100644
--- a/tests/lighttpd.conf
+++ b/tests/lighttpd.conf
@@ -25,7 +25,6 @@ server.modules = (
 	"mod_simple_vhost",
 	"mod_cgi",
 	"mod_userdir",
-	"mod_ssi",
 	"mod_status",
 	"mod_secdownload",
 	"mod_deflate",
@@ -36,10 +35,6 @@ index-file.names = (
 	"index.html",
 )
 
-ssi.extension = (
-	".shtml",
-)
-
 accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log"
 
 mimetype.assign = (
diff --git a/tests/prepare.sh b/tests/prepare.sh
index e9a97265..688f2f54 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -31,7 +31,6 @@ mkdir -p "${tmpdir}/servers/www.example.org/pages/"           \
 cp "${srcdir}/docroot/"*.html \
    "${srcdir}/docroot/"*.pl \
    "${srcdir}/docroot/"*.fcgi \
-   "${srcdir}/docroot/"*.shtml \
    "${srcdir}/docroot/"*.txt \
    "${tmpdir}/servers/www.example.org/pages/"
 cp "${srcdir}/lighttpd.user" "${tmpdir}/"
diff --git a/tests/request.t b/tests/request.t
index 1ed279db..5c27c48b 100755
--- a/tests/request.t
+++ b/tests/request.t
@@ -8,7 +8,7 @@ BEGIN {
 
 use strict;
 use IO::Socket;
-use Test::More tests => 179;
+use Test::More tests => 176;
 use LightyTest;
 
 my $tf = LightyTest->new();
@@ -1823,31 +1823,4 @@ $t->{RESPONSE}  = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'BAR2
 ok($tf->handle_http($t) == 0, 'query set-response-header');
 
 
-## mod_ssi
-
-$t->{REQUEST}  = ( <<EOF
-GET /ssi.shtml HTTP/1.0
-EOF
- );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "/ssi.shtml\n" } ];
-ok($tf->handle_http($t) == 0, 'ssi - echo ');
-
-
-## bug #280
-$t->{REQUEST}  = ( <<EOF
-GET /exec-date.shtml HTTP/1.0
-EOF
- );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "2\n\n" } ];
-ok($tf->handle_http($t) == 0, 'ssi - echo ');
-
-
-$t->{REQUEST}  = ( <<EOF
-GET /ssi-include.shtml HTTP/1.0
-EOF
- );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "/ssi-include.shtml\n/ssi-include.shtml\n/ssi-include.shtml\nssi-include\n\nssi-include\n\n" } ];
-ok($tf->handle_http($t) == 0, 'ssi - include');
-
-
 ok($tf->stop_proc == 0, "Stopping lighttpd");