Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

cgi: issue CGI_TERMINATED also on reap

Browse source 
We also need to report CGI_TERMINATED when reaping children that closed by
themselves.  Keep an extra copy of the pid outside of the lws_spawn object
so it's still around by then.
This commit is contained in:
Andy Green 2021-11-07 06:57:42 +00:00
parent 270a14813f
commit c19dc963c9
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/roles/cgi/cgi-server.c
View file

@ -90,6 +90,14 @@ lws_cgi_reap_cb(void *opaque, lws_usec_t *accounting, siginfo_t *si,
int we_killed_him)
{
struct lws *wsi = (struct lws *)opaque;
struct lws_cgi_args args;
if (wsi->http.cgi &&
user_callback_handle_rxflow(wsi->a.protocol->callback, wsi,
LWS_CALLBACK_CGI_TERMINATED,
wsi->user_space, (void *)&args,
(unsigned int)wsi->http.cgi->pi))
lwsl_notice("\n");
/*
* The cgi has come to an end, by itself or with a signal...
@ -418,6 +426,8 @@ lws_cgi(struct lws *wsi, const char * const *exec_array,
goto bail;
}
wsi->http.cgi->pi = wsi->http.cgi->lsp->child_pid;
/* we are the parent process */
wsi->a.context->count_cgi_spawned++;

2
lib/roles/cgi/private-lib-roles-cgi.h
View file

@ -75,6 +75,8 @@ struct lws_cgi {
lws_filepos_t content_length;
lws_filepos_t content_length_seen;
pid_t pi;
int match[SIGNIFICANT_HDR_COUNT];
char l[12];
int response_code;