rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix CGI with new IRI parser 

With new IRI, parser the old assumption of path starting with ./
is no longer valid.
This commit is contained in:
Omar Polo 2020-12-28 09:52:39 +01:00
parent 6d91731552
commit 5a40216f37
No known key found for this signature in database
GPG Key ID: 35F98C96A1786F0D
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gmid.c
View File

@ -218,8 +218,7 @@ open_file(char *fpath, char *query, struct pollfd *fds, struct client *c)
{
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, struct client *c)
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, const char *query,
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, const char *query,
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,