changeset 18961:5c53d13a30ab

lib-http client: Added inline function to check whether request is directed at a proxy.
author Stephan Bosch <stephan@rename-it.nl>
date Tue, 18 Aug 2015 20:39:24 +0300
parents 58694b53e730
children cdf9e584c1c7
files src/lib-http/http-client-private.h src/lib-http/http-client-request.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-http/http-client-private.h	Tue Aug 18 20:39:24 2015 +0300
+++ b/src/lib-http/http-client-private.h	Tue Aug 18 20:39:24 2015 +0300
@@ -412,6 +412,12 @@
 	}
 }
 
+static inline bool
+http_client_request_to_proxy(const struct http_client_request *req)
+{
+	return (req->host_url != &req->origin_url);
+}
+
 static inline const char *
 http_client_connection_label(struct http_client_connection *conn)
 {
--- a/src/lib-http/http-client-request.c	Tue Aug 18 20:39:24 2015 +0300
+++ b/src/lib-http/http-client-request.c	Tue Aug 18 20:39:24 2015 +0300
@@ -797,7 +797,8 @@
 			o_stream_ref(output);
 		}
 	}
-	if (!req->have_hdr_connection && req->host_url == &req->origin_url) {
+	if (!req->have_hdr_connection &&
+		!http_client_request_to_proxy(req)) {
 		/* https://tools.ietf.org/html/rfc2068
 		     Section 19.7.1: