dany/antd-cgi-plugin
1
0
Fork 0
mirror of https://github.com/lxsang/antd-cgi-plugin synced 2024-12-26 18:08:21 +01:00
Code Issues Projects Releases Wiki Activity

fix env vars missing

Browse Source
This commit is contained in:
lxsang 2019-12-30 13:02:27 +01:00
parent 6ed698d1f8
commit e37706d008
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cgi.c
View File

@ -106,6 +106,7 @@ static list_t get_env_vars(antd_request_t *rq)
add_vars(&env_vars, "QUERY_STRING", "");
else
{
add_vars(&env_vars, "REQUEST_URI", tmp);
sub = strchr(tmp, '?');
if (sub)
{
@ -131,7 +132,18 @@ static list_t get_env_vars(antd_request_t *rq)
add_vars(&env_vars, "DOCUMENT_ROOT", rq->client->port_config->htdocs);
tmp = (char *)dvalue(request, "REQUEST_PATH");
if (tmp)
add_vars(&env_vars, "PATH_INFO", tmp);
{
sub = tmp;
while(*sub == '/') sub++;
if(sub)
{
add_vars(&env_vars, "PATH_INFO", sub);
}
else
{
add_vars(&env_vars, "PATH_INFO", "");
}
}
else
add_vars(&env_vars, "PATH_INFO", "");
tmp = (char *)dvalue(header, "REMOTE_ADDR");
@ -245,7 +257,7 @@ void *handle(void *data)
//wpid = 0;
//waitpid(pid, &status, 0); // wait for the child finish
// WNOHANG
while (1)
while ( waitpid(pid, &status, WNOHANG) == 0)
{
memset(buf, 0, sizeof(buf));
ssize_t count = read(inpipefd[0], buf, BUFFLEN);
@ -257,30 +269,23 @@ void *handle(void *data)
}
else
{
//perror("read");
break;
}
}
else if (count == 0)
{
break;
continue;
}
else
{
antd_send(cl, buf, count);
//printf("sent: %d with count: %d\n", sent, count);
}
}
/*
do {
memset(buf, 0, sizeof(buf));
int r = read(inpipefd[0], buf, BUFFLEN-1);
if(r > 0)
{
__t(cl, buf);
}
} while(wpid == 0);
*/
kill(pid, SIGKILL);
waitpid(pid, &status, 0);
//kill(pid, SIGKILL);
//waitpid(pid, &status, 0);
//printf("End cgi\n");
free(envs);
list_free(&env_vars);
task = antd_create_task(NULL, data, NULL,rq->client->last_io);

BIN
dist/cgi-1.0.0b.tar.gz vendored
View File

Binary file not shown.