X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallscgi.c;h=299e09f052f6f484c560907621cd96e233e436bd;hb=0b6f220fc8ac58b6404e2d45eed52629d549860f;hp=e91759e46c32b04ac92e28b9a05f8fcb85f3dec7;hpb=e25bf4f9646b5ee2cfe363fca67a32d4e2a3f0cc;p=ashd.git

diff --git a/src/callscgi.c b/src/callscgi.c
index e91759e..299e09f 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, *unq, *qp, *h, *p;
+    char *url, *pi, *tmp, *qp, *h, *p;
     
     bufaddenv(dst, "SERVER_SOFTWARE", "ashd/%s", VERSION);
     bufaddenv(dst, "GATEWAY_INTERFACE", "CGI/1.1");
@@ -411,12 +411,6 @@ 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);
-    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,12 +418,22 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
      * several alternatives, none seem to be better. */
     if(*req->rest && (strlen(url) >= strlen(req->rest)) &&
        !strcmp(req->rest, url + strlen(url) - strlen(req->rest))) {
-	bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest)), url);
-    } else {
-	bufaddenv(dst, "SCRIPT_NAME", "%s", url);
+	url[strlen(url) - strlen(req->rest)] = 0;
     }
-    free(url);
+    if((pi = unquoteurl(req->rest)) == NULL)
+	pi = sstrdup(req->rest);
+    if(!strcmp(url, "/")) {
+	/* This seems to be normal CGI behavior, but see callcgi.c for
+	 * details. */
+	url[0] = 0;
+	pi = sprintf2("/%s", tmp = pi);
+	free(tmp);
+    }
+    bufaddenv(dst, "PATH_INFO", pi);
+    bufaddenv(dst, "SCRIPT_NAME", url);
     bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:"");
+    free(pi);
+    free(url);
     if((h = getheader(req, "Host")) != NULL)
 	bufaddenv(dst, "SERVER_NAME", "%s", h);
     if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
@@ -595,6 +599,7 @@ static void sigign(int sig)
 
 static void sigexit(int sig)
 {
+    shutdown(0, SHUT_RDWR);
     exit(0);
 }