From: Stefan Fritsch <sf@apache.org>
Date: Sat, 4 Jun 2011 19:04:54 +0000 (+0000)
Subject: Reorder members in core_dir_config to be more logical and efficient.
X-Git-Tag: 2.3.13~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec52431ddea9e90d340c486708ed0487e6622a65;p=thirdparty%2Fapache%2Fhttpd.git

Reorder members in core_dir_config to be more logical and efficient.
MMN bump was already in r1131465


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

diff --git a/include/http_core.h b/include/http_core.h
index ca83d417466..4d7a7e35826 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -528,20 +528,21 @@ typedef struct {
 #define ENABLE_SENDFILE_ON     (1)
 #define ENABLE_SENDFILE_UNSET  (2)
     unsigned int enable_sendfile : 2;  /* files in this dir can be sendfile'ed */
-    unsigned int allow_encoded_slashes : 1; /* URLs may contain %2f w/o being
-                                             * pitched indiscriminately */
 
 #define USE_CANONICAL_PHYS_PORT_OFF   (0)
 #define USE_CANONICAL_PHYS_PORT_ON    (1)
 #define USE_CANONICAL_PHYS_PORT_UNSET (2)
-    unsigned use_canonical_phys_port : 2;
+    unsigned int use_canonical_phys_port : 2;
+
+    unsigned int allow_encoded_slashes : 1; /* URLs may contain %2f w/o being
+                                             * pitched indiscriminately */
+    unsigned int decode_encoded_slashes : 1; /* whether to decode encoded slashes in URLs */
 
     ap_expr_info_t *condition;   /* Conditionally merge <If> sections */
 
     /** per-dir log config */
     struct ap_logconf *log;
 
-    unsigned int decode_encoded_slashes : 1; /* whether to decode encoded slashes in URLs */
 } core_dir_config;
 
 /* macro to implement off by default behaviour */