httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1740078 - in /httpd/test/mod_h2/trunk: conf/httpd.conf test/test_upgrade.sh
Date Wed, 20 Apr 2016 09:26:55 GMT
Author: icing
Date: Wed Apr 20 09:26:55 2016
New Revision: 1740078

URL: http://svn.apache.org/viewvc?rev=1740078&view=rev
Log:
custom log format, fixed test of upgrade header check for h2

Modified:
    httpd/test/mod_h2/trunk/conf/httpd.conf
    httpd/test/mod_h2/trunk/test/test_upgrade.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=1740078&r1=1740077&r2=1740078&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Wed Apr 20 09:26:55 2016
@@ -54,7 +54,7 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
 </Files>
 
 <IfModule log_config_module>
-    LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %{HTTP2}e
%{H2_PUSH}e %{H2_PUSHED}e %{H2_PUSHED_ON}e %{H2_STREAM_TAG}e %{H2_STREAM_ID}e %k" combined
     LogFormat "%h %l %u %t \"%r\" %>s %b" common
     CustomLog "logs/access_log" combined
 </IfModule>

Modified: httpd/test/mod_h2/trunk/test/test_upgrade.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_upgrade.sh?rev=1740078&r1=1740077&r2=1740078&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_upgrade.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_upgrade.sh Wed Apr 20 09:26:55 2016
@@ -39,6 +39,10 @@ URL_PREFIX="$URL_HTTPS"
 
 # should see an announcement of h2
 #
-curl_check_upgrade index.html "Upgrade: h2" "expecting h2" --http1.1
+if min_version 2.4.21; then
+    curl_check_upgrade index.html "" "expecting none (forbidden by httpwg)" --http1.1
+else
+    curl_check_upgrade index.html "Upgrade: h2" "expecting h2" --http1.1
+fi
 curl_check_upgrade index.html "" "expecting none (not configured)" -H'Host: noh2.example.org'
 curl_check_upgrade index.html "" "expecting none (less perferred)" -H'Host: test2.example.org'



Mime
View raw message