www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

The lots of little ones... APR_IS_STATUS_condition(rv) conditional macros

Browse Source 
replacing the majority of fallible rv == APR_condition tests.  But there
  are lots more to fix, these are the obvious ones that already did proper
  canonical error conversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86405 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2000-10-05 17:33:14 +00:00
parent 73369a1dce
commit 01f4c4f960
10 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/http/http_request.c
View File

@@ -210,7 +210,7 @@ static int get_path_info(request_rec *r)
char *path = r->filename;
char *end = &path[strlen(path)];
char *last_cp = NULL;
int rv, rvc;
int rv;
#ifdef HAVE_DRIVE_LETTERS
char bStripSlash=1;
#endif
@@ -301,10 +301,9 @@ static int get_path_info(request_rec *r)
* even if they returned an error.
*/
r->finfo.protection = 0;
rvc = apr_canonical_error(rv);
#if defined(APR_ENOENT) && defined(APR_ENOTDIR)
if (rvc == APR_ENOENT || rvc == APR_ENOTDIR) {
if (APR_STATUS_IS_ENOENT(rv) || APR_STATUS_IS_ENOTDIR(rv)) {
last_cp = cp;
while (--cp > path && *cp != '/')
@@ -315,14 +314,14 @@ static int get_path_info(request_rec *r)
}
else {
#if defined(APR_EACCES)
if (rvc != APR_EACCES)
if (APR_STATUS_IS_EACCES(rv))
#endif
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
"access to %s failed", r->uri);
return HTTP_FORBIDDEN;
}
#else
#error ENOENT || ENOTDIR not defined; please see the
#error APR_ENOENT || APR_ENOTDIR not defined; please see the
#error comments at this line in the source for a workaround.
/*
* If ENOENT || ENOTDIR is not defined in one of the your OS's
@@ -344,7 +343,7 @@ static int get_path_info(request_rec *r)
while (cp > path && cp[-1] == '/')
--cp;
#endif /* ENOENT && ENOTDIR */
#endif /* APR_ENOENT && APR_ENOTDIR */
}
return OK;
}