X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallscgi.c;h=af84a9aaccb1aace1f5c1cb0b43f1481c18676e2;hb=f2df7a1b1aeeb0cec2309aeb62fae051fd3c687c;hp=6adccc5d00ad9a45cd98658db3745628d96d7492;hpb=7b9c1cff81db02307ec35ed58ba8269667ffbea0;p=ashd.git

diff --git a/src/callscgi.c b/src/callscgi.c
index 6adccc5..af84a9a 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -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);
     }
 }
@@ -411,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);
     }
@@ -582,6 +578,10 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
 static void sigexit(int sig)
 {
     exit(0);
@@ -589,7 +589,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)
@@ -620,10 +620,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);