diff options
| author | Jim Jagielski <jim@apache.org> | 2015-09-16 13:34:11 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2015-09-16 13:34:11 +0000 |
| commit | 3f38fb87652a34e9bd9fef09883cbd9e2f1e2cc4 (patch) | |
| tree | 1e2d72e30e437ddac7fa841c5ac97b8fe39a138f /modules/dav | |
| parent | 666ec5901df70e69f9fd2e410cb419cb0f5270cc (diff) | |
| download | httpd-3f38fb87652a34e9bd9fef09883cbd9e2f1e2cc4.tar.gz | |
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:
Core filters do not need mod_proxy.h
Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables
Save a few bytes in conf pool
Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop
In order to save a few cycles, delay a hash table lookup which is not necessary needed
Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703405 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/dav')
| -rw-r--r-- | modules/dav/main/mod_dav.c | 2 | ||||
| -rw-r--r-- | modules/dav/main/util.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 2319549a42..cd45ef940d 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -254,7 +254,7 @@ static const char *dav_cmd_dav(cmd_parms *cmd, void *config, const char *arg1) conf->provider = NULL; } else { - conf->provider_name = apr_pstrdup(cmd->pool, arg1); + conf->provider_name = arg1; } if (conf->provider_name != NULL) { diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c index 3d4b1ec3d8..8d4f64a2bd 100644 --- a/modules/dav/main/util.c +++ b/modules/dav/main/util.c @@ -1823,10 +1823,11 @@ DAV_DECLARE(void) dav_add_vary_header(request_rec *in_req, * so only do this check if there is a versioning provider */ if (vsn_hooks != NULL) { const char *target = apr_table_get(in_req->headers_in, DAV_LABEL_HDR); - const char *vary = apr_table_get(out_req->headers_out, "Vary"); /* If Target-Selector specified, add it to the Vary header */ if (target != NULL) { + const char *vary = apr_table_get(out_req->headers_out, "Vary"); + if (vary == NULL) vary = DAV_LABEL_HDR; else |