You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2005/11/15 16:59:00 UTC

svn commit: r344384 - in /httpd/httpd/trunk/include: ap_mmn.h http_core.h

Author: jim
Date: Tue Nov 15 07:58:57 2005
New Revision: 344384

URL: http://svn.apache.org/viewcvs?rev=344384&view=rev
Log:
Okay, at least be nice when "breaking" the API.
Tuck the new bitfield to the tail and adjust the
MMN

Modified:
    httpd/httpd/trunk/include/ap_mmn.h
    httpd/httpd/trunk/include/http_core.h

Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/ap_mmn.h?rev=344384&r1=344383&r2=344384&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Tue Nov 15 07:58:57 2005
@@ -108,12 +108,13 @@
  * 20050919.0 (2.1.8-dev) mod_ssl ssl_ext_list optional function added
  * 20051005.0 (2.1.8-dev) NET_TIME filter eliminated
  * 20051005.0 (2.3.0-dev) Bump MODULE_MAGIC_COOKIE to "AP24"!
+ * 20051115.0 (2.3.0-dev) Added use_canonical_phys_port to core_dir_config
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20051005
+#define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 

Modified: httpd/httpd/trunk/include/http_core.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/http_core.h?rev=344384&r1=344383&r2=344384&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_core.h (original)
+++ httpd/httpd/trunk/include/http_core.h Tue Nov 15 07:58:57 2005
@@ -482,11 +482,6 @@
 #define USE_CANONICAL_NAME_UNSET (3)
     unsigned use_canonical_name : 2;
 
-#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;
-
     /* since is_fnmatch(conf->d) was being called so frequently in
      * directory_walk() and its relatives, this field was created and
      * is set to the result of that call.
@@ -554,6 +549,12 @@
     unsigned int enable_sendfile : 2;  /* files in this dir can be mmap'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;
+
 } core_dir_config;
 
 /* Per-server core configuration */