From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 10 Sep 2001 03:56:45 +0000 (+0000)
Subject:   This patch is insufficient (highlights an existing problem) for OS2 and
X-Git-Tag: 2.0.26~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd3194323b413fa377926d6cfa7e79c46da3eb4e;p=apache

  This patch is insufficient (highlights an existing problem) for OS2 and
  Netware, especially, and any other platform with odd native requirements
  for the PATH_TRANSLATED variable (where it should look like a filesystem
  entity for non-unixish cgi's.)


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

diff --git a/server/util_script.c b/server/util_script.c
index 9e485ef9c4..5f0cd24218 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -390,13 +390,10 @@ AP_DECLARE(void) ap_add_cgi_vars(request_rec *r)
 	    char *pt = apr_pstrcat(r->pool, pa_req->filename, pa_req->path_info,
 				  NULL);
 #ifdef WIN32
-	    char buffer[HUGE_STRING_LEN];
 	    /* We need to make this a real Windows path name */
-	    GetFullPathName(pt, HUGE_STRING_LEN, buffer, NULL);
-	    apr_table_setn(e, "PATH_TRANSLATED", apr_pstrdup(r->pool, buffer));
-#else
-	    apr_table_setn(e, "PATH_TRANSLATED", pt);
+	    apr_filepath_merge(&pt, "", pt, APR_FILEPATH_NATIVE, r->pool);
 #endif
+	    apr_table_setn(e, "PATH_TRANSLATED", pt);
 	}
 	ap_destroy_sub_req(pa_req);
     }