From ced050829edf404567e79fb6491fad76561dee40 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 4 Apr 2014 23:25:32 +0800
Subject: [PATCH] fix bug of http, change to 0.9.50

---
 trunk/src/app/srs_app_http_conn.cpp | 14 ++++++++++----
 trunk/src/core/srs_core.hpp         |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index c73c76306..6bacb64b1 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -132,8 +132,11 @@ bool SrsHttpVhost::can_handle(const char* path, int length, const char** /*pchil
 bool SrsHttpVhost::is_handler_valid(SrsHttpMessage* req, int& status_code, std::string& reason_phrase) 
 {
     std::string fullpath = _dir + "/" + req->match()->unmatched_url;
-    if (req->match()->unmatched_url.empty()) {
-        fullpath += req->match()->matched_url;
+    if (_mount == "/") {
+        fullpath = _dir + "/" + req->match()->matched_url;
+        if (!req->match()->unmatched_url.empty()) {
+            fullpath += "/" + req->match()->unmatched_url;
+        }
     }
     
     if (::access(fullpath.c_str(), F_OK | R_OK) < 0) {
@@ -152,8 +155,11 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
     int ret = ERROR_SUCCESS;
     
     std::string fullpath = _dir + "/" + req->match()->unmatched_url;
-    if (req->match()->unmatched_url.empty()) {
-        fullpath += req->match()->matched_url;
+    if (_mount == "/") {
+        fullpath = _dir + "/" + req->match()->matched_url;
+        if (!req->match()->unmatched_url.empty()) {
+            fullpath += "/" + req->match()->unmatched_url;
+        }
     }
     
     if (srs_string_ends_with(fullpath, "/")) {
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index a3a7ac604..1a822e632 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "49"
+#define VERSION_REVISION "50"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"