diff options
| author | Joe Orton <jorton@apache.org> | 2020-09-15 09:14:39 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-09-15 09:14:39 +0000 |
| commit | 250bd58c5d2f5dcb8da2993987694e357f787b14 (patch) | |
| tree | 525c6c6336ab5bb5eee437db59006881cfa2a6e0 /modules/dav | |
| parent | 84efa962ce7eeeb42233bee3a3fec09ee46735f0 (diff) | |
| download | httpd-250bd58c5d2f5dcb8da2993987694e357f787b14.tar.gz | |
* modules/dav/fs/repos.c (dav_fs_open_stream): Add specific logs for
different modes in dav_fs_open_stream(), indicate failure because of
different file open modes. Also add the filepath in the log messages.
Github: closes #138
PR: 64413
Submitted by: Bingyu Shen <ahshenbingyu gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1881736 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/dav')
| -rw-r--r-- | modules/dav/fs/repos.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 8dfa28a34f..1f7379a4d3 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -948,15 +948,29 @@ static dav_error * dav_fs_open_stream(const dav_resource *resource, else if (APR_STATUS_IS_EEXIST(rv)) { rv = apr_file_open(&ds->f, ds->pathname, flags, APR_OS_DEFAULT, ds->p); + if (rv != APR_SUCCESS) { + return dav_new_error(p, MAP_IO2HTTP(rv), 0, rv, + apr_psprintf(p, "Could not open an existing " + "resource for writing: %s.", + ds->pathname)); + } } } else { rv = apr_file_open(&ds->f, ds->pathname, flags, APR_OS_DEFAULT, ds->p); + if (rv != APR_SUCCESS) { + return dav_new_error(p, MAP_IO2HTTP(rv), 0, rv, + apr_psprintf(p, "Could not open an existing " + "resource for reading: %s.", + ds->pathname)); + } } if (rv != APR_SUCCESS) { return dav_new_error(p, MAP_IO2HTTP(rv), 0, rv, - "An error occurred while opening a resource."); + apr_psprintf(p, "An error occurred while opening " + "a resource for writing: %s.", + ds->pathname)); } /* (APR registers cleanups for the fd with the pool) */ |