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 bug of no http-server feature

Browse source
This commit is contained in:
winlin 2014-04-01 15:42:27 +08:00
parent d28458d5fa
commit 52263457bf
5 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/auto/options.sh
View file

@ -34,6 +34,7 @@ SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12
SRS_PREFIX=/usr/local/srs SRS_PREFIX=/usr/local/srs
SRS_JOBS=1 SRS_JOBS=1
SRS_STATIC=RESERVED SRS_STATIC=RESERVED
SRS_HTTP_PARSER=NO
# private internal # private internal
# dev, open all features for dev, no gperf/prof/arm. # dev, open all features for dev, no gperf/prof/arm.
SRS_DEV=NO SRS_DEV=NO

4
trunk/src/app/srs_app_http.hpp
View file

@ -31,6 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#ifdef SRS_HTTP_PARSER
// http specification // http specification
namespace srs namespace srs
{ {
@ -50,6 +52,8 @@ namespace srs
#define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A #define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
}; };
#endif
#ifdef SRS_HTTP_CALLBACK #ifdef SRS_HTTP_CALLBACK
class SrsRequest; class SrsRequest;

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

@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_http_conn.hpp> #include <srs_app_http_conn.hpp>
#ifdef SRS_HTTP_SERVER
#include <sstream> #include <sstream>
using namespace std; using namespace std;
@ -254,3 +256,5 @@ int SrsHttpConn::on_body(http_parser* parser, const char* at, size_t length)
return 0; return 0;
} }
#endif

4
trunk/src/app/srs_app_http_conn.hpp
View file

@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#ifdef SRS_HTTP_SERVER
#include <srs_app_st.hpp> #include <srs_app_st.hpp>
#include <srs_app_conn.hpp> #include <srs_app_conn.hpp>
@ -82,3 +84,5 @@ private:
}; };
#endif #endif
#endif

6
trunk/src/app/srs_app_server.cpp
View file

@ -440,7 +440,13 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
} else if (type == SrsListenerHttpApi) { } else if (type == SrsListenerHttpApi) {
conn = new SrsHttpApi(this, client_stfd); conn = new SrsHttpApi(this, client_stfd);
} else if (type == SrsListenerHttpStream) { } else if (type == SrsListenerHttpStream) {
#ifdef SRS_HTTP_SERVER
conn = new SrsHttpConn(this, client_stfd); 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 { } else {
// TODO: FIXME: handler others // TODO: FIXME: handler others
} }