walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into http-parser-unknown-method

This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-28 22:49:30 +09:00
parent f90f40e3b5 f68dc02d6b
commit 7a84d51aaf
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shrpx_connection.cc
View File

@ -61,9 +61,6 @@ Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
: tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool)}, : tls{DefaultMemchunks(mcpool), DefaultPeekMemchunks(mcpool)},
wlimit(loop, &wev, write_limit.rate, write_limit.burst), wlimit(loop, &wev, write_limit.rate, write_limit.burst),
rlimit(loop, &rev, read_limit.rate, read_limit.burst, this), rlimit(loop, &rev, read_limit.rate, read_limit.burst, this),
writecb(writecb),
readcb(readcb),
timeoutcb(timeoutcb),
loop(loop), loop(loop),
data(data), data(data),
fd(fd), fd(fd),

3
src/shrpx_connection.h
View File

@ -125,9 +125,6 @@ struct Connection {
ev_timer rt; ev_timer rt;
RateLimit wlimit; RateLimit wlimit;
RateLimit rlimit; RateLimit rlimit;
IOCb writecb;
IOCb readcb;
TimerCb timeoutcb;
struct ev_loop *loop; struct ev_loop *loop;
void *data; void *data;
int fd; int fd;

6
src/shrpx_http_downstream_connection.cc
View File

@ -957,7 +957,8 @@ int HttpDownstreamConnection::tls_handshake() {
connect_blocker->on_success(); connect_blocker->on_success();
conn_.timeoutcb = timeoutcb; ev_set_cb(&conn_.rt, timeoutcb);
ev_set_cb(&conn_.wt, timeoutcb);
do_read_ = &HttpDownstreamConnection::read_tls; do_read_ = &HttpDownstreamConnection::read_tls;
do_write_ = &HttpDownstreamConnection::write_tls; do_write_ = &HttpDownstreamConnection::write_tls;
@ -1136,7 +1137,8 @@ int HttpDownstreamConnection::connected() {
connect_blocker->on_success(); connect_blocker->on_success();
conn_.timeoutcb = timeoutcb; ev_set_cb(&conn_.rt, timeoutcb);
ev_set_cb(&conn_.wt, timeoutcb);
do_read_ = &HttpDownstreamConnection::read_clear; do_read_ = &HttpDownstreamConnection::read_clear;
do_write_ = &HttpDownstreamConnection::write_clear; do_write_ = &HttpDownstreamConnection::write_clear;