X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallscgi.c;h=84b63c551b72af9843a16064241ae540f06d6f99;hb=09c82f9c7bc563c081425141853e6ff8e402e358;hp=ba598fdf2af136100030d19764d7806b85e32e90;hpb=381f9919d2b5a84bb72b1dec33623c5e6bbf1f6e;p=ashd.git

diff --git a/src/callscgi.c b/src/callscgi.c
index ba598fd..84b63c5 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -195,7 +195,7 @@ static void startlisten(void)
 	    close(i);
 	execvp(*progspec, progspec);
 	flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
-	exit(127);
+	_exit(127);
     }
     close(fd);
 }
@@ -213,13 +213,13 @@ static void startnolisten(void)
 	    close(i);
 	if((fd = open("/dev/null", O_RDONLY)) < 0) {
 	    flog(LOG_ERR, "/dev/null: %s", strerror(errno));
-	    exit(127);
+	    _exit(127);
 	}
 	dup2(fd, 0);
 	close(fd);
 	execvp(*progspec, progspec);
 	flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
-	exit(127);
+	_exit(127);
     }
 }
 
@@ -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;