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 2015/10/20 15:34:17 UTC
svn commit: r1709586 - in /httpd/test/mod_h2/trunk: conf/httpd.conf
conf/sites/aaa-noh2.example.org.conf test/test_common.sh
Author: icing
Date: Tue Oct 20 13:34:17 2015
New Revision: 1709586
URL: http://svn.apache.org/viewvc?rev=1709586&view=rev
Log:
setup changes for new H2Upgrade/H2Direct working
Modified:
httpd/test/mod_h2/trunk/conf/httpd.conf
httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
httpd/test/mod_h2/trunk/test/test_common.sh
Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1709586&r1=1709585&r2=1709586&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Tue Oct 20 13:34:17 2015
@@ -64,8 +64,6 @@ MaxKeepAliveRequests 0
<IfModule http2_module>
LogLevel http2:info
-
- H2Direct on
# max parallel streams per session, default 100
#H2MaxSessionStreams
@@ -111,5 +109,15 @@ MaxKeepAliveRequests 0
</IfModule>
+################################################################################
+# Default HTTP Host
+################################################################################
+<VirtualHost *:SUBST_PORT_HTTP_SUBST>
+ ServerName localhost:SUBST_PORT_HTTP_SUBST
+ DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols h2c http/1.1
+</VirtualHost>
+
+
IncludeOptional conf/sites/*.conf
Modified: httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf?rev=1709586&r1=1709585&r2=1709586&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf Tue Oct 20 13:34:17 2015
@@ -8,6 +8,7 @@
<VirtualHost *:SUBST_PORT_HTTPS_SUBST>
ServerName noh2.example.org
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
+ Protocols http/1.1
SSLEngine on
SSLCertificateFile conf/ssl/test.example.org.pem
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=1709586&r1=1709585&r2=1709586&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Tue Oct 20 13:34:17 2015
@@ -122,7 +122,7 @@ nghttp_check_content() {
mkdir -p $TMP
cat > $TMP/expected
echo -n " * nghttp /$DOC: $MSG..."
- ${NGHTTP} "$@" $URL_PREFIX/$DOC > $TMP/$DOC 2>&1 || fail
+ ${NGHTTP} "$@" $ARG_UPGRADE $URL_PREFIX/$DOC > $TMP/$DOC 2>&1 || fail
diff $TMP/expected $TMP/$DOC || fail
echo ok.
}