From: Willy Tarreau <w@1wt.eu>
Date: Tue, 13 Oct 2015 13:43:39 +0000 (+0200)
Subject: CLEANUP: examples: update sample file option-http_proxy.cfg
X-Git-Tag: v1.6.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d50d09108074417c187c5dd1d9c35915a302b5;p=thirdparty%2Fhaproxy.git

CLEANUP: examples: update sample file option-http_proxy.cfg

This one was still valid but emitted lots of warnings.
---

diff --git a/examples/option-http_proxy.cfg b/examples/option-http_proxy.cfg
index 8f73c3bb8b..ddc409b93b 100644
--- a/examples/option-http_proxy.cfg
+++ b/examples/option-http_proxy.cfg
@@ -18,36 +18,35 @@ frontend test-proxy
         log             global
         option          httplog
         option          dontlognull
-        option          httpclose
         option          nolinger
         option          http_proxy
         maxconn         8000
-        clitimeout      30000
+        timeout client  30s
 
 	# layer3: Valid users
 	acl allow_host src 192.168.200.150/32
-	block if !allow_host
+	http-request deny if !allow_host
 
 	# layer7: prevent private network relaying
 	acl forbidden_dst url_ip 192.168.0.0/24
 	acl forbidden_dst url_ip 172.16.0.0/12
 	acl forbidden_dst url_ip 10.0.0.0/8
-	block if forbidden_dst
+	http-request deny if forbidden_dst
 
 	default_backend test-proxy-srv
 
 
 backend test-proxy-srv
 	mode            http
-	contimeout      5000
-	srvtimeout      5000
+	timeout connect 5s
+	timeout server  5s
 	retries         2
 	option          nolinger
 	option          http_proxy
 
 	# layer7: Only GET method is valid
 	acl valid_method        method GET
-	block if !valid_method
+	http-request deny if !valid_method
 
 	# layer7: protect bad reply
-	rspdeny ^Content-Type:[\ ]*audio/mp3
+	http-response deny if { res.hdr(content-type) audio/mp3 }