Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
ba31b990
Commit
ba31b990
authored
Jul 15, 2015
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Remove dead handling of Downstream::STREAM_CLOSED
parent
fc062976
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
50 deletions
+0
-50
src/shrpx_http2_upstream.cc
src/shrpx_http2_upstream.cc
+0
-25
src/shrpx_spdy_upstream.cc
src/shrpx_spdy_upstream.cc
+0
-25
No files found.
src/shrpx_http2_upstream.cc
View file @
ba31b990
...
...
@@ -884,16 +884,6 @@ ClientHandler *Http2Upstream::get_client_handler() const { return handler_; }
int
Http2Upstream
::
downstream_read
(
DownstreamConnection
*
dconn
)
{
auto
downstream
=
dconn
->
get_downstream
();
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
// If upstream HTTP2 stream was closed, we just close downstream,
// because there is no consumer now. Downstream connection is also
// closed in this case.
remove_downstream
(
downstream
);
// downstream was deleted
return
0
;
}
if
(
downstream
->
get_response_state
()
==
Downstream
::
MSG_RESET
)
{
// The downstream stream was reset (canceled). In this case,
// RST_STREAM to the upstream and delete downstream connection
...
...
@@ -959,14 +949,6 @@ int Http2Upstream::downstream_eof(DownstreamConnection *dconn) {
if
(
LOG_ENABLED
(
INFO
))
{
DCLOG
(
INFO
,
dconn
)
<<
"EOF. stream_id="
<<
downstream
->
get_stream_id
();
}
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
// If stream was closed already, we don't need to send reply at
// the first place. We can delete downstream.
remove_downstream
(
downstream
);
// downstream was deleted
return
0
;
}
// Delete downstream connection. If we don't delete it here, it will
// be pooled in on_stream_close_callback.
...
...
@@ -1012,13 +994,6 @@ int Http2Upstream::downstream_error(DownstreamConnection *dconn, int events) {
}
}
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
remove_downstream
(
downstream
);
// downstream was deleted
return
0
;
}
// Delete downstream connection. If we don't delete it here, it will
// be pooled in on_stream_close_callback.
downstream
->
pop_downstream_connection
();
...
...
src/shrpx_spdy_upstream.cc
View file @
ba31b990
...
...
@@ -560,16 +560,6 @@ ClientHandler *SpdyUpstream::get_client_handler() const { return handler_; }
int
SpdyUpstream
::
downstream_read
(
DownstreamConnection
*
dconn
)
{
auto
downstream
=
dconn
->
get_downstream
();
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
// If upstream SPDY stream was closed, we just close downstream,
// because there is no consumer now. Downstream connection is also
// closed in this case.
remove_downstream
(
downstream
);
// downstrea was deleted
return
0
;
}
if
(
downstream
->
get_response_state
()
==
Downstream
::
MSG_RESET
)
{
// The downstream stream was reset (canceled). In this case,
// RST_STREAM to the upstream and delete downstream connection
...
...
@@ -633,14 +623,6 @@ int SpdyUpstream::downstream_eof(DownstreamConnection *dconn) {
if
(
LOG_ENABLED
(
INFO
))
{
DCLOG
(
INFO
,
dconn
)
<<
"EOF. stream_id="
<<
downstream
->
get_stream_id
();
}
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
// If stream was closed already, we don't need to send reply at
// the first place. We can delete downstream.
remove_downstream
(
downstream
);
// downstream was deleted
return
0
;
}
// Delete downstream connection. If we don't delete it here, it will
// be pooled in on_stream_close_callback.
...
...
@@ -686,13 +668,6 @@ int SpdyUpstream::downstream_error(DownstreamConnection *dconn, int events) {
}
}
if
(
downstream
->
get_request_state
()
==
Downstream
::
STREAM_CLOSED
)
{
remove_downstream
(
downstream
);
// downstream was deleted
return
0
;
}
// Delete downstream connection. If we don't delete it here, it will
// be pooled in on_stream_close_callback.
downstream
->
pop_downstream_connection
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment