From 3b7c7332460acaaa6ff78581568eac7577f83879 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 1 Jun 2014 02:29:01 +0900 Subject: [PATCH] nghttpx: Fix typo --- src/shrpx.h | 2 +- src/shrpx_client_handler.cc | 4 ++-- src/shrpx_http2_session.cc | 2 +- src/shrpx_http_downstream_connection.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shrpx.h b/src/shrpx.h index e1fb27ca..89ab5993 100644 --- a/src/shrpx.h +++ b/src/shrpx.h @@ -36,6 +36,6 @@ #define DIE() \ assert(0); -#define SHRPX_READ_WARTER_MARK (64*1024) +#define SHRPX_READ_WATERMARK (64*1024) #endif // SHRPX_H diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc index 30a9f4c9..d7a11760 100644 --- a/src/shrpx_client_handler.cc +++ b/src/shrpx_client_handler.cc @@ -59,7 +59,7 @@ namespace { void upstream_writecb(bufferevent *bev, void *arg) { auto handler = static_cast(arg); - // We actually depend on write low-warter mark == 0. + // We actually depend on write low-water mark == 0. if(handler->get_outbuf_length() > 0) { // Possibly because of deferred callback, we may get this callback // when the output buffer is not empty. @@ -279,7 +279,7 @@ ClientHandler::ClientHandler(bufferevent *bev, } bufferevent_enable(bev_, EV_READ | EV_WRITE); - bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WARTER_MARK); + bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WATERMARK); set_upstream_timeouts(&get_config()->upstream_read_timeout, &get_config()->upstream_write_timeout); if(ssl_) { diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc index b0e6a878..5b60bb20 100644 --- a/src/shrpx_http2_session.cc +++ b/src/shrpx_http2_session.cc @@ -481,7 +481,7 @@ int Http2Session::initiate_connection() return SHRPX_ERR_NETWORK; } - bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WARTER_MARK); + bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WATERMARK); bufferevent_enable(bev_, EV_READ); bufferevent_setcb(bev_, readcb, writecb, eventcb, this); // Set timeout for HTTP2 session diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc index deb92757..db74c795 100644 --- a/src/shrpx_http_downstream_connection.cc +++ b/src/shrpx_http_downstream_connection.cc @@ -105,7 +105,7 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream) http_parser_init(&response_htp_, HTTP_RESPONSE); response_htp_.data = downstream_; - bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WARTER_MARK); + bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WATERMARK); bufferevent_enable(bev_, EV_READ); bufferevent_setcb(bev_, upstream->get_downstream_readcb(),