svn commit: r1838576 - in /httpd/test/framework/trunk/t: conf/proxy.conf.in modules/proxy_balancer.t

[ja...@apache.org]

Author: jailletc36
Date: Tue Aug 21 17:43:49 2018
New Revision: 1838576

URL: http://svn.apache.org/viewvc?rev=1838576&view=rev
Log:
Folow-up to r1829914.

lbmethod=heartbeat is only available since 2.3.0 (see https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_heartbeat.html), as reported by pgajdos <pgajdos suse.cz>.

Modified:
    httpd/test/framework/trunk/t/conf/proxy.conf.in
    httpd/test/framework/trunk/t/modules/proxy_balancer.t

Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/proxy.conf.in?rev=1838576&r1=1838575&r2=1838576&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/proxy.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/proxy.conf.in Tue Aug 21 17:43:49 2018
@@ -47,7 +47,9 @@
      ProxySet balancer://foo1 lbmethod=byrequests
      ProxySet balancer://foo2 lbmethod=bytraffic
      ProxySet balancer://foo3 lbmethod=bybusyness
-     ProxySet balancer://foo4 lbmethod=heartbeat
+     <IfVersion >= 2.3.0>
+        ProxySet balancer://foo4 lbmethod=heartbeat
+     </IfVersion>
 
      <Location /baltest1>
        ProxyPass balancer://foo1/
@@ -61,10 +63,12 @@
        ProxyPass balancer://foo3/
      </Location>
 
-     <Location /baltest4>
-       # TODO heartbeat needs additional configuration to have it work
-       ProxyPass balancer://foo4/
-     </Location>
+     <IfVersion >= 2.3.0>
+         <Location /baltest4>
+           # TODO heartbeat needs additional configuration to have it work
+           ProxyPass balancer://foo4/
+         </Location>
+     </IfVersion>
 
      ## PR 45434 tests
      <Proxy balancer://pr45434>

Modified: httpd/test/framework/trunk/t/modules/proxy_balancer.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_balancer.t?rev=1838576&r1=1838575&r2=1838576&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_balancer.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_balancer.t Tue Aug 21 17:43:49 2018
@@ -21,5 +21,7 @@ ok t_cmp($r->code, 200, "Balancer did no
 $r = GET("/baltest3/index.html");
 ok t_cmp($r->code, 200, "Balancer did not die");
 
-# $r = GET("/baltest4/index.html");
-# ok t_cmp($r->code, 200, "Balancer did not die");
+if (have_min_apache_version("2.3.0")) {
+    # $r = GET("/baltest4/index.html");
+    # ok t_cmp($r->code, 200, "Balancer did not die");
+}