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

Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop

Browse source
This commit is contained in:
winlin 2015-03-17 23:46:09 +08:00
commit 6855ab4c52
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1104,8 +1104,8 @@ int SrsHttpServer::hijack(SrsHttpMessage* request, ISrsHttpHandler** ph)
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// when handler not the root, we think the handler is ok. // when handler not the root, we think the handler is ok.
ISrsHttpHandler* h = ph? *ph : NULL; ISrsHttpHandler* h = *ph? *ph : NULL;
if (h->entry && h->entry->pattern != "/") { if (h && h->entry && h->entry->pattern != "/") {
return ret; return ret;
} }