Commit 63606f01 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Okay, at least be nice when "breaking" the API. 

Tuck the new bitfield to the tail and adjust the
MMN


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

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

include/http_core.h

+6 −5
Original line number Diff line number Diff line
@@ -482,11 +482,6 @@ typedef struct { 
#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 @@ typedef struct { 
    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 */