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
b75455dd
Commit
b75455dd
authored
Oct 30, 2013
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Remove recv data length calculation in HTTP/2 code
parent
6c23c34d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
26 deletions
+1
-26
src/shrpx_http2_upstream.cc
src/shrpx_http2_upstream.cc
+0
-4
src/shrpx_spdy_downstream_connection.cc
src/shrpx_spdy_downstream_connection.cc
+1
-14
src/shrpx_spdy_downstream_connection.h
src/shrpx_spdy_downstream_connection.h
+0
-4
src/shrpx_spdy_session.cc
src/shrpx_spdy_session.cc
+0
-4
No files found.
src/shrpx_http2_upstream.cc
View file @
b75455dd
...
...
@@ -307,9 +307,6 @@ int on_data_chunk_recv_callback(nghttp2_session *session,
upstream
->
rst_stream
(
downstream
,
NGHTTP2_INTERNAL_ERROR
);
return
0
;
}
if
(
upstream
->
get_flow_control
())
{
downstream
->
inc_recv_window_size
(
len
);
}
}
return
0
;
}
...
...
@@ -730,7 +727,6 @@ int Http2Upstream::window_update(Downstream *downstream,
rv
=
nghttp2_submit_window_update
(
session_
,
NGHTTP2_FLAG_NONE
,
downstream
->
get_stream_id
(),
window_size_increment
);
downstream
->
set_recv_window_size
(
0
);
if
(
rv
<
NGHTTP2_ERR_FATAL
)
{
ULOG
(
FATAL
,
this
)
<<
"nghttp2_submit_window_update() failed: "
<<
nghttp2_strerror
(
rv
);
...
...
src/shrpx_spdy_downstream_connection.cc
View file @
b75455dd
...
...
@@ -51,8 +51,7 @@ SpdyDownstreamConnection::SpdyDownstreamConnection
:
DownstreamConnection
(
client_handler
),
spdy_
(
client_handler
->
get_spdy_session
()),
request_body_buf_
(
0
),
sd_
(
0
),
recv_window_size_
(
0
)
sd_
(
0
)
{}
SpdyDownstreamConnection
::~
SpdyDownstreamConnection
()
...
...
@@ -112,7 +111,6 @@ int SpdyDownstreamConnection::attach_downstream(Downstream *downstream)
}
downstream
->
set_downstream_connection
(
this
);
downstream_
=
downstream
;
recv_window_size_
=
0
;
return
0
;
}
...
...
@@ -454,7 +452,6 @@ int SpdyDownstreamConnection::resume_read(IOCtrlReason reason)
return
-
1
;
}
spdy_
->
notify
();
recv_window_size_
=
0
;
}
}
return
0
;
...
...
@@ -509,14 +506,4 @@ bool SpdyDownstreamConnection::get_output_buffer_full()
}
}
int32_t
SpdyDownstreamConnection
::
get_recv_window_size
()
const
{
return
recv_window_size_
;
}
void
SpdyDownstreamConnection
::
inc_recv_window_size
(
int32_t
amount
)
{
recv_window_size_
+=
amount
;
}
}
// namespace shrpx
src/shrpx_spdy_downstream_connection.h
View file @
b75455dd
...
...
@@ -69,14 +69,10 @@ public:
StreamData
*
detach_stream_data
();
int
submit_rst_stream
(
Downstream
*
downstream
);
int32_t
get_recv_window_size
()
const
;
void
inc_recv_window_size
(
int32_t
amount
);
private:
SpdySession
*
spdy_
;
evbuffer
*
request_body_buf_
;
StreamData
*
sd_
;
int32_t
recv_window_size_
;
};
}
// namespace shrpx
...
...
src/shrpx_spdy_session.cc
View file @
b75455dd
...
...
@@ -935,10 +935,6 @@ int on_data_chunk_recv_callback(nghttp2_session *session,
return
0
;
}
if
(
spdy
->
get_flow_control
())
{
sd
->
dconn
->
inc_recv_window_size
(
len
);
}
auto
upstream
=
downstream
->
get_upstream
();
rv
=
upstream
->
on_downstream_body
(
downstream
,
data
,
len
);
if
(
rv
!=
0
)
{
...
...
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