external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Fix merge build failed.

Browse source
This commit is contained in:
winlin 2017-05-01 16:49:09 +08:00
parent f97260be1d
commit a58874178b
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_http_conn.cpp
View file

@ -57,6 +57,7 @@ using namespace std;
#include <srs_app_http_hooks.hpp> #include <srs_app_http_hooks.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_app_utility.hpp> #include <srs_app_utility.hpp>
#include <srs_app_st.hpp>
SrsHttpConn::SrsHttpConn(IConnectionManager* cm, st_netfd_t fd, ISrsHttpServeMux* m, string cip) SrsHttpConn::SrsHttpConn(IConnectionManager* cm, st_netfd_t fd, ISrsHttpServeMux* m, string cip)
: SrsConnection(cm, fd, cip) : SrsConnection(cm, fd, cip)
@ -216,7 +217,11 @@ int SrsResponseOnlyHttpConn::pop_message(ISrsHttpMessage** preq)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
SrsStSocket skt(stfd); SrsStSocket skt;
if ((ret = skt.initialize(stfd)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = parser->parse_message(&skt, this, preq)) != ERROR_SUCCESS) { if ((ret = parser->parse_message(&skt, this, preq)) != ERROR_SUCCESS) {
return ret; return ret;