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 'tufang14-develop' into 2.0release

Browse source
This commit is contained in:
winlin 2015-03-17 23:46:25 +08:00
commit 9ed0da24d3
2 changed files with 5 additions and 4 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;
} }

5
trunk/src/core/srs_core.hpp
View file

@ -29,13 +29,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 0
#define VERSION_REVISION 143 #define VERSION_REVISION 143
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_CODE "ZhouGuowen" #define RTMP_SIG_SRS_CODE "OuXuli"
#define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_ROLE "origin/edge server"
#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)" #define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(Simple RTMP Server)"
#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server" #define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"