diff options
Diffstat (limited to 'httpd/server.c')
| -rw-r--r-- | httpd/server.c | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/httpd/server.c b/httpd/server.c index 86d0dca..ffd6d30 100644 --- a/httpd/server.c +++ b/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.70 2015/07/16 16:29:25 florian Exp $ */ +/* $OpenBSD: server.c,v 1.74 2015/08/03 11:45:17 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -632,17 +632,9 @@ server_tls_writecb(int fd, short event, void *arg) } if (EVBUFFER_LENGTH(bufev->output)) { - if (clt->clt_buf == NULL) { - clt->clt_buflen = EVBUFFER_LENGTH(bufev->output); - if ((clt->clt_buf = malloc(clt->clt_buflen)) == NULL) { - what |= EVBUFFER_ERROR; - goto err; - } - bcopy(EVBUFFER_DATA(bufev->output), - clt->clt_buf, clt->clt_buflen); - } - ret = tls_write(clt->clt_tls_ctx, clt->clt_buf, - clt->clt_buflen, &len); + ret = tls_write(clt->clt_tls_ctx, + EVBUFFER_DATA(bufev->output), + EVBUFFER_LENGTH(bufev->output), &len); if (ret == TLS_READ_AGAIN || ret == TLS_WRITE_AGAIN) { goto retry; } else if (ret != 0) { @@ -651,11 +643,6 @@ server_tls_writecb(int fd, short event, void *arg) } evbuffer_drain(bufev->output, len); } - if (clt->clt_buf != NULL) { - free(clt->clt_buf); - clt->clt_buf = NULL; - clt->clt_buflen = 0; - } if (EVBUFFER_LENGTH(bufev->output) != 0) server_bufferevent_add(&bufev->ev_write, bufev->timeout_write); @@ -666,16 +653,10 @@ server_tls_writecb(int fd, short event, void *arg) return; retry: - if (clt->clt_buflen != 0) - server_bufferevent_add(&bufev->ev_write, bufev->timeout_write); + server_bufferevent_add(&bufev->ev_write, bufev->timeout_write); return; err: - if (clt->clt_buf != NULL) { - free(clt->clt_buf); - clt->clt_buf = NULL; - clt->clt_buflen = 0; - } (*bufev->errorcb)(bufev, what, bufev->cbarg); } @@ -747,8 +728,10 @@ server_write(struct bufferevent *bev, void *arg) bufferevent_enable(bev, EV_READ); - if (clt->clt_srvbev && !(clt->clt_srvbev->enabled & EV_READ)) + if (clt->clt_srvbev && clt->clt_srvbev_throttled) { bufferevent_enable(clt->clt_srvbev, EV_READ); + clt->clt_srvbev_throttled = 0; + } return; done: @@ -792,8 +775,10 @@ server_read(struct bufferevent *bev, void *arg) goto done; if (EVBUFFER_LENGTH(EVBUFFER_OUTPUT(clt->clt_bev)) > (size_t) - SERVER_MAX_PREFETCH * clt->clt_sndbufsiz) - bufferevent_disable(bev, EV_READ); + SERVER_MAX_PREFETCH * clt->clt_sndbufsiz) { + bufferevent_disable(clt->clt_srvbev, EV_READ); + clt->clt_srvbev_throttled = 1; + } return; done: |