Eliminated ap_os_[systemcase|[case_]canonical]_filename() and

  changes for ap_os_is_path_absolute

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

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index d162488cd21b631f5d1cc3d2c2c86389392bfec5..1fec57e0d1c83f54bebd24978c8632244e794baa 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1682,7 +1682,8 @@ void winnt_rewrite_args(process_rec *process)
         if (!strcasecmp(def_server_root, "bin"))
             *(def_server_root - 1) = '\0';
     }
-    def_server_root = ap_os_canonical_filename(process->pool, fnbuf);
+    apr_filepath_merge(&def_server_root, NULL, fnbuf, 
+                       APR_FILEPATH_TRUENAME, process->pool);
 
     /* Use process->pool so that the rewritten argv
      * lasts for the lifetime of the server process,