diff options
| author | Joe Orton <jorton@apache.org> | 2020-02-17 10:11:56 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-02-17 10:11:56 +0000 |
| commit | 2517583a449cc109733e443f8994bf7782687bdc (patch) | |
| tree | d5374818d5acb9bfdf6cc0b1b1e1f7e71f67780a /include/http_config.h | |
| parent | b853e4925d903ec58cb887616ba6a5d17df99f8a (diff) | |
| download | httpd-2517583a449cc109733e443f8994bf7782687bdc.tar.gz | |
Define ap_method_mask_t (typedef for apr_uint64_t) and use for method
bitmasks rather than apr_int64_t. Fixes UBSan errors shifting to the
top bit of a signed integer.
* include/httpd.h: Add ap_method_mask_t, use it for AP_METHOD_BIT.
(struct ap_method_mask_t): Likewise for method_mask field.
(struct request_rec): Likewise for allowed field.
* include/http_config.h (struct cmd_parms): Likewise for limited field.
* include/ap_mmn.h: Bump MMN major.
* modules/*/*.c: Adjust all method masks to use ap_method_mask_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874114 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_config.h')
| -rw-r--r-- | include/http_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/http_config.h b/include/http_config.h index ce1a51e1b3..2aac6d4325 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -295,7 +295,7 @@ struct cmd_parms_struct { /** Table of directives allowed per AllowOverrideList */ apr_table_t *override_list; /** Which methods are <Limit>ed */ - apr_int64_t limited; + ap_method_mask_t limited; /** methods which are limited */ apr_array_header_t *limited_xmethods; /** methods which are xlimited */ |