Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
814fce4b
Commit
814fce4b
authored
Oct 10, 2018
by
gejun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename EndRemoteStream to OnEndStream
parent
189098f9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
http2_rpc_protocol.cpp
src/brpc/policy/http2_rpc_protocol.cpp
+5
-5
http2_rpc_protocol.h
src/brpc/policy/http2_rpc_protocol.h
+1
-1
No files found.
src/brpc/policy/http2_rpc_protocol.cpp
View file @
814fce4b
...
...
@@ -646,12 +646,12 @@ H2ParseResult H2StreamContext::OnHeaders(
return
MakeH2Error
(
H2_PROTOCOL_ERROR
);
}
if
(
frame_head
.
flags
&
H2_FLAGS_END_STREAM
)
{
return
EndRemote
Stream
();
return
OnEnd
Stream
();
}
return
MakeH2Message
(
NULL
);
}
else
{
if
(
frame_head
.
flags
&
H2_FLAGS_END_STREAM
)
{
// Delay calling
EndRemote
Stream() in OnContinuation()
// Delay calling
OnEnd
Stream() in OnContinuation()
_stream_ended
=
true
;
}
return
MakeH2Message
(
NULL
);
...
...
@@ -696,7 +696,7 @@ H2ParseResult H2StreamContext::OnContinuation(
return
MakeH2Error
(
H2_PROTOCOL_ERROR
);
}
if
(
_stream_ended
)
{
return
EndRemote
Stream
();
return
OnEnd
Stream
();
}
}
return
MakeH2Message
(
NULL
);
...
...
@@ -774,7 +774,7 @@ H2ParseResult H2StreamContext::OnData(
}
}
if
(
frame_head
.
flags
&
H2_FLAGS_END_STREAM
)
{
return
EndRemote
Stream
();
return
OnEnd
Stream
();
}
return
MakeH2Message
(
NULL
);
}
...
...
@@ -823,7 +823,7 @@ H2ParseResult H2StreamContext::OnResetStream(
}
}
H2ParseResult
H2StreamContext
::
EndRemote
Stream
()
{
H2ParseResult
H2StreamContext
::
OnEnd
Stream
()
{
#if defined(BRPC_H2_STREAM_STATE)
if
(
state
()
==
H2_STREAM_OPEN
)
{
SetState
(
H2_STREAM_HALF_CLOSED_REMOTE
);
...
...
src/brpc/policy/http2_rpc_protocol.h
View file @
814fce4b
...
...
@@ -235,7 +235,7 @@ public:
// does not need to complete.
// Returns 0 on success, -1 otherwise.
int
ConsumeHeaders
(
butil
::
IOBufBytesIterator
&
it
);
H2ParseResult
EndRemote
Stream
();
H2ParseResult
OnEnd
Stream
();
H2ParseResult
OnData
(
butil
::
IOBufBytesIterator
&
,
const
H2FrameHead
&
,
uint32_t
frag_size
,
uint8_t
pad_length
);
...
...
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