You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/12/23 11:24:20 UTC
svn commit: r1775812 - in /httpd/test/mod_h2/trunk:
conf/sites/test-ser.example.org.conf conf/sites/test.example.org.conf
test/test_common.sh test/test_curl_get.sh
Author: icing
Date: Fri Dec 23 11:24:20 2016
New Revision: 1775812
URL: http://svn.apache.org/viewvc?rev=1775812&view=rev
Log:
adding test case for github #126
Modified:
httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
httpd/test/mod_h2/trunk/test/test_common.sh
httpd/test/mod_h2/trunk/test/test_curl_get.sh
Modified: httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf?rev=1775812&r1=1775811&r2=1775812&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf Fri Dec 23 11:24:20 2016
@@ -52,6 +52,14 @@
</Location>
ProxyPass /zeit http://www.zeit.de:80 max=20 ttl=120 retry=300
+ <IfVersion >= 2.4.24>
+ <Location /006>
+ H2CopyFiles On
+ Options +Indexes
+ HeaderName /006/header.html
+ </Location>
+ </IfVersion>
+
<Location "/server-status">
SetHandler server-status
</Location>
@@ -78,4 +86,11 @@
</Location>
RewriteRule /rewrite(.*) http://test-ser.example.org:SUBST_PORT_HTTP_SUBST$1 [P]
+ <IfVersion >= 2.4.24>
+ <Location /006>
+ H2CopyFiles On
+ Options +Indexes
+ HeaderName /006/header.html
+ </Location>
+ </IfVersion>
</VirtualHost>
Modified: httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf?rev=1775812&r1=1775811&r2=1775812&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf Fri Dec 23 11:24:20 2016
@@ -220,6 +220,8 @@
<IfVersion >= 2.4.24>
<Location /006>
H2CopyFiles On
+ Options +Indexes
+ HeaderName /006/header.html
</Location>
</IfVersion>
Modified: httpd/test/mod_h2/trunk/test/test_common.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_common.sh?rev=1775812&r1=1775811&r2=1775812&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Fri Dec 23 11:24:20 2016
@@ -404,8 +404,8 @@ curl_check_content() {
mkdir -p "$(dirname $TMP/$DOC)"
cat > $TMP/expected
echo -n " * curl /$DOC: $MSG..."
- ${CURL} "$@" $URL_PREFIX/$DOC > $TMP/$DOC 2>&1 || fail
- diff -u $TMP/expected $TMP/$DOC || fail
+ ${CURL} "$@" $URL_PREFIX/$DOC > $TMP/received 2>&1 || fail
+ diff -u $TMP/expected $TMP/received || fail
echo ok.
}
Modified: httpd/test/mod_h2/trunk/test/test_curl_get.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_curl_get.sh?rev=1775812&r1=1775811&r2=1775812&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_curl_get.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_curl_get.sh Fri Dec 23 11:24:20 2016
@@ -130,4 +130,24 @@ curl_check_necho 1000 "0123456789" $GEN/
curl_check_necho 10000 "0123456789" $GEN/necho-100k "http/2" --http2
curl_check_necho 100000 "0123456789" $GEN/necho-1m "http/2" --http2
+################################################################################
+# github issue #126
+if min_httpd_version 2.4.26; then
+curl_check_content 006/ "autoindex w. include" --http2 <<EOF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+ <title>Index of /006</title>
+ </head>
+ <body>
+<title>My Header Title</title>
+<ul><li><a href="/"> Parent Directory</a></li>
+<li><a href="006.css"> 006.css</a></li>
+<li><a href="006.js"> 006.js</a></li>
+<li><a href="header.html"> header.html</a></li>
+</ul>
+</body></html>
+EOF
+fi
+################################################################################