call[fs]cgi: Fixed bug-fix bug.

[ashd.git] / src / callfcgi.c

diff --git a/src/callfcgi.c b/src/callfcgi.c
index a394a42..27c9c5e 100644 (file)
--- a/src/callfcgi.c
+++ b/src/callfcgi.c
@@ -208,7 +208,7 @@ static void startlisten(void)
            close(i);
        execvp(*progspec, progspec);
        flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
-       exit(127);
+       _exit(127);
     }
     close(fd);
 }
@@ -226,13 +226,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, "callfcgi: %s: %s", *progspec, strerror(errno));
-       exit(127);
+       _exit(127);
     }
 }
 
@@ -441,14 +441,19 @@ 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");
     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;
@@ -461,10 +466,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)
@@ -475,8 +483,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++) {
@@ -609,12 +620,12 @@ static int recvrec(FILE *in, int *type, int *rid, char **data, size_t *dlen)
        return(-1);
     *data = smalloc(max(*dlen, 1));
     if(fread(*data, 1, *dlen, in) != *dlen) {
-       free(data);
+       free(*data);
        return(-1);
     }
     for(; pl > 0; pl--) {
        if(fgetc(in) == EOF) {
-           free(data);
+           free(*data);
            return(-1);
        }
     }