"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "test/e2e/TestHttpdConf.py" between
mod_http2-1.15.16.tar.gz and mod_http2-1.15.17.tar.gz

About: mod_h[ttp]2 is an Apache httpd module implementing the HTTP2 protocol. It uses nghttp2 as base engine and connects it with the Apache infrastructure. Hint: Module (previous name "mod_h2") now integrated into Apache httpd (since v2.4.17). Experimental release.

TestHttpdConf.py  (mod_http2-1.15.16):TestHttpdConf.py  (mod_http2-1.15.17)
skipping to change at line 33 skipping to change at line 33
class HttpdConf(object): class HttpdConf(object):
def __init__(self, path=None): def __init__(self, path=None):
if path: if path:
self.path = path self.path = path
else: else:
self.path = os.path.join(TestEnv.GEN_DIR, "auto.conf") self.path = os.path.join(TestEnv.GEN_DIR, "auto.conf")
if os.path.isfile(self.path): if os.path.isfile(self.path):
os.remove(self.path) os.remove(self.path)
open(self.path, "a").write("LogLevel http2:trace2\n") open(self.path, "a").write("LogLevel http2:trace2 h2test:trace2 proxy_ht tp2:trace2\n")
def add_line(self, line): def add_line(self, line):
open(self.path, "a").write(line + "\n") open(self.path, "a").write(line + "\n")
return self return self
def add_vhost(self, port, name, aliasList=[], docRoot="htdocs", withSSL=True ): def add_vhost(self, port, name, aliasList=[], docRoot="htdocs", withSSL=True ):
self.start_vhost(port, name, aliasList, docRoot, withSSL) self.start_vhost(port, name, aliasList, docRoot, withSSL)
self.end_vhost() self.end_vhost()
return self return self
skipping to change at line 117 skipping to change at line 117
self.add_line(" SSLProxyEngine on") self.add_line(" SSLProxyEngine on")
self.add_line(" SSLProxyCheckPeerName off") self.add_line(" SSLProxyCheckPeerName off")
self.start_vhost( TestEnv.HTTPS_PORT, "cgi", aliasList=[ "cgi-alias" ], docRoot="htdocs/cgi", withSSL=True) self.start_vhost( TestEnv.HTTPS_PORT, "cgi", aliasList=[ "cgi-alias" ], docRoot="htdocs/cgi", withSSL=True)
self.add_line(" Protocols h2 http/1.1") self.add_line(" Protocols h2 http/1.1")
self.add_line(" SSLOptions +StdEnvVars") self.add_line(" SSLOptions +StdEnvVars")
self.add_line(" AddHandler cgi-script .py") self.add_line(" AddHandler cgi-script .py")
self.add_line(" <Location \"/.well-known/h2/state\">") self.add_line(" <Location \"/.well-known/h2/state\">")
self.add_line(" SetHandler http2-status") self.add_line(" SetHandler http2-status")
self.add_line(" </Location>") self.add_line(" </Location>")
self.add_proxies( "cgi", proxy_self, h2proxy_self ) self.add_proxies( "cgi", proxy_self, h2proxy_self )
self.add_line(" <Location \"/h2test/echo\">")
self.add_line(" SetHandler h2test-echo")
self.add_line(" </Location>")
self.end_vhost() self.end_vhost()
self.start_vhost( TestEnv.HTTP_PORT, "cgi", aliasList=[ "cgi-alias" ], d ocRoot="htdocs/cgi", withSSL=False) self.start_vhost( TestEnv.HTTP_PORT, "cgi", aliasList=[ "cgi-alias" ], d ocRoot="htdocs/cgi", withSSL=False)
self.add_line(" AddHandler cgi-script .py") self.add_line(" AddHandler cgi-script .py")
self.end_vhost() self.end_vhost()
self.add_line(" LogLevel proxy:trace8")
self.add_line(" LogLevel proxy_http:trace8")
return self return self
def add_vhost_noh2( self ) : def add_vhost_noh2( self ) :
self.start_vhost( TestEnv.HTTPS_PORT, "noh2", aliasList=[ "noh2-alias" ] , docRoot="htdocs/noh2", withSSL=True) self.start_vhost( TestEnv.HTTPS_PORT, "noh2", aliasList=[ "noh2-alias" ] , docRoot="htdocs/noh2", withSSL=True)
self.add_line(" Protocols http/1.1") self.add_line(" Protocols http/1.1")
self.add_line(" SSLCertificateKeyFile conf/ssl/cert.pkey") self.add_line(" SSLCertificateKeyFile conf/ssl/cert.pkey")
self.add_line(" SSLCertificateFile conf/ssl/noh2.%s_cert.pem" % Tes tEnv.HTTP_TLD) self.add_line(" SSLCertificateFile conf/ssl/noh2.%s_cert.pem" % Tes tEnv.HTTP_TLD)
self.add_line(" SSLOptions +StdEnvVars") self.add_line(" SSLOptions +StdEnvVars")
self.end_vhost() self.end_vhost()
self.start_vhost( TestEnv.HTTP_PORT, "noh2", aliasList=[ "noh2-alias" ], docRoot="htdocs/noh2", withSSL=False) self.start_vhost( TestEnv.HTTP_PORT, "noh2", aliasList=[ "noh2-alias" ], docRoot="htdocs/noh2", withSSL=False)
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)