From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 2 Nov 2000 20:05:00 +0000 (+0000)
Subject:   Solve the os_is_absolute_path problem for the moment.
X-Git-Tag: APACHE_2_0_ALPHA_8~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdf3f917c0d21854c484bfd3e0202ff1b7f26e9f;p=apache

  Solve the os_is_absolute_path problem for the moment.

  This is -not- the permanent patch for 2.0, simply a placeholder till we
  have the canonical name implemented in APR for good.


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

diff --git a/server/config.c b/server/config.c
index 32131ffc01..4617a85083 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1173,7 +1173,9 @@ AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_pt
        so the server can be moved or mirrored with less pain.  */
     char *p;
     int offset = (int) (long) cmd->info;
+#ifndef OS2
     arg = ap_os_canonical_filename(cmd->pool, arg);
+#endif
     if (ap_os_is_path_absolute(arg))
 	p = apr_pstrdup(cmd->pool, arg);
     else
@@ -1192,6 +1194,9 @@ static cmd_parms default_parms =
 
 AP_DECLARE(const char *) ap_server_root_relative(apr_pool_t *p, const char *file)
 {
+#ifndef OS2
+    file = ap_os_canonical_filename(p, file);
+#endif
     if(ap_os_is_path_absolute(file))
 	return file;
     return ap_make_full_path(p, ap_server_root, file);