From 2d65add085285c9df22b9c9bf7d5f2521d9f61cd Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sun, 5 Sep 2010 04:31:54 +0200 Subject: [PATCH] Updated call{,s}cgi to reflect dirplex point handling change. --- src/callcgi.c | 12 ++++-------- src/callscgi.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/callcgi.c b/src/callcgi.c index e6e909b..e51a06a 100644 --- a/src/callcgi.c +++ b/src/callcgi.c @@ -90,17 +90,13 @@ static void forkchild(int inpath, char *prog, char *file, char *method, char *ur if(getenv("HTTP_VERSION")) putenv(sprintf2("SERVER_PROTOCOL=%s", getenv("HTTP_VERSION"))); putenv(sprintf2("REQUEST_METHOD=%s", method)); - if(*rest) - putenv(sprintf2("PATH_INFO=/%s", rest)); - else - putenv("PATH_INFO="); + putenv(sprintf2("PATH_INFO=%s", rest)); name = url; /* XXX: This is an ugly hack (I think), but though I can think * of several alternatives, none seem to be better. */ - if(*rest && (strlen(url) > strlen(rest)) && - !strcmp(rest, url + strlen(url) - strlen(rest)) && - (url[strlen(url) - strlen(rest) - 1] == '/')) { - name = sprintf2("%.*s", (int)(strlen(url) - strlen(rest) - 1), url); + if(*rest && (strlen(url) >= strlen(rest)) && + !strcmp(rest, url + strlen(url) - strlen(rest))) { + name = sprintf2("%.*s", (int)(strlen(url) - strlen(rest)), url); } putenv(sprintf2("SCRIPT_NAME=%s", name)); putenv(sprintf2("QUERY_STRING=%s", qp?qp:"")); diff --git a/src/callscgi.c b/src/callscgi.c index 6adccc5..5965b5f 100644 --- a/src/callscgi.c +++ b/src/callscgi.c @@ -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); } -- 2.11.0