SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-31 03:34:50 +00:00
parent 4b5c843641
commit fe0bbab526
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
22 changed files with 1045 additions and 594 deletions
Download patch file Download diff file Expand all files Collapse all files

12
usr.sbin/rpki-client/http.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: http.c,v 1.78 2023/06/28 17:36:09 op Exp $ */
/* $OpenBSD: http.c,v 1.80 2024/01/30 11:15:05 claudio Exp $ */
/*
* Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
* Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@ -1836,6 +1836,8 @@ http_close(struct http_connection *conn)
assert(conn->state == STATE_IDLE || conn->state == STATE_CLOSE);
conn->state = STATE_CLOSE;
LIST_REMOVE(conn, entry);
LIST_INSERT_HEAD(&active, conn, entry);
if (conn->tls != NULL) {
switch (tls_close(conn->tls)) {
@ -1985,6 +1987,8 @@ http_handle(struct http_connection *conn)
return http_close(conn);
case STATE_IDLE:
conn->state = STATE_RESPONSE_HEADER;
LIST_REMOVE(conn, entry);
LIST_INSERT_HEAD(&active, conn, entry);
return http_read(conn);
case STATE_FREE:
errx(1, "bad http state");
@ -2156,8 +2160,10 @@ proc_http(char *bind_addr, int fd)
LIST_FOREACH_SAFE(conn, &idle, entry, nc) {
if (conn->pfd != NULL && conn->pfd->revents != 0)
http_do(conn, http_handle);
else if (conn->idle_time <= now)
else if (conn->idle_time <= now) {
conn->io_time = 0;
http_do(conn, http_close);
}
if (conn->state == STATE_FREE)
http_free(conn);
@ -2168,7 +2174,7 @@ proc_http(char *bind_addr, int fd)
/* check if event is ready */
if (conn->pfd != NULL && conn->pfd->revents != 0)
http_do(conn, http_handle);
else if (conn->io_time <= now) {
else if (conn->io_time != 0 && conn->io_time <= now) {
conn->io_time = 0;
if (conn->state == STATE_CONNECT) {
warnx("%s: connect timeout",