commit f14af7a783a34ce50fcce0548e908412c898097508fb4eac0f7f7e908fc66e1a from: Stefan Sperling date: Wed Apr 16 10:04:41 2025 UTC make writes in fcgi_forward_response() time out to avoid gotwebd getting stuck commit - 8e2226e5c99d7f0968732dc3ea1489a0558ca7f3d8dec6ab5b4f5d94f0b2696f commit + f14af7a783a34ce50fcce0548e908412c898097508fb4eac0f7f7e908fc66e1a blob - 3925b07f4d20c6a9f281c5f83ab47b2030ba578a3cba643d2f5608f7992739f1 blob + cf4c9e00447ea17f4f7bf1b2c2209ac6d5f89d0e6ee596d66fc4f0dba7c95e95 --- gotwebd/fcgi.c +++ gotwebd/fcgi.c @@ -201,7 +201,7 @@ fcgi_forward_response(int fd, short event, void *arg) if (r == -1) { log_warn("read response"); } else { - err = got_poll_write_full(c->fd, outbuf, r); + err = got_poll_write_full_timeout(c->fd, outbuf, r, 1); if (err) { log_warnx("forward response: %s", err->msg); fcgi_cleanup_request(c); blob - 5770417b1aeb401935454cd441d8f56d5b3fee7633da2954c3897f815da046dc blob + f047312ad1bac521ea6dbcf208d2229e8aaf9e813fa3d391e9108ef57ec7de15 --- lib/got_lib_poll.h +++ lib/got_lib_poll.h @@ -20,3 +20,5 @@ const struct got_error *got_poll_read_full_timeout(int const struct got_error *got_poll_read_full(int, size_t *, void *, size_t, size_t); const struct got_error *got_poll_write_full(int, const void *, off_t); +const struct got_error *got_poll_write_full_timeout(int, const void *, off_t, + int); blob - ee9aa18cf67ced41ec51a385dfdc0c856f4c243572f4a5ed0ed469dbd1caa640 blob + d9090cca83c4636a38d8b14077a4b69e73e2093d48343232e11cda1ddbe396b1 --- lib/pollfd.c +++ lib/pollfd.c @@ -100,13 +100,19 @@ got_poll_read_full(int fd, size_t *len, void *buf, siz const struct got_error * got_poll_write_full(int fd, const void *buf, off_t len) { + return got_poll_write_full_timeout(fd, buf, len, INFTIM); +} + +const struct got_error * +got_poll_write_full_timeout(int fd, const void *buf, off_t len, int timeout) +{ const struct got_error *err = NULL; off_t wlen = 0; ssize_t w = 0; while (wlen != len) { if (wlen > 0) { - err = got_poll_fd(fd, POLLOUT, INFTIM); + err = got_poll_fd(fd, POLLOUT, timeout); if (err) return err; }