diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aaa/mod_auth_digest.c | 3 | ||||
| -rw-r--r-- | modules/cache/mod_socache_shmcb.c | 4 | ||||
| -rw-r--r-- | modules/dav/main/mod_dav.c | 2 | ||||
| -rw-r--r-- | modules/debugging/mod_dumpio.c | 3 | ||||
| -rw-r--r-- | modules/filters/mod_filter.c | 2 | ||||
| -rw-r--r-- | modules/mappers/mod_rewrite.c | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index 81b884f5f9..f9f0227233 100644 --- a/modules/aaa/mod_auth_digest.c +++ b/modules/aaa/mod_auth_digest.c @@ -1260,10 +1260,8 @@ static void note_digest_auth_failure(request_rec *r, digest_header_rec *resp, int stale) { const char *qop, *opaque, *opaque_param, *domain, *nonce; - int cnt; /* Setup qop */ - if (conf->qop_list[0] == NULL) { qop = ", qop=\"auth\""; } @@ -1271,6 +1269,7 @@ static void note_digest_auth_failure(request_rec *r, qop = ""; } else { + int cnt; qop = apr_pstrcat(r->pool, ", qop=\"", conf->qop_list[0], NULL); for (cnt = 1; conf->qop_list[cnt] != NULL; cnt++) { qop = apr_pstrcat(r->pool, qop, ",", conf->qop_list[cnt], NULL); diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c index ddc6d147d9..648a38fbbb 100644 --- a/modules/cache/mod_socache_shmcb.c +++ b/modules/cache/mod_socache_shmcb.c @@ -561,7 +561,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx, server_rec *s = r->server; SHMCBHeader *header = ctx->header; unsigned int loop, total = 0, cache_total = 0, non_empty_subcaches = 0; - apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0, average_expiry = 0; + apr_time_t idx_expiry, min_expiry = 0, max_expiry = 0; apr_time_t now = apr_time_now(); double expiry_total = 0; int index_pct, cache_pct; @@ -599,7 +599,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx, ap_rprintf(r, "subcaches: <b>%d</b>, indexes per subcache: <b>%d</b><br>", header->subcache_num, header->index_num); if (non_empty_subcaches) { - average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches); + apr_time_t average_expiry = (apr_time_t)(expiry_total / (double)non_empty_subcaches); ap_rprintf(r, "time left on oldest entries' objects: "); if (now < average_expiry) ap_rprintf(r, "avg: <b>%d</b> seconds, (range: %d...%d)<br>", diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 42d3abaa75..1b18cb2833 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -2342,7 +2342,7 @@ static int dav_method_proppatch(request_rec *r) /* Ignore children that are not set/remove */ if (child->ns != APR_XML_NS_DAV_ID - || (!(is_remove = strcmp(child->name, "remove") == 0) + || (!(is_remove = (strcmp(child->name, "remove") == 0)) && strcmp(child->name, "set") != 0)) { continue; } diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c index 901e34085f..3a6a329325 100644 --- a/modules/debugging/mod_dumpio.c +++ b/modules/debugging/mod_dumpio.c @@ -69,14 +69,13 @@ static void dumpit(ap_filter_t *f, apr_bucket *b, dumpio_conf_t *ptr) #endif const char *buf; apr_size_t nbytes; - apr_size_t logbytes; apr_status_t rv = apr_bucket_read(b, &buf, &nbytes, APR_BLOCK_READ); if (rv == APR_SUCCESS) { while (nbytes) { - logbytes = nbytes; + apr_size_t logbytes = nbytes; if (logbytes > dumpio_MAX_STRING_LEN) logbytes = dumpio_MAX_STRING_LEN; nbytes -= logbytes; diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c index eb81bffb67..5dd394332a 100644 --- a/modules/filters/mod_filter.c +++ b/modules/filters/mod_filter.c @@ -135,11 +135,11 @@ static int filter_lookup(ap_filter_t *f, ap_filter_rec_t *filter) ap_filter_provider_t *provider; int match; const char *err = NULL; - unsigned int proto_flags; request_rec *r = f->r; harness_ctx *ctx = f->ctx; provider_ctx *pctx; #ifndef NO_PROTOCOL + unsigned int proto_flags; mod_filter_ctx *rctx = ap_get_module_config(r->request_config, &filter_module); #endif diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index 27b7cd7d23..a5bd3520e8 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -1333,7 +1333,7 @@ static char *lookup_map_dbd(request_rec *r, char *key, const char *label) "rewritemap: error %s querying for %s", errmsg, key); return NULL; } - while (rv = apr_dbd_get_row(db->driver, r->pool, res, &row, -1), rv == 0) { + while ((rv = apr_dbd_get_row(db->driver, r->pool, res, &row, -1)) == 0) { ++n; if (ret == NULL) { ret = apr_dbd_get_entry(db->driver, row, 0); |