Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-01 15:42:27 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
52263457bf72763cb965fddff2defde1e0696fc3
52263457
1 parent
d28458d5
fix bug of no http-server feature
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
19 行增加
和
0 行删除
trunk/auto/options.sh
trunk/src/app/srs_app_http.hpp
trunk/src/app/srs_app_http_conn.cpp
trunk/src/app/srs_app_http_conn.hpp
trunk/src/app/srs_app_server.cpp
trunk/auto/options.sh
查看文件 @
5226345
...
...
@@ -34,6 +34,7 @@ SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12
SRS_PREFIX
=
/usr/local/srs
SRS_JOBS
=
1
SRS_STATIC
=
RESERVED
SRS_HTTP_PARSER
=
NO
# private internal
# dev, open all features for dev, no gperf/prof/arm.
SRS_DEV
=
NO
...
...
trunk/src/app/srs_app_http.hpp
查看文件 @
5226345
...
...
@@ -31,6 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_st.hpp>
#ifdef SRS_HTTP_PARSER
// http specification
namespace
srs
{
...
...
@@ -50,6 +52,8 @@ namespace srs
#define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
};
#endif
#ifdef SRS_HTTP_CALLBACK
class
SrsRequest
;
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
5226345
...
...
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_http_conn.hpp>
#ifdef SRS_HTTP_SERVER
#include <sstream>
using
namespace
std
;
...
...
@@ -254,3 +256,5 @@ int SrsHttpConn::on_body(http_parser* parser, const char* at, size_t length)
return
0
;
}
#endif
...
...
trunk/src/app/srs_app_http_conn.hpp
查看文件 @
5226345
...
...
@@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#ifdef SRS_HTTP_SERVER
#include <srs_app_st.hpp>
#include <srs_app_conn.hpp>
...
...
@@ -82,3 +84,5 @@ private:
};
#endif
#endif
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
5226345
...
...
@@ -440,7 +440,13 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
}
else
if
(
type
==
SrsListenerHttpApi
)
{
conn
=
new
SrsHttpApi
(
this
,
client_stfd
);
}
else
if
(
type
==
SrsListenerHttpStream
)
{
#ifdef SRS_HTTP_SERVER
conn
=
new
SrsHttpConn
(
this
,
client_stfd
);
#else
srs_warn
(
"close http client for server not support http-server"
);
srs_close_stfd
(
client_stfd
);
return
ret
;
#endif
}
else
{
// TODO: FIXME: handler others
}
...
...
请
注册
或
登录
后发表评论