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
2fb3d5fd
Commit
2fb3d5fd
authored
Jan 06, 2015
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Remove Http2Upstream::deferred_ for now
parent
ba795d86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
src/shrpx_http2_upstream.cc
src/shrpx_http2_upstream.cc
+1
-9
src/shrpx_http2_upstream.h
src/shrpx_http2_upstream.h
+0
-3
No files found.
src/shrpx_http2_upstream.cc
View file @
2fb3d5fd
...
...
@@ -573,7 +573,7 @@ Http2Upstream::Http2Upstream(ClientHandler *handler)
:
0
,
!
get_config
()
->
http2_proxy
),
handler_
(
handler
),
session_
(
nullptr
),
data_pending_
(
nullptr
),
data_pendinglen_
(
0
)
,
deferred_
(
false
)
{
data_pendinglen_
(
0
)
{
int
rv
;
...
...
@@ -1008,12 +1008,6 @@ ssize_t downstream_data_read_callback(nghttp2_session *session,
}
if
(
nread
==
0
&&
((
*
data_flags
)
&
NGHTTP2_DATA_FLAG_EOF
)
==
0
)
{
// Higher priority stream is likely to be handled first and if it
// has no data to send, we'd better to break here, so that we have
// a chance to read another incoming data from backend to this
// stream.
upstream
->
set_deferred
(
true
);
return
NGHTTP2_ERR_DEFERRED
;
}
...
...
@@ -1333,8 +1327,6 @@ int Http2Upstream::on_downstream_reset() {
return
0
;
}
void
Http2Upstream
::
set_deferred
(
bool
f
)
{
deferred_
=
f
;
}
MemchunkPool4K
*
Http2Upstream
::
get_mcpool
()
{
return
&
mcpool_
;
}
}
// namespace shrpx
src/shrpx_http2_upstream.h
View file @
2fb3d5fd
...
...
@@ -97,8 +97,6 @@ public:
void
start_downstream
(
Downstream
*
downstream
);
void
initiate_downstream
(
std
::
unique_ptr
<
Downstream
>
downstream
);
void
set_deferred
(
bool
f
);
private:
// must be put before downstream_queue_
std
::
unique_ptr
<
HttpsUpstream
>
pre_upstream_
;
...
...
@@ -110,7 +108,6 @@ private:
const
uint8_t
*
data_pending_
;
size_t
data_pendinglen_
;
bool
flow_control_
;
bool
deferred_
;
};
}
// namespace shrpx
...
...
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