From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 24 Aug 2001 01:41:56 +0000 (+0000)
Subject:   Revert this patch.  It indicates some fundamental brokenness with the
X-Git-Tag: 2.0.25~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=572a020ea95710440c41b2a5985b7754abd81fd5;p=apache

  Revert this patch.  It indicates some fundamental brokenness with the
  apr_filepath_root() fn, which should simply return '/' for an absolute
  path on (most) unix, and advance the path pointer to the first non-'/'
  character  [if only Win32 and others were so simple ;-]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90605 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util.c b/server/util.c
index 475dac4b66..6e38fafbed 100644
--- a/server/util.c
+++ b/server/util.c
@@ -259,13 +259,8 @@ AP_DECLARE(int) ap_os_is_path_absolute(apr_pool_t *p, const char *dir)
 {
     const char *newpath;
     const char *ourdir = dir;
-    apr_status_t rv = apr_filepath_root(&newpath, &dir, 0, p);
-
-    if (rv == APR_EABSOLUTE) {
-        return 1;
-    }
-
-    if (rv != APR_SUCCESS || strncmp(newpath, ourdir, strlen(newpath)) != 0) {
+    if (apr_filepath_root(&newpath, &dir, 0, p) != APR_SUCCESS
+            || strncmp(newpath, ourdir, strlen(newpath)) != 0) {
         return 0;
     }
     return 1;