HTTP 1.1: Forward OPTIONS requests properly

Bump the max_forwards type to 64-bit to cope with wider range of values.

NP: still no internal handling of OPTIONS requests, but this will
    forward them according to RFC 2616 requirements.

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 9aa75ef3d23c812c415c7dc5a3b629c52c428340..d7981eefa3a78c421dbdb0b3a0fea46b24ac45a5 100644 (file)
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -122,7 +122,7 @@ public:
 
     int imslen;
 
-    int max_forwards;
+    int64_t max_forwards;
 
     IpAddress client_addr;
 

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 914df6851ee690eaabaa7ab774a54f27dcce0a3f..e61e14a2c4cee968559b7ffac6bc39d364dad332 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1595,6 +1595,8 @@ clientGetMoreData(clientStreamNode * aNode, ClientHttpRequest * http)
         return;
     }
 
+    /* TODO: handle OPTIONS request on max_forwards == 0 as well */
+
     if (context->http->request->method == METHOD_TRACE) {
         if (context->http->request->max_forwards == 0) {
             context->traceReply(aNode);

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 39aec87431e6bcf1c308f21ab1779024d0c3b013..cd51b7032348c502f9d17a3d72f46c79723f65b6 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -928,8 +928,8 @@ clientInterpretRequestHeaders(ClientHttpRequest * http)
     }
 
 #endif
-    if (request->method == METHOD_TRACE) {
-        request->max_forwards = req_hdr->getInt(HDR_MAX_FORWARDS);
+    if (request->method == METHOD_TRACE || request->method == METHOD_OPTIONS) {
+        request->max_forwards = req_hdr->getInt64(HDR_MAX_FORWARDS);
     }
 
     request->flags.cachable = http->request->cacheable();

diff --git a/src/http.cc b/src/http.cc
index e1bf41e3650c6f73375c9fb68c39ec733f8d2d1e..6bff3c1c8932cebc652ee6c53a449df467a107b2 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1749,12 +1749,12 @@ copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, co
 
     case HDR_MAX_FORWARDS:
         /** \par Max-Forwards:
-         * pass only on TRACE requests */
-        if (orig_request->method == METHOD_TRACE) {
-            const int hops = e->getInt();
+         * pass only on TRACE or OPTIONS requests */
+        if (orig_request->method == METHOD_TRACE || orig_request->method == METHOD_OPTIONS) {
+            const int64_t hops = e->getInt64();
 
             if (hops > 0)
-                hdr_out->putInt(HDR_MAX_FORWARDS, hops - 1);
+                hdr_out->putInt64(HDR_MAX_FORWARDS, hops - 1);
         }
 
         break;