Commit da9200e9 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

change signed single-bit fields to unsigned 

some of these were exposed to mods so the mmn is bumped, without
regard to whether any compiler will have to generate different
code


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

include/ap_mmn.h

+3 −1
Changes for include/ap_mmn.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -309,12 +309,14 @@ 
 * 20110312.1 (2.3.12-dev) Add core_dir_config.decode_encoded_slashes.

 * 20110328.0 (2.3.12-dev) change type and name of connectionPoolTTL in util_ldap_state_t 

                           connectionPoolTTL (connection_pool_ttl, int->apr_interval_t)

 * 20110329.0 (2.3.12-dev) Change single-bit signed fields to unsigned in

 *                         proxy and cache interfaces.

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20110328

#define MODULE_MAGIC_NUMBER_MAJOR 20110329

#endif

#define MODULE_MAGIC_NUMBER_MINOR 0                    /* 0...n */

modules/cache/cache_disk_common.h

+2 −2
Changes for modules/cache/cache_disk_common.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ typedef struct { 
    apr_ino_t inode;

    apr_dev_t device;

    /* Does this cached request have a body? */

    int has_body:1;

    int header_only:1;

    unsigned int has_body:1;

    unsigned int header_only:1;

    /* The parsed cache control header */

    cache_control_t control;

} disk_cache_info_t;

modules/cache/cache_util.h

+38 −38
Changes for modules/cache/cache_util.h: 38 added lines, 38 removed lines.
Original line number Diff line number Diff line
@@ -127,32 +127,32 @@ typedef struct { 
    apr_time_t lockmaxage;

    apr_uri_t *base_uri;

    /** ignore client's requests for uncached responses */

    int ignorecachecontrol:1;

    unsigned int ignorecachecontrol:1;

    /** ignore query-string when caching */

    int ignorequerystring:1;

    unsigned int ignorequerystring:1;

    /** run within the quick handler */

    int quick:1;

    unsigned int quick:1;

    /* thundering herd lock */

    int lock:1;

    int x_cache:1;

    int x_cache_detail:1;

    unsigned int lock:1;

    unsigned int x_cache:1;

    unsigned int x_cache_detail:1;

    /* flag if CacheIgnoreHeader has been set */

    #define CACHE_IGNORE_HEADERS_SET   1

    #define CACHE_IGNORE_HEADERS_UNSET 0

    int ignore_headers_set:1;

    unsigned int ignore_headers_set:1;

    /* flag if CacheIgnoreURLSessionIdentifiers has been set */

    #define CACHE_IGNORE_SESSION_ID_SET   1

    #define CACHE_IGNORE_SESSION_ID_UNSET 0

    int ignore_session_id_set:1;

    int base_uri_set:1;

    int ignorecachecontrol_set:1;

    int ignorequerystring_set:1;

    int quick_set:1;

    int lock_set:1;

    int lockpath_set:1;

    int lockmaxage_set:1;

    int x_cache_set:1;

    int x_cache_detail_set:1;

    unsigned int ignore_session_id_set:1;

    unsigned int base_uri_set:1;

    unsigned int ignorecachecontrol_set:1;

    unsigned int ignorequerystring_set:1;

    unsigned int quick_set:1;

    unsigned int lock_set:1;

    unsigned int lockpath_set:1;

    unsigned int lockmaxage_set:1;

    unsigned int x_cache_set:1;

    unsigned int x_cache_detail_set:1;

} cache_server_conf;



typedef struct {
@@ -167,33 +167,33 @@ typedef struct { 
    /* cache enabled for this location */

    apr_array_header_t *cacheenable;

    /* cache disabled for this location */

    int disable:1;

    unsigned int disable:1;

    /* set X-Cache headers */

    int x_cache:1;

    int x_cache_detail:1;

    unsigned int x_cache:1;

    unsigned int x_cache_detail:1;

    /* serve stale on error */

    int stale_on_error:1;

    unsigned int stale_on_error:1;

    /** ignore the last-modified header when deciding to cache this request */

    int no_last_mod_ignore:1;

    unsigned int no_last_mod_ignore:1;

    /** ignore expiration date from server */

    int store_expired:1;

    unsigned int store_expired:1;

    /** ignore Cache-Control: private header from server */

    int store_private:1;

    unsigned int store_private:1;

    /** ignore Cache-Control: no-store header from client or server */

    int store_nostore:1;

    int minex_set:1;

    int maxex_set:1;

    int defex_set:1;

    int factor_set:1;

    int x_cache_set:1;

    int x_cache_detail_set:1;

    int stale_on_error_set:1;

    int no_last_mod_ignore_set:1;

    int store_expired_set:1;

    int store_private_set:1;

    int store_nostore_set:1;

    int enable_set:1;

    int disable_set:1;

    unsigned int store_nostore:1;

    unsigned int minex_set:1;

    unsigned int maxex_set:1;

    unsigned int defex_set:1;

    unsigned int factor_set:1;

    unsigned int x_cache_set:1;

    unsigned int x_cache_detail_set:1;

    unsigned int stale_on_error_set:1;

    unsigned int no_last_mod_ignore_set:1;

    unsigned int store_expired_set:1;

    unsigned int store_private_set:1;

    unsigned int store_nostore_set:1;

    unsigned int enable_set:1;

    unsigned int disable_set:1;

} cache_dir_conf;



/* A linked-list of authn providers. */

modules/cache/mod_cache_disk.h

+5 −5
Changes for modules/cache/mod_cache_disk.h: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ typedef struct disk_cache_object { 
    apr_table_t *headers_out;    /* Output headers to save */

    apr_off_t offset;            /* Max size to set aside */

    apr_time_t timeout;          /* Max time to set aside */

    int done:1;                  /* Is the attempt to cache complete? */

    unsigned int done:1;         /* Is the attempt to cache complete? */

} disk_cache_object_t;
@@ -82,10 +82,10 @@ typedef struct { 
    apr_off_t maxfs;             /* maximum file size for cached files */

    apr_off_t readsize;          /* maximum data to attempt to cache in one go */

    apr_time_t readtime;         /* maximum time taken to cache in one go */

    int minfs_set:1;

    int maxfs_set:1;

    int readsize_set:1;

    int readtime_set:1;

    unsigned int minfs_set:1;

    unsigned int maxfs_set:1;

    unsigned int readsize_set:1;

    unsigned int readtime_set:1;

} disk_cache_dir_conf;



#endif /*MOD_CACHE_DISK_H*/

modules/mappers/mod_rewrite.c

+5 −5
Changes for modules/mappers/mod_rewrite.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ typedef struct { 
    apr_array_header_t *rewriteconds; /* the RewriteCond entries (temp.)    */

    apr_array_header_t *rewriterules; /* the RewriteRule entries            */

    server_rec   *server;             /* the corresponding server indicator */

    int state_set:1;

    int options_set:1;

    unsigned int state_set:1;

    unsigned int options_set:1;

} rewrite_server_conf;



typedef struct {
@@ -325,9 +325,9 @@ typedef struct { 
    apr_array_header_t *rewriterules; /* the RewriteRule entries           */

    char         *directory;          /* the directory where it applies    */

    const char   *baseurl;            /* the base-URL  where it applies    */

    int state_set:1;

    int options_set:1;

    int baseurl_set:1;

    unsigned int state_set:1;

    unsigned int options_set:1;

    unsigned int baseurl_set:1;

} rewrite_perdir_conf;



/* the (per-child) cache structures.