X-Git-Url: http://dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fcallscgi.c;h=6d72f0e7c4786eaf23aeb421076ef7103a71f770;hp=07064f3c348f570a14538e0db9a003a3f9040273;hb=d06b6013fea7b2c01e75c5fe8bf98ab7caf1346c;hpb=b77076c4041fdd70f9c5d1bcc48ec248d7e6fd3b

diff --git a/src/callscgi.c b/src/callscgi.c
index 07064f3..6d72f0e 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -32,7 +32,7 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -40,6 +40,7 @@
 #endif
 #include <utils.h>
 #include <req.h>
+#include <resp.h>
 #include <log.h>
 #include <mt.h>
 #include <mtio.h>
@@ -403,7 +404,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 +412,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,14 +419,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)
@@ -440,6 +447,8 @@ 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)
@@ -465,46 +474,6 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
     }
 }
 
-static char *defstatus(int code)
-{
-    if(code == 200)
-	return("OK");
-    else if(code == 201)
-	return("Created");
-    else if(code == 202)
-	return("Accepted");
-    else if(code == 204)
-	return("No Content");
-    else if(code == 300)
-	return("Multiple Choices");
-    else if(code == 301)
-	return("Moved Permanently");
-    else if(code == 302)
-	return("Found");
-    else if(code == 303)
-	return("See Other");
-    else if(code == 304)
-	return("Not Modified");
-    else if(code == 307)
-	return("Moved Temporarily");
-    else if(code == 400)
-	return("Bad Request");
-    else if(code == 401)
-	return("Unauthorized");
-    else if(code == 403)
-	return("Forbidden");
-    else if(code == 404)
-	return("Not Found");
-    else if(code == 500)
-	return("Internal Server Error");
-    else if(code == 501)
-	return("Not Implemented");
-    else if(code == 503)
-	return("Service Unavailable");
-    else
-	return("Unknown status");
-}
-
 static struct hthead *parseresp(FILE *in)
 {
     struct hthead *resp;
@@ -523,7 +492,7 @@ static struct hthead *parseresp(FILE *in)
 	    resp->msg = sstrdup(p);
 	} else {
 	    resp->code = atoi(st);
-	    resp->msg = sstrdup(defstatus(resp->code));
+	    resp->msg = sstrdup(httpdefstatus(resp->code));
 	}
 	headrmheader(resp, "Status");
     } else if(getheader(resp, "Location")) {
@@ -595,7 +564,7 @@ static void sigign(int sig)
 
 static void sigexit(int sig)
 {
-    exit(0);
+    shutdown(0, SHUT_RDWR);
 }
 
 static void usage(FILE *out)
@@ -639,7 +608,7 @@ int main(int argc, char **argv)
     signal(SIGINT, sigexit);
     signal(SIGTERM, sigexit);
     mustart(listenloop, 0);
-    atexit(killcuraddr);
     ioloop();
+    killcuraddr();
     return(0);
 }