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

for bug #277, refine code, support default http vhost.

Browse source
This commit is contained in:
winlin 2015-01-18 17:01:39 +08:00
parent 2742c0d3c2
commit 398b212bfa
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/app/srs_app_http.cpp
View file

@ -286,6 +286,7 @@ int SrsGoHttpFileServer::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage*
string fullpath = dir + "/"; string fullpath = dir + "/";
// remove the virtual directory.
srs_assert(entry); srs_assert(entry);
size_t pos = entry->pattern.find("/"); size_t pos = entry->pattern.find("/");
if (upath.length() > entry->pattern.length() && pos != string::npos) { if (upath.length() > entry->pattern.length() && pos != string::npos) {
@ -296,6 +297,7 @@ int SrsGoHttpFileServer::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage*
srs_trace("http match file=%s, pattern=%s, upath=%s", srs_trace("http match file=%s, pattern=%s, upath=%s",
fullpath.c_str(), entry->pattern.c_str(), upath.c_str()); fullpath.c_str(), entry->pattern.c_str(), upath.c_str());
// handle file extension.
if (srs_string_ends_with(fullpath, ".flv") || srs_string_ends_with(fullpath, ".fhv")) { if (srs_string_ends_with(fullpath, ".flv") || srs_string_ends_with(fullpath, ".fhv")) {
std::string start = r->query_get("start"); std::string start = r->query_get("start");
if (start.empty()) { if (start.empty()) {
@ -403,7 +405,6 @@ SrsGoHttpMuxEntry::~SrsGoHttpMuxEntry()
SrsGoHttpServeMux::SrsGoHttpServeMux() SrsGoHttpServeMux::SrsGoHttpServeMux()
{ {
hosts = false;
} }
SrsGoHttpServeMux::~SrsGoHttpServeMux() SrsGoHttpServeMux::~SrsGoHttpServeMux()
@ -414,6 +415,8 @@ SrsGoHttpServeMux::~SrsGoHttpServeMux()
srs_freep(entry); srs_freep(entry);
} }
entries.clear(); entries.clear();
vhosts.clear();
} }
int SrsGoHttpServeMux::initialize() int SrsGoHttpServeMux::initialize()
@ -444,8 +447,12 @@ int SrsGoHttpServeMux::handle(std::string pattern, ISrsGoHttpHandler* handler)
} }
} }
std::string vhost = pattern;
if (pattern.at(0) != '/') { if (pattern.at(0) != '/') {
hosts = true; if (pattern.find("/") != string::npos) {
vhost = pattern.substr(0, pattern.find("/"));
}
vhosts[vhost] = handler;
} }
if (true) { if (true) {
@ -545,7 +552,7 @@ int SrsGoHttpServeMux::match(SrsHttpMessage* r, ISrsGoHttpHandler** ph)
std::string path = r->path(); std::string path = r->path();
// Host-specific pattern takes precedence over generic ones // Host-specific pattern takes precedence over generic ones
if (hosts) { if (!vhosts.empty() && vhosts.find(r->host()) != vhosts.end()) {
path = r->host() + path; path = r->host() + path;
} }

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

@ -266,8 +266,8 @@ class SrsGoHttpServeMux
{ {
private: private:
std::map<std::string, SrsGoHttpMuxEntry*> entries; std::map<std::string, SrsGoHttpMuxEntry*> entries;
// whether any patterns contain hostnames // the vhost handler.
bool hosts; std::map<std::string, ISrsGoHttpHandler*> vhosts;
public: public:
SrsGoHttpServeMux(); SrsGoHttpServeMux();
virtual ~SrsGoHttpServeMux(); virtual ~SrsGoHttpServeMux();