dany/antd-cgi-plugin
1
0
Fork 0
mirror of https://github.com/lxsang/antd-cgi-plugin synced 2024-12-27 10:28:22 +01:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
lxsang 2019-12-30 17:19:48 +01:00
parent e37706d008
commit 7a50a09944
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cgi.c
View File

@ -2,6 +2,9 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <antd/plugin.h> #include <antd/plugin.h>
#include "antd/ini.h" #include "antd/ini.h"
#define MAX_ENV_SIZE 512
dictionary_t cgi_bin = NULL; dictionary_t cgi_bin = NULL;
static int ini_handle(void *user_data, const char *section, const char *name, static int ini_handle(void *user_data, const char *section, const char *name,
@ -189,6 +192,28 @@ static list_t get_env_vars(antd_request_t *rq)
return env_vars; return env_vars;
} }
int read_line(int fn, char*buf,int size)
{
int i = 0;
char c = '\0';
int n;
while ((i < size - 1) && (c != '\n'))
{
n = read(fn, &c,1);
if (n > 0)
{
//LOG("Data : %c\n", c);
buf[i] = c;
i++;
}
else
c = '\n';
}
buf[i] = '\0';
return i;
}
void *handle(void *data) void *handle(void *data)
{ {
antd_request_t *rq = (antd_request_t *)data; antd_request_t *rq = (antd_request_t *)data;
@ -213,16 +238,17 @@ void *handle(void *data)
// now exec the cgi bin // now exec the cgi bin
LOG("Execute the cgi bin\n"); LOG("Execute the cgi bin\n");
item_t np = env_vars; item_t np = env_vars;
int size = list_size(env_vars); char* envs[MAX_ENV_SIZE];
char **envs = (char **)malloc((size + 1) * sizeof(*envs));
envs[size] = NULL;
int i = 0; int i = 0;
while (np) while (np)
{ {
envs[i] = (char*)np->value.ptr; envs[i] = (char*)np->value.ptr;
np = np->next; np = np->next;
i++; i++;
if(i == MAX_ENV_SIZE - 1)
break;
} }
envs[i] = NULL;
// PIPE // PIPE
UNUSED(pipe(inpipefd)); UNUSED(pipe(inpipefd));
UNUSED(pipe(outpipefd)); UNUSED(pipe(outpipefd));
@ -252,15 +278,19 @@ void *handle(void *data)
write_request_body(rq, outpipefd[1]); write_request_body(rq, outpipefd[1]);
const char* stat_str = get_status_str(200); const char* stat_str = get_status_str(200);
__t(cl, "HTTP/1.1 %d %s", 200, stat_str);
//set_status(cl, 200, "OK"); //set_status(cl, 200, "OK");
//wpid = 0; //wpid = 0;
//waitpid(pid, &status, 0); // wait for the child finish //waitpid(pid, &status, 0); // wait for the child finish
// WNOHANG // WNOHANG
int beg = 1;
regmatch_t matches[2];
char statusbuf[100];
char* sub = NULL;
memset(statusbuf, '\0', sizeof(statusbuf));
while ( waitpid(pid, &status, WNOHANG) == 0) while ( waitpid(pid, &status, WNOHANG) == 0)
{ {
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
ssize_t count = read(inpipefd[0], buf, BUFFLEN); ssize_t count = read(inpipefd[0], buf, BUFFLEN - 1);
if (count == -1) if (count == -1)
{ {
if (errno == EINTR) if (errno == EINTR)
@ -279,7 +309,23 @@ void *handle(void *data)
} }
else else
{ {
antd_send(cl, buf, count); sub = buf;
if(beg)
{
if(regex_match("\\s*Status\\s*:\\s+([0-9]{3}\\s+[a-zA-Z0-9 ]*)",buf,2,matches))
{
memcpy(statusbuf, buf + matches[1].rm_so, matches[1].rm_eo - matches[1].rm_so);
sub = buf + matches[1].rm_eo + 2;
count -= matches[1].rm_eo + 2;
__t(cl, "HTTP/1.1 %s", statusbuf);
}
else
{
__t(cl, "HTTP/1.1 %d %s", 200, stat_str);
}
beg = 0;
}
antd_send(cl, sub, count);
//printf("sent: %d with count: %d\n", sent, count); //printf("sent: %d with count: %d\n", sent, count);
} }
} }