X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallscgi.c;h=07064f3c348f570a14538e0db9a003a3f9040273;hb=121587a56e50fd4cce884d9e61e8796436b150a4;hp=85cc50aa034eac3a89d6921b423dc8f1793a6e53;hpb=107aa2ef0fb1cc1b79d5ad832af02a2ee29a5cf8;p=ashd.git

diff --git a/src/callscgi.c b/src/callscgi.c
index 85cc50a..07064f3 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -403,7 +403,7 @@ static char *absolutify(char *file)
 static void mkcgienv(struct hthead *req, struct charbuf *dst)
 {
     int i;
-    char *url, *qp, *h, *p;
+    char *url, *unq, *qp, *h, *p;
     
     bufaddenv(dst, "SERVER_SOFTWARE", "ashd/%s", VERSION);
     bufaddenv(dst, "GATEWAY_INTERFACE", "CGI/1.1");
@@ -411,7 +411,12 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
     bufaddenv(dst, "SERVER_PROTOCOL", "%s", req->ver);
     bufaddenv(dst, "REQUEST_METHOD", "%s", req->method);
     bufaddenv(dst, "REQUEST_URI", "%s", req->url);
-    bufaddenv(dst, "PATH_INFO", req->rest);
+    if((unq = unquoteurl(req->rest)) != NULL) {
+	bufaddenv(dst, "PATH_INFO", unq);
+	free(unq);
+    } else {
+	bufaddenv(dst, "PATH_INFO", req->rest);
+    }
     url = sstrdup(req->url);
     if((qp = strchr(url, '?')) != NULL)
 	*(qp++) = 0;
@@ -424,6 +429,7 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	bufaddenv(dst, "SCRIPT_NAME", "%s", url);
     }
     bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:"");
+    free(url);
     if((h = getheader(req, "Host")) != NULL)
 	bufaddenv(dst, "SERVER_NAME", "%s", h);
     if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
@@ -440,8 +446,11 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	bufaddenv(dst, "CONTENT_LENGTH", "%s", h);
     else
 	bufaddenv(dst, "CONTENT_LENGTH", "0");
-    if((h = getheader(req, "X-Ash-File")) != NULL)
-	bufaddenv(dst, "SCRIPT_FILENAME", "%s", absolutify(h));
+    if((h = getheader(req, "X-Ash-File")) != NULL) {
+	h = absolutify(h);
+	bufaddenv(dst, "SCRIPT_FILENAME", "%s", h);
+	free(h);
+    }
     for(i = 0; i < req->noheaders; i++) {
 	h = sprintf2("HTTP_%s", req->headers[i][0]);
 	for(p = h; *p; p++) {