diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2015-08-03 11:45:18 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2015-08-03 11:45:18 +0000 |
| commit | 25fc07d7ed6f4133eaffc5864cc7ca5cf7059a05 (patch) | |
| tree | aa402d30f1e111a2ec0fcd253459f2a885f2e332 /usr.sbin/httpd/server_file.c | |
| parent | 59134890ad73a76a9330a52bd1c0408b60e3bc9e (diff) | |
Fix rev 1.70 of server.c by only re-enabling the bufferevent if we
previously disabled it because we were reading to fast (from disk).
Problem noted and tracked down to that commit by weerd@ and
independently by stsp@.
Tested by weerd@, stsp@, reyk@
OK bluhm@, reyk@
Diffstat (limited to 'usr.sbin/httpd/server_file.c')
| -rw-r--r-- | usr.sbin/httpd/server_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c index e79a5ce3527..e060124911b 100644 --- a/usr.sbin/httpd/server_file.c +++ b/usr.sbin/httpd/server_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server_file.c,v 1.59 2015/07/20 11:38:19 semarie Exp $ */ +/* $OpenBSD: server_file.c,v 1.60 2015/08/03 11:45:17 florian Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -262,6 +262,7 @@ server_file_request(struct httpd *env, struct client *clt, char *path, if (clt->clt_srvbev != NULL) bufferevent_free(clt->clt_srvbev); + clt->clt_srvbev_throttled = 0; clt->clt_srvbev = bufferevent_new(clt->clt_fd, server_read, server_write, server_file_error, clt); if (clt->clt_srvbev == NULL) { |