aniani/gmnisrv
1
0
Fork 1
mirror of https://git.sr.ht/~sircmpwn/gmnisrv synced 2024-12-04 14:46:42 -05:00
Code

CGI: Fix SCRIPT_NAME variable

Browse Source
This commit is contained in:
Drew DeVault 2020-10-26 18:16:05 -04:00
parent 5d725ff4ee
commit da6f7e9f05
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/serve.c
View File

@ -121,7 +121,8 @@ internal_error:
} }
static void static void
serve_cgi(struct gmnisrv_client *client, const char *path, const char *pathinfo) serve_cgi(struct gmnisrv_client *client, const char *path,
const char *script_name, const char *pathinfo)
{ {
int pfd[2]; int pfd[2];
if (pipe(pfd) == -1) { if (pipe(pfd) == -1) {
@ -170,7 +171,7 @@ serve_cgi(struct gmnisrv_client *client, const char *path, const char *pathinfo)
setenv("SERVER_PROTOCOL", "GEMINI", 1); setenv("SERVER_PROTOCOL", "GEMINI", 1);
setenv("SERVER_SOFTWARE", "gmnisrv/0.0.0", 1); setenv("SERVER_SOFTWARE", "gmnisrv/0.0.0", 1);
setenv("GEMINI_URL", client->buf, 1); setenv("GEMINI_URL", client->buf, 1);
setenv("SCRIPT_NAME", path, 1); setenv("SCRIPT_NAME", script_name, 1);
setenv("PATH_INFO", pathinfo, 1); setenv("PATH_INFO", pathinfo, 1);
setenv("SERVER_NAME", client->host->hostname, 1); setenv("SERVER_NAME", client->host->hostname, 1);
setenv("HOSTNAME", client->host->hostname, 1); setenv("HOSTNAME", client->host->hostname, 1);
@ -330,7 +331,9 @@ serve_request(struct gmnisrv_client *client)
} }
if (route->cgi) { if (route->cgi) {
serve_cgi(client, real_path, (const char *)pathinfo); serve_cgi(client, real_path,
(const char *)client_path,
(const char *)pathinfo);
return; return;
} }