diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-04-28 22:06:31 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-04-28 22:06:31 +0200 |
| commit | 080d5e16db802902200a9ce5b6c40f8f1fdc1f73 (patch) | |
| tree | 69845ca856fe6817f103544e88541d80411fe9a8 /modules/dav | |
| parent | cb35beef2a938b80c9e4b5d6a408eca437aa74db (diff) | |
| download | apache2-080d5e16db802902200a9ce5b6c40f8f1fdc1f73.tar.gz | |
Imported Upstream version 2.4.12
Diffstat (limited to 'modules/dav')
| -rw-r--r-- | modules/dav/fs/repos.c | 13 | ||||
| -rw-r--r-- | modules/dav/main/mod_dav.c | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 6c4c44b1..950646ee 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -874,12 +874,13 @@ static int dav_fs_is_parent_resource( && ctx2->pathname[len1] == '/'); } -static apr_status_t tmpfile_cleanup(void *data) { - dav_stream *ds = data; - if (ds->temppath) { - apr_file_remove(ds->temppath, ds->p); - } - return APR_SUCCESS; +static apr_status_t tmpfile_cleanup(void *data) +{ + dav_stream *ds = data; + if (ds->temppath) { + apr_file_remove(ds->temppath, ds->p); + } + return APR_SUCCESS; } /* custom mktemp that creates the file with APR_OS_DEFAULT permissions */ diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 07a4e2c5..2af117d2 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -315,6 +315,7 @@ static const char *dav_cmd_davmintimeout(cmd_parms *cmd, void *config, static int dav_error_response(request_rec *r, int status, const char *body) { r->status = status; + r->status_line = ap_get_status_line(status); ap_set_content_type(r, "text/html; charset=ISO-8859-1"); @@ -711,8 +712,8 @@ static dav_error *dav_get_resource(request_rec *r, int label_allowed, if (conf->provider == NULL) { return dav_new_error(r->pool, HTTP_METHOD_NOT_ALLOWED, 0, 0, apr_psprintf(r->pool, - "DAV not enabled for %s", - ap_escape_html(r->pool, r->uri))); + "DAV not enabled for %s", + ap_escape_html(r->pool, r->uri))); } /* resolve the resource */ |