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

nghttpx: Clarify error_reply upstream method 

There is no application level failure in h1 upstream.  For h2, SPDY
upstreams, don't call DIE(), instead return -1 to delete handler.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-21 22:55:00 +09:00
parent 41e72064e0
commit e219d6a94f
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shrpx_http2_upstream.cc
View File

@ -1087,7 +1087,7 @@ int Http2Upstream::error_reply(Downstream *downstream,
if (rv < NGHTTP2_ERR_FATAL) { if (rv < NGHTTP2_ERR_FATAL) {
ULOG(FATAL, this) << "nghttp2_submit_response() failed: " ULOG(FATAL, this) << "nghttp2_submit_response() failed: "
<< nghttp2_strerror(rv); << nghttp2_strerror(rv);
DIE(); return -1;
} }
return 0; return 0;

24
src/shrpx_https_upstream.cc
View File

@ -309,9 +309,7 @@ int HttpsUpstream::on_read() {
handler->set_should_close_after_write(true); handler->set_should_close_after_write(true);
// Following paues_read is needed to avoid reading next data. // Following paues_read is needed to avoid reading next data.
pause_read(SHRPX_MSG_BLOCK); pause_read(SHRPX_MSG_BLOCK);
if (error_reply(503) != 0) { error_reply(503);
return -1;
}
handler_->signal_write(); handler_->signal_write();
// Downstream gets deleted after response body is read. // Downstream gets deleted after response body is read.
return 0; return 0;
@ -363,9 +361,7 @@ int HttpsUpstream::on_read() {
status_code = 400; status_code = 400;
} }
if (error_reply(status_code) != 0) { error_reply(status_code);
return -1;
}
handler_->signal_write(); handler_->signal_write();
@ -470,9 +466,7 @@ int HttpsUpstream::downstream_read(DownstreamConnection *dconn) {
if (downstream->get_response_state() == Downstream::MSG_BAD_HEADER) { if (downstream->get_response_state() == Downstream::MSG_BAD_HEADER) {
handler_->set_should_close_after_write(true); handler_->set_should_close_after_write(true);
if (error_reply(502) != 0) { error_reply(502);
return -1;
}
downstream->pop_downstream_connection(); downstream->pop_downstream_connection();
goto end; goto end;
} }
@ -539,9 +533,7 @@ int HttpsUpstream::downstream_eof(DownstreamConnection *dconn) {
DCLOG(INFO, dconn) << "Return error reply"; DCLOG(INFO, dconn) << "Return error reply";
} }
handler_->set_should_close_after_write(true); handler_->set_should_close_after_write(true);
if (error_reply(502) != 0) { error_reply(502);
return -1;
}
downstream->pop_downstream_connection(); downstream->pop_downstream_connection();
goto end; goto end;
} }
@ -576,9 +568,7 @@ int HttpsUpstream::downstream_error(DownstreamConnection *dconn, int events) {
} else { } else {
status = 502; status = 502;
} }
if (error_reply(status) != 0) { error_reply(status);
return -1;
}
downstream->pop_downstream_connection(); downstream->pop_downstream_connection();
@ -586,7 +576,7 @@ int HttpsUpstream::downstream_error(DownstreamConnection *dconn, int events) {
return 0; return 0;
} }
int HttpsUpstream::error_reply(unsigned int status_code) { void HttpsUpstream::error_reply(unsigned int status_code) {
auto html = http::create_error_html(status_code); auto html = http::create_error_html(status_code);
auto downstream = get_downstream(); auto downstream = get_downstream();
@ -616,8 +606,6 @@ int HttpsUpstream::error_reply(unsigned int status_code) {
downstream->add_response_sent_bodylen(html.size()); downstream->add_response_sent_bodylen(html.size());
downstream->set_response_state(Downstream::MSG_COMPLETE); downstream->set_response_state(Downstream::MSG_COMPLETE);
return 0;
} }
void HttpsUpstream::attach_downstream(std::unique_ptr<Downstream> downstream) { void HttpsUpstream::attach_downstream(std::unique_ptr<Downstream> downstream) {

2
src/shrpx_https_upstream.h
View File

@ -62,7 +62,7 @@ public:
void delete_downstream(); void delete_downstream();
Downstream *get_downstream() const; Downstream *get_downstream() const;
std::unique_ptr<Downstream> pop_downstream(); std::unique_ptr<Downstream> pop_downstream();
int error_reply(unsigned int status_code); void error_reply(unsigned int status_code);
virtual void pause_read(IOCtrlReason reason); virtual void pause_read(IOCtrlReason reason);
virtual int resume_read(IOCtrlReason reason, Downstream *downstream, virtual int resume_read(IOCtrlReason reason, Downstream *downstream,

2
src/shrpx_spdy_upstream.cc
View File

@ -782,7 +782,7 @@ int SpdyUpstream::error_reply(Downstream *downstream,
if (rv < SPDYLAY_ERR_FATAL) { if (rv < SPDYLAY_ERR_FATAL) {
ULOG(FATAL, this) << "spdylay_submit_response() failed: " ULOG(FATAL, this) << "spdylay_submit_response() failed: "
<< spdylay_strerror(rv); << spdylay_strerror(rv);
DIE(); return -1;
} }
return 0; return 0;