Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
1d1182ef
Commit
1d1182ef
authored
7 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支持gcc4.7~gcc4.9
parent
9cd016c9
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
16 行增加
和
16 行删除
+16
-16
src/Http/HttpClientImp.cpp
+6
-6
src/Http/HttpClientImp.h
+2
-2
src/Http/HttpsSession.h
+8
-8
没有找到文件。
src/Http/HttpClientImp.cpp
查看文件 @
1d1182ef
...
...
@@ -27,19 +27,19 @@ void HttpClientImp::sendRequest(const string& url) {
#else
_sslBox
.
reset
(
new
SSL_Box
(
false
));
_sslBox
->
setOnDecData
([
this
](
const
char
*
data
,
uint32_t
len
){
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
public_onRecvBytes
(
data
,
len
);
#else//
ANDROID
#else//
defined(__GNUC__) && (__GNUC__ < 5)
HttpClient
::
onRecvBytes
(
data
,
len
);
#endif//
ANDROID
#endif//
defined(__GNUC__) && (__GNUC__ < 5)
});
_sslBox
->
setOnEncData
([
this
](
const
char
*
data
,
uint32_t
len
){
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
public_send
(
data
,
len
);
#else//
ANDROID
#else//
defined(__GNUC__) && (__GNUC__ < 5)
HttpClient
::
send
(
data
,
len
);
#endif//
ANDROID
#endif//
defined(__GNUC__) && (__GNUC__ < 5)
});
#endif //ENABLE_OPENSSL
...
...
This diff is collapsed.
Click to expand it.
src/Http/HttpClientImp.h
查看文件 @
1d1182ef
...
...
@@ -24,14 +24,14 @@ public:
virtual
~
HttpClientImp
();
virtual
void
sendRequest
(
const
string
&
url
)
override
;
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
void
public_onRecvBytes
(
const
char
*
data
,
int
len
){
HttpClient
::
onRecvBytes
(
data
,
len
);
}
void
public_send
(
const
char
*
data
,
uint32_t
len
){
HttpClient
::
send
(
data
,
len
);
}
#endif //
ANDROID
#endif //
defined(__GNUC__) && (__GNUC__ < 5)
private
:
#ifdef ENABLE_OPENSSL
virtual
void
onRecvBytes
(
const
char
*
data
,
int
size
)
override
;
...
...
This diff is collapsed.
Click to expand it.
src/Http/HttpsSession.h
查看文件 @
1d1182ef
...
...
@@ -22,18 +22,18 @@ public:
HttpsSession
(
const
std
::
shared_ptr
<
ThreadPool
>
&
pTh
,
const
Socket
::
Ptr
&
pSock
)
:
HttpSession
(
pTh
,
pSock
){
m_sslBox
.
setOnEncData
([
&
](
const
char
*
data
,
uint32_t
len
){
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
public_send
(
data
,
len
);
#else//
ANDROID
#else//
defined(__GNUC__) && (__GNUC__ < 5)
HttpSession
::
send
(
data
,
len
);
#endif//
ANDROID
#endif//
defined(__GNUC__) && (__GNUC__ < 5)
});
m_sslBox
.
setOnDecData
([
&
](
const
char
*
data
,
uint32_t
len
){
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
public_onRecv
(
data
,
len
);
#else//
ANDROID
#else//
defined(__GNUC__) && (__GNUC__ < 5)
HttpSession
::
onRecv
(
data
,
len
);
#endif//
ANDROID
#endif//
defined(__GNUC__) && (__GNUC__ < 5)
});
}
virtual
~
HttpsSession
(){
...
...
@@ -43,14 +43,14 @@ public:
TimeTicker
();
m_sslBox
.
onRecv
(
pBuf
->
data
(),
pBuf
->
size
());
}
#if
def ANDROID
#if
defined(__GNUC__) && (__GNUC__ < 5)
int
public_send
(
const
char
*
data
,
uint32_t
len
){
return
HttpSession
::
send
(
data
,
len
);
}
void
public_onRecv
(
const
char
*
data
,
uint32_t
len
){
HttpSession
::
onRecv
(
data
,
len
);
}
#endif//
ANDROID
#endif//
defined(__GNUC__) && (__GNUC__ < 5)
private
:
virtual
int
send
(
const
string
&
buf
)
override
{
TimeTicker
();
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论