sofa-pbrpc cookie #81
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
plugin不要放到sample中 用户无法使用 按照之前zuoyan建议 最好增加lite版和full版的rpc库 |
| @@ -167,6 +173,20 @@ ReadBufferPtr BinaryRpcRequest::AssembleSucceedResponse( | |||
| } | |||
| header.data_size = write_buffer.ByteCount() - header_pos - header_size - header.meta_size; | |||
| header.message_size = header.meta_size + header.data_size; | |||
|
|
|||
| std::string response_attach_str = cntl->GetResponseAttachBuffer()->ToString(); | |||
| size_t attach_size = response_attach_str.size(); | |||
|
冲突了 |
|
merge一下吧 |
| @@ -103,6 +103,16 @@ bool ReadBuffer::Next(const void** data, int* size) | |||
| } | |||
| } | |||
|
|
|||
| char* ReadBuffer::CurrentHandle() | |||
| } // namespace io | ||
| } // namespace sofa | ||
|
|
||
| void sofa_touch_sofa_io_serializer() |
|
@qinzuoyan 辛苦左言看下还有问题吗？是否可以merge，多谢哈！ |
|
好，辛苦，我找时间看看 |
|
这个没问题的话 就合入了？ @qinzuoyan @bluebore |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.