diff options
Diffstat (limited to 'modules/metadata')
| -rw-r--r-- | modules/metadata/mod_cern_meta.c | 2 | ||||
| -rw-r--r-- | modules/metadata/mod_headers.c | 2 | ||||
| -rw-r--r-- | modules/metadata/mod_remoteip.c | 13 | ||||
| -rw-r--r-- | modules/metadata/mod_setenvif.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c index fe704f1a..f06c464c 100644 --- a/modules/metadata/mod_cern_meta.c +++ b/modules/metadata/mod_cern_meta.c @@ -237,7 +237,7 @@ static int scan_meta_file(request_rec *r, apr_file_t *f) } *l++ = '\0'; - while (*l && apr_isspace(*l)) + while (apr_isspace(*l)) ++l; if (!strcasecmp(w, "Content-type")) { diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c index 93977390..9ce2fdec 100644 --- a/modules/metadata/mod_headers.c +++ b/modules/metadata/mod_headers.c @@ -722,7 +722,7 @@ static int do_headers_fixup(request_rec *r, apr_table_t *headers, while (*val) { const char *tok_start; - while (*val && apr_isspace(*val)) + while (apr_isspace(*val)) ++val; tok_start = val; diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index a0bfd864..b0af3a32 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -170,10 +170,9 @@ static const char *proxies_set(cmd_parms *cmd, void *cfg, } if (rv != APR_SUCCESS) { - char msgbuf[128]; - apr_strerror(rv, msgbuf, sizeof(msgbuf)); - return apr_pstrcat(cmd->pool, "RemoteIP: Error parsing IP ", arg, - " (", msgbuf, " error) for ", cmd->cmd->name, NULL); + return apr_psprintf(cmd->pool, + "RemoteIP: Error parsing IP %s (%pm error) for %s", + arg, &rv, cmd->cmd->name); } return NULL; @@ -192,9 +191,8 @@ static const char *proxylist_read(cmd_parms *cmd, void *cfg, filename = ap_server_root_relative(cmd->temp_pool, filename); rv = ap_pcfg_openfile(&cfp, cmd->temp_pool, filename); if (rv != APR_SUCCESS) { - return apr_psprintf(cmd->pool, "%s: Could not open file %s: %s", - cmd->cmd->name, filename, - apr_strerror(rv, lbuf, sizeof(lbuf))); + return apr_psprintf(cmd->pool, "%s: Could not open file %s: %pm", + cmd->cmd->name, filename, &rv); } while (!(ap_cfg_getline(lbuf, MAX_STRING_LEN, cfp))) { @@ -205,6 +203,7 @@ static const char *proxylist_read(cmd_parms *cmd, void *cfg, } errmsg = proxies_set(cmd, cfg, arg); if (errmsg) { + ap_cfg_closefile(cfp); errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s", errmsg, cfp->line_number, filename); return errmsg; diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index 65214cd4..a62670e0 100644 --- a/modules/metadata/mod_setenvif.c +++ b/modules/metadata/mod_setenvif.c @@ -314,7 +314,7 @@ static const char *add_setenvif_core(cmd_parms *cmd, void *mconfig, */ for (i = 0; i < sconf->conditionals->nelts; ++i) { new = &entries[i]; - if (!strcasecmp(new->name, fname)) { + if (new->name && !strcasecmp(new->name, fname)) { fname = new->name; break; } |