Re-aligned HttpHeader.cc and HttpHeader.h headers catalogue.

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index d8ff5caaf9711cf6d70f4cb2af22821c00784f23..e2934688498aaf4fc246edd4fb302f1caadf9a17 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -99,8 +99,8 @@ static const HttpHeaderFieldAttrs HeadersAttrs[] = {
     {"Cookie2", HDR_COOKIE2, ftStr},
     {"Date", HDR_DATE, ftDate_1123},
     {"ETag", HDR_ETAG, ftETag},
-    {"Expires", HDR_EXPIRES, ftDate_1123},
     {"Expect", HDR_EXPECT, ftStr},
+    {"Expires", HDR_EXPIRES, ftDate_1123},
     {"From", HDR_FROM, ftStr},
     {"Host", HDR_HOST, ftStr},
     {"If-Match", HDR_IF_MATCH, ftStr}, /* for now */
@@ -113,6 +113,7 @@ static const HttpHeaderFieldAttrs HeadersAttrs[] = {
     {"Location", HDR_LOCATION, ftStr},
     {"Max-Forwards", HDR_MAX_FORWARDS, ftInt64},
     {"Mime-Version", HDR_MIME_VERSION, ftStr}, /* for now */
+    {"Negotiate", HDR_NEGOTIATE, ftStr},
     {"Pragma", HDR_PRAGMA, ftStr},
     {"Proxy-Authenticate", HDR_PROXY_AUTHENTICATE, ftStr},
     {"Proxy-Authentication-Info", HDR_PROXY_AUTHENTICATION_INFO, ftStr},
@@ -145,7 +146,6 @@ static const HttpHeaderFieldAttrs HeadersAttrs[] = {
     {"X-Forwarded-For", HDR_X_FORWARDED_FOR, ftStr},
     {"X-Request-URI", HDR_X_REQUEST_URI, ftStr},
     {"X-Squid-Error", HDR_X_SQUID_ERROR, ftStr},
-    {"Negotiate", HDR_NEGOTIATE, ftStr},
 #if X_ACCELERATOR_VARY
     {"X-Accelerator-Vary", HDR_X_ACCELERATOR_VARY, ftStr},
 #endif

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index 170d211b0e43d5729ab43c6153f0002608302ec0..b54970a169e567b1cc9ddef853835d974a462e33 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -91,7 +91,7 @@ typedef enum {
     HDR_IF_MODIFIED_SINCE,              /**< RFC 2608, 2616 */
     HDR_IF_NONE_MATCH,                  /**< RFC 2608, 2616 */
     HDR_IF_RANGE,                       /**< RFC 2608, 2616 */
-    HDR_IF_UNMODIFIED_SINCE,            /**< RFC 2608, 2616 */
+    /*HDR_IF_UNMODIFIED_SINCE,*/        /**< RFC 2608, 2616 */
     HDR_KEEP_ALIVE,                     /**< obsolete HTTP/1.0 header we may need to erase */
     HDR_LAST_MODIFIED,                  /**< RFC 2608, 2616 */
     HDR_LINK,                           /**< RFC 2068 */
@@ -109,8 +109,8 @@ typedef enum {
     HDR_PROXY_SUPPORT,                  /**< RFC 4559 */
     HDR_PUBLIC,                         /**< RFC 2608 */
     HDR_RANGE,                          /**< RFC 2608, 2616 */
-    HDR_REQUEST_RANGE,                  /**< some clients use this, sigh */
     HDR_REFERER,                        /**< RFC 2608, 2616 */
+    HDR_REQUEST_RANGE,                  /**< some clients use this, sigh */
     HDR_RETRY_AFTER,                    /**< RFC 2608, 2616 */
     HDR_SERVER,                         /**< RFC 2608, 2616 */
     HDR_SET_COOKIE,                    /**< de-facto standard header we may need to erase */