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: reenable h1 with chunking

Browse source
This commit is contained in:
Andy Green 2019-11-15 19:04:12 +00:00
parent 640a3f177c
commit 1968edcf44
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/core-net/wsi-timeout.c
View file

@ -156,7 +156,9 @@ lws_set_timeout(struct lws *wsi, enum pending_timeout reason, int secs)
if (secs == LWS_TO_KILL_ASYNC)
secs = 0;
assert(!secs || !wsi->h2_stream_immortal);
// assert(!secs || !wsi->h2_stream_immortal);
if (secs && wsi->h2_stream_immortal)
lwsl_err("%s: on immortal stream %d %d\n", __func__, reason, secs);
lws_pt_lock(pt, __func__);
__lws_set_timeout(wsi, reason, secs);

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

@ -925,22 +925,6 @@ agin:
n = lws_get_socket_fd(wsi->http.cgi->stdwsi[LWS_STDOUT]);
if (n < 0)
return -1;
if (m) {
uint8_t term[LWS_PRE + 6];
lwsl_info("%s: zero chunk\n", __func__);
memcpy(term + LWS_PRE, (uint8_t *)"0\x0d\x0a\x0d\x0a", 5);
if (lws_write(wsi, term + LWS_PRE, 5,
LWS_WRITE_HTTP_FINAL) != 5)
return -1;
wsi->http.cgi->cgi_transaction_over = 1;
return 0;
}
n = read(n, start, sizeof(buf) - LWS_PRE);
if (n < 0 && errno != EAGAIN) {
@ -948,7 +932,8 @@ agin:
return -1;
}
if (n > 0) {
/*
// lwsl_hexdump_notice(buf, n);
if (!wsi->http2_substream && m) {
char chdr[LWS_HTTP_CHUNK_HDR_SIZE];
m = lws_snprintf(chdr, LWS_HTTP_CHUNK_HDR_SIZE - 3,
@ -958,7 +943,7 @@ agin:
memcpy(start + m + n, "\x0d\x0a", 2);
n += m + 2;
}
*/
#if defined(LWS_WITH_HTTP2)
if (wsi->http2_substream) {
@ -986,6 +971,23 @@ agin:
}
wsi->http.cgi->content_length_seen += n;
} else {
if (m) {
uint8_t term[LWS_PRE + 6];
memcpy(term + LWS_PRE, (uint8_t *)"0\x0d\x0a\x0d\x0a", 5);
if (lws_write(wsi, term + LWS_PRE, 5,
LWS_WRITE_HTTP_FINAL) != 5)
return -1;
wsi->http.cgi->cgi_transaction_over = 1;
return 0;
}
if (wsi->cgi_stdout_zero_length) {
lwsl_debug("%s: stdout is POLLHUP'd\n", __func__);
if (wsi->http2_substream)