Commit Diff

Commit:
5a40216f37fc6b40a0861c685f9903f1a8bbb645
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
fix CGI with new IRI parser With new IRI, parser the old assumption of path starting with ./ is no longer valid.
Actions:
Patch | Tree
commit - 6d91731552a1be86794a0164b9c8313e0631725d
commit + 5a40216f37fc6b40a0861c685f9903f1a8bbb645
blob - fb98cfc6b2c623668487e8e4529b576406056fab
blob + e4ed9f743cc943c005815bac1cf68e1a0fed8192
--- gmid.c
+++ gmid.c
@@ -218,8 +218,7 @@ open_file(char *fpath, char *query, struct pollfd *fds
 {
 	switch (check_path(c, fpath, &c->fd)) {
 	case FILE_EXECUTABLE:
-		/* +2 to skip the ./ */
-		if (cgi != NULL && starts_with(fpath+2, cgi))
+		if (cgi != NULL && starts_with(fpath, cgi))
 			return start_cgi(fpath, "", query, fds, c);
 
 		/* fallthrough */
@@ -248,7 +247,7 @@ open_file(char *fpath, char *query, struct pollfd *fds
 		return 0;
 
 	case FILE_MISSING:
-		if (cgi != NULL && starts_with(fpath+2, cgi))
+		if (cgi != NULL && starts_with(fpath, cgi))
 			return check_for_cgi(fpath, query, fds, c);
 
 		if (!start_reply(fds, c, NOT_FOUND, "not found"))
@@ -281,8 +280,6 @@ start_cgi(const char *spath, const char *relpath, cons
 		char addr[INET_ADDRSTRLEN];
 		char *argv[] = { NULL, NULL, NULL };
 
-		spath++;
-
 		close(p[0]);
 		if (dup2(p[1], 1) == -1)
 			goto childerr;
@@ -293,7 +290,7 @@ start_cgi(const char *spath, const char *relpath, cons
 		if (asprintf(&portno, "%d", port) == -1)
 			goto childerr;
 
-		if (asprintf(&ex, "%s%s", dir, spath+1) == -1)
+		if (asprintf(&ex, "%s/%s", dir, spath) == -1)
 			goto childerr;
 
 		if (asprintf(&requri, "%s%s%s", spath,