diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aaa/mod_access_compat.c | 4 | ||||
| -rw-r--r-- | modules/aaa/mod_allowmethods.c | 2 | ||||
| -rw-r--r-- | modules/aaa/mod_authz_core.c | 8 | ||||
| -rw-r--r-- | modules/http/http_protocol.c | 2 | ||||
| -rw-r--r-- | modules/http/http_request.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/modules/aaa/mod_access_compat.c b/modules/aaa/mod_access_compat.c index e9f1abe483..866e208ff3 100644 --- a/modules/aaa/mod_access_compat.c +++ b/modules/aaa/mod_access_compat.c @@ -53,7 +53,7 @@ enum allowdeny_type { }; typedef struct { - apr_int64_t limited; + ap_method_mask_t limited; union { char *from; apr_ipsubnet_t *ip; @@ -243,7 +243,7 @@ static int find_allowdeny(request_rec *r, apr_array_header_t *a, int method) { allowdeny *ap = (allowdeny *) a->elts; - apr_int64_t mmask = (AP_METHOD_BIT << method); + ap_method_mask_t mmask = (AP_METHOD_BIT << method); int i; int gothost = 0; const char *remotehost = NULL; diff --git a/modules/aaa/mod_allowmethods.c b/modules/aaa/mod_allowmethods.c index dd411969e0..3062efd323 100644 --- a/modules/aaa/mod_allowmethods.c +++ b/modules/aaa/mod_allowmethods.c @@ -45,7 +45,7 @@ typedef struct am_conf_t { int allowed_set; - apr_int64_t allowed; + ap_method_mask_t allowed; } am_conf_t; module AP_MODULE_DECLARE_DATA allowmethods_module; diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c index 40e5fe1414..53c2663917 100644 --- a/modules/aaa/mod_authz_core.c +++ b/modules/aaa/mod_authz_core.c @@ -70,7 +70,7 @@ struct authz_section_conf { const char *provider_args; const void *provider_parsed_args; const authz_provider *provider; - apr_int64_t limited; + ap_method_mask_t limited; authz_logic_op op; int negate; /** true if this is not a real container but produced by AuthMerging; @@ -478,7 +478,7 @@ static const char *add_authz_section(cmd_parms *cmd, void *mconfig, authz_section_conf *old_section = conf->section; authz_section_conf *section; int old_overrides = cmd->override; - apr_int64_t old_limited = cmd->limited; + ap_method_mask_t old_limited = cmd->limited; const char *errmsg; if (endp == NULL) { @@ -1016,7 +1016,7 @@ static authz_status method_check_authorization(request_rec *r, const char *require_line, const void *parsed_require_line) { - const apr_int64_t *allowed = parsed_require_line; + const ap_method_mask_t *allowed = parsed_require_line; if (*allowed & (AP_METHOD_BIT << r->method_number)) return AUTHZ_GRANTED; else @@ -1027,7 +1027,7 @@ static const char *method_parse_config(cmd_parms *cmd, const char *require_line, const void **parsed_require_line) { const char *w, *t; - apr_int64_t *allowed = apr_pcalloc(cmd->pool, sizeof(apr_int64_t)); + ap_method_mask_t *allowed = apr_pcalloc(cmd->pool, sizeof *allowed); t = require_line; diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 205b6bdf8a..33c9d083ef 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -854,7 +854,7 @@ AP_DECLARE(const char *) ap_get_status_line(int status) */ static char *make_allow(request_rec *r) { - apr_int64_t mask; + ap_method_mask_t mask; apr_array_header_t *allow = apr_array_make(r->pool, 10, sizeof(char *)); apr_hash_index_t *hi = apr_hash_first(r->pool, methods_registry); /* For TRACE below */ diff --git a/modules/http/http_request.c b/modules/http/http_request.c index 8f27e0f5f5..15c1fd5124 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -857,7 +857,7 @@ AP_DECLARE(void) ap_allow_standard_methods(request_rec *r, int reset, ...) { int method; va_list methods; - apr_int64_t mask; + ap_method_mask_t mask; /* * Get rid of any current settings if requested; not just the |