From 9e407d32fedeb94516671bb9f8d0aefe7afcb932 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 17 Mar 2015 07:58:38 +0800 Subject: [PATCH 1/2] change verstion to 3.0.0 --- trunk/src/core/srs_core.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index ccbe0dedb..7ebf289a6 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -29,9 +29,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // current release version -#define VERSION_MAJOR 2 +#define VERSION_MAJOR 3 #define VERSION_MINOR 0 -#define VERSION_REVISION 142 +#define VERSION_REVISION 0 // server info. #define RTMP_SIG_SRS_KEY "SRS" From 1cc3384a19b6653e9ed9eda913216dc4701d9611 Mon Sep 17 00:00:00 2001 From: tufang14 Date: Tue, 17 Mar 2015 17:45:20 +0800 Subject: [PATCH 2/2] seg fault seg fault --- trunk/src/app/srs_app_http_conn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index c3d26a4f0..45698d429 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -1104,8 +1104,8 @@ int SrsHttpServer::hijack(SrsHttpMessage* request, ISrsHttpHandler** ph) int ret = ERROR_SUCCESS; // when handler not the root, we think the handler is ok. - ISrsHttpHandler* h = ph? *ph : NULL; - if (h->entry && h->entry->pattern != "/") { + ISrsHttpHandler* h = *ph? *ph : NULL; + if (h && h->entry && h->entry->pattern != "/") { return ret; }