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

shrpx_http_downstream_connection: Embed http_parser

This commit is contained in:
Tatsuhiro Tsujikawa 2013-09-24 00:13:40 +09:00
parent 3c1cad9272
commit cdbe6acfce
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrpx_http_downstream_connection.cc
View File

@ -47,13 +47,11 @@ HttpDownstreamConnection::HttpDownstreamConnection
(ClientHandler *client_handler) (ClientHandler *client_handler)
: DownstreamConnection(client_handler), : DownstreamConnection(client_handler),
bev_(0), bev_(0),
ioctrl_(0), ioctrl_(0)
response_htp_(new http_parser())
{} {}
HttpDownstreamConnection::~HttpDownstreamConnection() HttpDownstreamConnection::~HttpDownstreamConnection()
{ {
delete response_htp_;
if(bev_) { if(bev_) {
bufferevent_disable(bev_, EV_READ | EV_WRITE); bufferevent_disable(bev_, EV_READ | EV_WRITE);
bufferevent_free(bev_); bufferevent_free(bev_);
@ -95,8 +93,8 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream)
ioctrl_.set_bev(bev_); ioctrl_.set_bev(bev_);
http_parser_init(response_htp_, HTTP_RESPONSE); http_parser_init(&response_htp_, HTTP_RESPONSE);
response_htp_->data = downstream_; response_htp_.data = downstream_;
bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WARTER_MARK); bufferevent_setwatermark(bev_, EV_READ, 0, SHRPX_READ_WARTER_MARK);
bufferevent_enable(bev_, EV_READ); bufferevent_enable(bev_, EV_READ);
@ -457,12 +455,12 @@ int HttpDownstreamConnection::on_read()
evbuffer_drain(input, inputlen); evbuffer_drain(input, inputlen);
return rv; return rv;
} }
size_t nread = http_parser_execute(response_htp_, &htp_hooks, size_t nread = http_parser_execute(&response_htp_, &htp_hooks,
reinterpret_cast<const char*>(mem), reinterpret_cast<const char*>(mem),
inputlen); inputlen);
evbuffer_drain(input, nread); evbuffer_drain(input, nread);
http_errno htperr = HTTP_PARSER_ERRNO(response_htp_); http_errno htperr = HTTP_PARSER_ERRNO(&response_htp_);
if(htperr == HPE_OK) { if(htperr == HPE_OK) {
return 0; return 0;
} else { } else {

2
src/shrpx_http_downstream_connection.h
View File

@ -63,7 +63,7 @@ public:
private: private:
bufferevent *bev_; bufferevent *bev_;
IOControl ioctrl_; IOControl ioctrl_;
http_parser *response_htp_; http_parser response_htp_;
}; };
} // namespace shrpx } // namespace shrpx