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

diff --git a/src/callscgi.c b/src/callscgi.c
index 5965b5f..07064f3 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);
     }
 }
 
@@ -312,7 +312,7 @@ retry:
 	isanon = 0;
 	return(fd);
     } else {
-	flog(LOG_ERR, "servescgi: cannot use an anonymous socket without a program to start");
+	flog(LOG_ERR, "callscgi: cannot use an anonymous socket without a program to start");
 	exit(1);
     }
 }
@@ -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,10 +429,13 @@ 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)
 	bufaddenv(dst, "SERVER_PORT", "%s", h);
+    if((h = getheader(req, "X-Ash-Remote-User")) != NULL)
+	bufaddenv(dst, "REMOTE_USER", "%s", h);
     if(((h = getheader(req, "X-Ash-Protocol")) != NULL) && !strcmp(h, "https"))
 	bufaddenv(dst, "HTTPS", "on");
     if((h = getheader(req, "X-Ash-Address")) != NULL)
@@ -438,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++) {
@@ -578,6 +589,10 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
 static void sigexit(int sig)
 {
     exit(0);
@@ -585,7 +600,7 @@ static void sigexit(int sig)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: servescgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n");
+    fprintf(out, "usage: callscgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n");
 }
 
 int main(int argc, char **argv)
@@ -616,10 +631,11 @@ int main(int argc, char **argv)
     }
     progspec = argv + optind;
     if(((sockid != NULL) + (unspec != NULL) + (inspec != NULL)) > 1) {
-	flog(LOG_ERR, "servescgi: at most one of -i, -u or -t may be given");
+	flog(LOG_ERR, "callscgi: at most one of -i, -u or -t may be given");
 	exit(1);
     }
     signal(SIGCHLD, SIG_IGN);
+    signal(SIGPIPE, sigign);
     signal(SIGINT, sigexit);
     signal(SIGTERM, sigexit);
     mustart(listenloop, 0);