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

diff --git a/src/callscgi.c b/src/callscgi.c
index 243f323..ba598fd 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -194,6 +194,7 @@ static void startlisten(void)
 	for(i = 3; i < FD_SETSIZE; i++)
 	    close(i);
 	execvp(*progspec, progspec);
+	flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
 	exit(127);
     }
     close(fd);
@@ -217,6 +218,7 @@ static void startnolisten(void)
 	dup2(fd, 0);
 	close(fd);
 	execvp(*progspec, progspec);
+	flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
 	exit(127);
     }
 }
@@ -310,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);
     }
 }
@@ -409,19 +411,15 @@ 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(*req->rest)
-	bufaddenv(dst, "PATH_INFO", "/%s", req->rest);
-    else
-	bufaddenv(dst, "PATH_INFO", "");
+    bufaddenv(dst, "PATH_INFO", req->rest);
     url = sstrdup(req->url);
     if((qp = strchr(url, '?')) != NULL)
 	*(qp++) = 0;
     /* XXX: This is an ugly hack (I think), but though I can think of
      * several alternatives, none seem to be better. */
-    if(*req->rest && (strlen(url) > strlen(req->rest)) &&
-       !strcmp(req->rest, url + strlen(url) - strlen(req->rest)) &&
-       (url[strlen(url) - strlen(req->rest) - 1] == '/')) {
-	bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest) - 1), url);
+    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);
     }
@@ -430,7 +428,9 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	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-Server-Protocol")) != NULL) && !strcmp(h, "https"))
+    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)
 	bufaddenv(dst, "REMOTE_ADDR", "%s", h);
@@ -580,9 +580,18 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
+static void sigexit(int sig)
+{
+    exit(0);
+}
+
 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)
@@ -613,10 +622,13 @@ 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);
     atexit(killcuraddr);
     ioloop();