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 9e485ef9c48a1e2eca64e1f7687401bd7eb22228..5f0cd2421830004e6ffd76a17a094bafa1154007 100644 (file)
--- 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);
     }