X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallfcgi.c;h=3320f5d714b0ec3ee15f79cdd965c5a38d19ec06;hb=1af656d2284a5f51631ae11ee9fa068af5c1ccc4;hp=a6d394569268fb53a8e9909e5a8697a9580627ea;hpb=107aa2ef0fb1cc1b79d5ad832af02a2ee29a5cf8;p=ashd.git

diff --git a/src/callfcgi.c b/src/callfcgi.c
index a6d3945..3320f5d 100644
--- a/src/callfcgi.c
+++ b/src/callfcgi.c
@@ -441,14 +441,13 @@ static char *absolutify(char *file)
 static void mkcgienv(struct hthead *req, struct charbuf *dst)
 {
     int i;
-    char *url, *qp, *h, *p;
+    char *url, *pi, *tmp, *qp, *h, *p;
     
     bufaddenv(dst, "SERVER_SOFTWARE", "ashd/%s", VERSION);
     bufaddenv(dst, "GATEWAY_INTERFACE", "CGI/1.1");
     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);
     url = sstrdup(req->url);
     if((qp = strchr(url, '?')) != NULL)
 	*(qp++) = 0;
@@ -456,13 +455,26 @@ 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;
+    }
+    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-Address")) != NULL)
+	bufaddenv(dst, "SERVER_ADDR", "%s", h);
     if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
 	bufaddenv(dst, "SERVER_PORT", "%s", h);
     if((h = getheader(req, "X-Ash-Remote-User")) != NULL)
@@ -471,14 +483,19 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	bufaddenv(dst, "HTTPS", "on");
     if((h = getheader(req, "X-Ash-Address")) != NULL)
 	bufaddenv(dst, "REMOTE_ADDR", "%s", h);
+    if((h = getheader(req, "X-Ash-Port")) != NULL)
+	bufaddenv(dst, "REMOTE_PORT", "%s", h);
     if((h = getheader(req, "Content-Type")) != NULL)
 	bufaddenv(dst, "CONTENT_TYPE", "%s", h);
     if((h = getheader(req, "Content-Length")) != NULL)
 	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++) {
@@ -797,6 +814,7 @@ static void sigign(int sig)
 
 static void sigexit(int sig)
 {
+    shutdown(0, SHUT_RDWR);
     exit(0);
 }