httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1719345 - in /httpd/test/mod_h2/trunk: conf/httpd.conf conf/modules.conf conf/sites/test.example.org.conf htdocs/test.example.org/echo.py test/test_nghttp_post.sh test/test_window_update.sh
Date Fri, 11 Dec 2015 11:13:40 GMT
Author: icing
Date: Fri Dec 11 11:13:40 2015
New Revision: 1719345

URL: http://svn.apache.org/viewvc?rev=1719345&view=rev
Log:
switching from cgid to cgi, adding post echo tests

Modified:
    httpd/test/mod_h2/trunk/conf/httpd.conf
    httpd/test/mod_h2/trunk/conf/modules.conf
    httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
    httpd/test/mod_h2/trunk/htdocs/test.example.org/echo.py
    httpd/test/mod_h2/trunk/test/test_nghttp_post.sh
    httpd/test/mod_h2/trunk/test/test_window_update.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=1719345&r1=1719344&r2=1719345&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Fri Dec 11 11:13:40 2015
@@ -77,7 +77,7 @@ MaxKeepAliveRequests 0
     # max parallel streams per session, default 100
     #H2MaxSessionStreams
     # max initial window size upstream (per stream), default 64k
-    #H2WindowSize 
+    #H2WindowSize
     # max memory buffer size downstream (per stream), default 64k
     #H2StreamMaxMemSize
 

Modified: httpd/test/mod_h2/trunk/conf/modules.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/modules.conf?rev=1719345&r1=1719344&r2=1719345&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/modules.conf (original)
+++ httpd/test/mod_h2/trunk/conf/modules.conf Fri Dec 11 11:13:40 2015
@@ -85,7 +85,8 @@ LoadModule unixd_module modules/mod_unix
 LoadModule status_module modules/mod_status.so
 LoadModule autoindex_module modules/mod_autoindex.so
 #LoadModule info_module modules/mod_info.so
-LoadModule cgid_module modules/mod_cgid.so
+#LoadModule cgid_module modules/mod_cgid.so
+LoadModule cgi_module modules/mod_cgi.so
 #LoadModule dav_fs_module modules/mod_dav_fs.so
 #LoadModule vhost_alias_module modules/mod_vhost_alias.so
 #LoadModule negotiation_module modules/mod_negotiation.so

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=1719345&r1=1719344&r2=1719345&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 11 11:13:40 2015
@@ -18,10 +18,6 @@
         AddOutputFilterByType DEFLATE application/javascript
     </IfModule>
 
-    <IfModule fcgi_module>
-    FcgidWrapper SUBST_SERVER_ROOT_SUBST/bin/php-wrapper .php
-    </IfModule>    
-    
 </Directory>
 
 <Directory "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org/https-check">

Modified: httpd/test/mod_h2/trunk/htdocs/test.example.org/echo.py
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/htdocs/test.example.org/echo.py?rev=1719345&r1=1719344&r2=1719345&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/htdocs/test.example.org/echo.py (original)
+++ httpd/test/mod_h2/trunk/htdocs/test.example.org/echo.py Fri Dec 11 11:13:40 2015
@@ -3,9 +3,11 @@ 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"""
-for line in sys.stdin:
-    print line,
\ No newline at end of file
+print """Content-Type: application/data\n"""
+print content,
\ No newline at end of file

Modified: httpd/test/mod_h2/trunk/test/test_nghttp_post.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_nghttp_post.sh?rev=1719345&r1=1719344&r2=1719345&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_nghttp_post.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_nghttp_post.sh Fri Dec 11 11:13:40 2015
@@ -76,3 +76,8 @@ if min_version 2.4.18; then
     nghttp_post_data echo.py $GEN/data-1k "1k upload w/o c-len+c-type" --no-content-length
 fi
 
+# test post and echo back working
+nghttp_post_file echo.py $GEN/data-1k   "1k echo"
+nghttp_post_file echo.py $GEN/data-10k  "10k echo"
+nghttp_post_file echo.py $GEN/data-100k "100k echo"
+nghttp_post_file echo.py $GEN/data-1m   "1m echo"

Modified: httpd/test/mod_h2/trunk/test/test_window_update.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_window_update.sh?rev=1719345&r1=1719344&r2=1719345&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_window_update.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_window_update.sh Fri Dec 11 11:13:40 2015
@@ -43,7 +43,7 @@ ${H2LOAD} -p h2c -c 1 -t 1 -m 100 -n 100
 while read line; do echo -n "."; done; echo "ok."
 
 echo -n "POSTing 100 x 100k, m=5, READ"
-${H2LOAD} -p h2c -c 1 -t 1 -m 5 -n 100 -d $GEN/data-100k ${URL_PREFIX}/upload.py |
+${H2LOAD} -p h2c -c 1 -t 1 -m 5 -n 100 -d $GEN/data-100k ${URL_PREFIX}/echo.py |
 while read line; do echo -n "."; done; echo "ok."
 
 echo -n "POSTing 100 x 100k, m=50, NOT READ explicitly"



Mime
View raw message