httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1725968 - in /httpd/test/mod_h2/trunk/conf: httpd.conf modules.conf sites/test-ser.example.org.conf sites/test.example.org.conf
Date Thu, 21 Jan 2016 14:56:24 GMT
Author: icing
Date: Thu Jan 21 14:56:24 2016
New Revision: 1725968

URL: http://svn.apache.org/viewvc?rev=1725968&view=rev
Log:
bringing balancer into test config

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-ser.example.org.conf
    httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf

Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1725968&r1=1725967&r2=1725968&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Thu Jan 21 14:56:24 2016
@@ -59,10 +59,24 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
     AddType application/x-compress .Z
 </IfModule>
 
+<IfModule proxy_module>
+    ProxyStatus on
+    SSLProxyEngine on
+    SSLProxyProtocol +TLSv1 +TLSv1.1 +TLSv1.2
+    SSLProxyCipherSuite HIGH:!aNULL:!MD5
+    <Proxy "balancer://http-local">
+        BalancerMember "http://127.0.0.1:SUBST_PORT_HTTP_SUBST"
+    </Proxy>
+</IfModule>
+
+<Location "/server-status">
+    SetHandler server-status
+</Location>
+
 # unlimited connection reuse
 MaxKeepAliveRequests 0
-Timeout 1
-KeepAliveTimeout 5
+#Timeout 1
+#KeepAliveTimeout 5
 
     #LogLevel core:debug
     #LogLevel ssl:debug

Modified: httpd/test/mod_h2/trunk/conf/modules.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/modules.conf?rev=1725968&r1=1725967&r2=1725968&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/modules.conf (original)
+++ httpd/test/mod_h2/trunk/conf/modules.conf Thu Jan 21 14:56:24 2016
@@ -68,15 +68,15 @@ LoadModule proxy_fcgi_module modules/mod
 #LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
 #LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
 #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 #LoadModule proxy_express_module modules/mod_proxy_express.so
 #LoadModule session_module modules/mod_session.so
 #LoadModule session_cookie_module modules/mod_session_cookie.so
 #LoadModule session_crypto_module modules/mod_session_crypto.so
 #LoadModule session_dbd_module modules/mod_session_dbd.so
-#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
 LoadModule ssl_module modules/mod_ssl.so
-#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
 #LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
 #LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
 #LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so

Modified: httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf?rev=1725968&r1=1725967&r2=1725968&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf Thu Jan 21 14:56:24 2016
@@ -24,6 +24,7 @@
     RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
 
     <IfModule http2_module>
+        H2KeepAliveTimeout 60
         H2SerializeHeaders on
         H2AltSvc h2=test-ser.example.org:SUBST_PORT_HTTPS_SUBST
         H2AltSvc h2c=:12345

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=1725968&r1=1725967&r2=1725968&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 Jan 21 14:56:24 2016
@@ -84,15 +84,12 @@
         SSLOptions +StdEnvVars
     </Location>
 
-    SSLProxyEngine on
-    SSLProxyProtocol +TLSv1 +TLSv1.1 +TLSv1.2
-    SSLProxyCipherSuite HIGH:!aNULL:!MD5
-    <Location /proxy/>
-        ProxyPass https://test.example.org:SUBST_PORT_HTTPS_SUBST/
-        ProxyPassReverse https://test.example.org:SUBST_PORT_HTTPS_SUBST/
-        Order allow,deny
-        Allow from all
-    </Location>
+    <Proxy "balancer://https-local">
+        BalancerMember "https://test.example.org:SUBST_PORT_HTTPS_SUBST"
+    </Proxy>
+    ProxyPass "/proxy" "balancer://https-local"
+    ProxyPassReverse "/proxy" "balancer://https-local"
+
     # proxy rewrite
     RewriteRule /rewrite(.*) https://test.example.org:SUBST_PORT_HTTPS_SUBST$1 [P]
     # internal redirect rewrite
@@ -106,9 +103,6 @@
     </Location>
     ProxyPass /zeit http://www.zeit.de:80 max=20 ttl=120 retry=300
 
-    <Location "/server-status">
-        SetHandler server-status
-    </Location>
     <Location "/http2-status">
         SetHandler http2-status
     </Location>
@@ -144,12 +138,8 @@
     RewriteEngine on
     RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
 
-    <Location /proxy/>
-        ProxyPass http://test.example.org:SUBST_PORT_HTTP_SUBST/
-        ProxyPassReverse http://test.example.org:SUBST_PORT_HTTP_SUBST/
-        Order allow,deny
-        Allow from all
-    </Location>
+    ProxyPass "/proxy" "balancer://http-local"
+    ProxyPassReverse "/proxy" "balancer://http-local"
     # proxy rewrite
     RewriteRule /rewrite(.*) http://test.example.org:SUBST_PORT_HTTP_SUBST$1 [P]
     # internal redirect rewrite



Mime
View raw message