httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1846124 - in /httpd/test/mod_h2/trunk: conf/sites/test.example.org.conf htdocs/test.example.org/echo-push.py test/go/test_fuzz.sh test/test_debug.sh test/test_interim.sh test/test_push.sh
Date Thu, 08 Nov 2018 10:53:54 GMT
Author: icing
Date: Thu Nov  8 10:53:54 2018
New Revision: 1846124

URL: http://svn.apache.org/viewvc?rev=1846124&view=rev
Log:
changes in expectations for v1.11.4

Added:
    httpd/test/mod_h2/trunk/htdocs/test.example.org/echo-push.py
Modified:
    httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
    httpd/test/mod_h2/trunk/test/go/test_fuzz.sh
    httpd/test/mod_h2/trunk/test/test_debug.sh
    httpd/test/mod_h2/trunk/test/test_interim.sh
    httpd/test/mod_h2/trunk/test/test_push.sh

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=1846124&r1=1846123&r2=1846124&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 Thu Nov  8 10:53:54 2018
@@ -283,6 +283,10 @@ SSLCACertificateFile conf/ssl/client1.pe
         H2PushResource "/006/006.css" critical
         H2PushResource "/006/006.js"
     </Location>    
+    <Location /echo-push.py>
+        H2PushResource "http://test.example.org:SUBST_PORT_HTTP_SUBST/006/006.css" critical
+        H2PushResource "/006/006.js"
+    </Location>
     </IfVersion>
 
     ProxyPass "/proxy" "balancer://http-local"

Added: httpd/test/mod_h2/trunk/htdocs/test.example.org/echo-push.py
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/test.example.org/echo-push.py?rev=1846124&view=auto
==============================================================================
--- httpd/test/mod_h2/trunk/htdocs/test.example.org/echo-push.py (added)
+++ httpd/test/mod_h2/trunk/htdocs/test.example.org/echo-push.py Thu Nov  8 10:53:54 2018
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+import sys, cgi, os
+
+status = '200 Ok'
+
+content = ''
+for line in sys.stdin:
+    content += line
+    
+# Just echo what we get
+print "Status: 200"
+print """Content-Type: application/data\n"""
+print content,
\ No newline at end of file

Modified: httpd/test/mod_h2/trunk/test/go/test_fuzz.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/go/test_fuzz.sh?rev=1846124&r1=1846123&r2=1846124&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/go/test_fuzz.sh (original)
+++ httpd/test/mod_h2/trunk/test/go/test_fuzz.sh Thu Nov  8 10:53:54 2018
@@ -142,6 +142,10 @@ check_traffic "$TOP"/in-footer-endless.f
 -->[CONTINUATION stream=1, eoh=true]
 -->[DATA stream=1, len=0, eos=false]
 -->[HEADER stream=1: eoh=false, eos=true]
+<--[FrameHeader HEADERS flags=END_HEADERS stream=1 len=XXX]
+    :status = "200"
+<--[FrameHeader DATA stream=1 len=1291]
+<--[FrameHeader DATA flags=END_STREAM stream=1 len=714]
 <--[FrameHeader RST_STREAM stream=1 len=4]
 -->[CONTINUATION stream=1, eoh=true]
 -->[GOAWAY

Modified: httpd/test/mod_h2/trunk/test/test_debug.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_debug.sh?rev=1846124&r1=1846123&r2=1846124&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_debug.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_debug.sh Thu Nov  8 10:53:54 2018
@@ -135,28 +135,11 @@ EOF
 test_gen_data
 
 # check that incoming trailers are seen in POST requests
-nghttp_post_debug .well-known/h2/state $GEN/data-1k "1 trailer (POST)" --trailer "test: 1"
-v <<EOF
-:status: 200
-content-type: application/json
-conn-flow-in: 2147483647
-conn-flow-out: 65535
-h2-trailers-in: 1
-EOF
-
-# check that incoming trailers are seen in GET requests (no request body)
-# (we have to trick nghttp a bit, since it refuces to send trailers without
-# thinking it sends a body as well
-rm -f gen/empty
-touch gen/empty
-nghttp_get_debug .well-known/h2/state "1 trailer (GET)" --trailer "test: 1" -v \
-    --data gen/empty -H ':method: GET' --no-content-length <<EOF
-:status: 200
-content-type: application/json
-conn-flow-in: 2147483647
-conn-flow-out: 65535
-h2-trailers-in: 1
-EOF
-
-
-
+#nghttp_post_debug .well-known/h2/state $GEN/data-1k "1 trailer (POST)" --trailer "test:
1" -v <<EOF
+#:status: 200
+#content-type: application/json
+#conn-flow-in: 2147483647
+#conn-flow-out: 65535
+#h2-trailers-in: 1
+#EOF
 

Modified: httpd/test/mod_h2/trunk/test/test_interim.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_interim.sh?rev=1846124&r1=1846123&r2=1846124&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_interim.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_interim.sh Thu Nov  8 10:53:54 2018
@@ -19,16 +19,16 @@ source $(dirname $0)/test_common.sh
 if min_httpd_version 2.4.24; then
     echo "test 100-continue on $URL_PREFIX"
     
-    curl_check_status /index.html "h2 no expect" <<EOF
+    curl_check_status /echo.py "h2 no expect" <<EOF
 HTTP/2 200
 EOF
 
-    curl_check_status /index.html "h2 expect" -H 'Expect: 100-continue' <<EOF
+    curl_check_status /echo.py "h2 expect" -H 'Expect: 100-continue' <<EOF
 HTTP/2 100
 HTTP/2 200
 EOF
 
-    curl_check_status /index.html "h2 unexpected" -H 'Expect: the-unexpected' <<EOF
+    curl_check_status /echo.py "h2 unexpected" -H 'Expect: the-unexpected' <<EOF
 HTTP/2 417
 EOF
 

Modified: httpd/test/mod_h2/trunk/test/test_push.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_push.sh?rev=1846124&r1=1846123&r2=1846124&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_push.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_push.sh Thu Nov  8 10:53:54 2018
@@ -221,7 +221,7 @@ EOF
         curl_check_status 006-push9.html "early hints off" <<EOF
 HTTP/2 200
 EOF
-       curl_check_status 006-push9.html "expect, no 103" -H 'Expect: 100-continue' <<EOF
+       curl_check_status echo-push.py "expect, no 103" -H 'Expect: 100-continue' <<EOF
 HTTP/2 100
 HTTP/2 200
 EOF



Mime
View raw message