HTTP_VERSION() is the correct way to do this...

PR:
Obtained from:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88769 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index fc56a20e0fb64d971b74fe3d81f262bd7b367e0a..93d5bd8c1e4b00123337b4bf6a7c869e02801156 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -155,11 +155,6 @@ struct proxy_services {
 };
 #endif
 
-/* different HTTP versions we need to care about */
-#define HTTP_0_9                       0009
-#define HTTP_1_0                       1000
-#define HTTP_1_1                       1001
-
 /* static information about a remote proxy */
 struct proxy_remote {
     const char *scheme;                /* the schemes handled by this proxy, or '*' */

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 1873f813c2f38262f73e3419a91e34a7f89099df..0afeb12d5e1ab1394c3b95070ea2948246d8c83e 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -738,7 +738,7 @@ int ap_proxy_http_handler(request_rec *r, char *url,
     /* if the connection is < HTTP/1.1, or Connection: close,
      * we close the socket, otherwise we leave it open for KeepAlive support
      */
-    if (close || (r->proto_num < HTTP_1_1)) {
+    if (close || (r->proto_num < HTTP_VERSION(1,1))) {
         apr_socket_close(sock);
        conf->client_socket = NULL;
     }