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 #277, support http vhost mount.

Browse source
This commit is contained in:
winlin 2015-01-18 16:38:26 +08:00
parent 4513486266
commit 2742c0d3c2
5 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -287,8 +287,9 @@ int SrsGoHttpFileServer::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage*
string fullpath = dir + "/";
srs_assert(entry);
if (upath.length() > entry->pattern.length()) {
fullpath += upath.substr(entry->pattern.length());
size_t pos = entry->pattern.find("/");
if (upath.length() > entry->pattern.length() && pos != string::npos) {
fullpath += upath.substr(entry->pattern.length() - pos);
} else {
fullpath += upath;
}
@ -402,6 +403,7 @@ SrsGoHttpMuxEntry::~SrsGoHttpMuxEntry()
SrsGoHttpServeMux::SrsGoHttpServeMux()
{
hosts = false;
}
SrsGoHttpServeMux::~SrsGoHttpServeMux()
@ -442,6 +444,10 @@ int SrsGoHttpServeMux::handle(std::string pattern, ISrsGoHttpHandler* handler)
}
}
if (pattern.at(0) != '/') {
hosts = true;
}
if (true) {
SrsGoHttpMuxEntry* entry = new SrsGoHttpMuxEntry();
entry->explicit_match = true;
@ -538,6 +544,11 @@ int SrsGoHttpServeMux::match(SrsHttpMessage* r, ISrsGoHttpHandler** ph)
std::string path = r->path();
// Host-specific pattern takes precedence over generic ones
if (hosts) {
path = r->host() + path;
}
int nb_matched = 0;
ISrsGoHttpHandler* h = NULL;
@ -700,7 +711,8 @@ int SrsHttpMessage::initialize()
int ret = ERROR_SUCCESS;
// parse uri to schema/server:port/path?query
if ((ret = _uri->initialize(_url)) != ERROR_SUCCESS) {
std::string uri = "http://" + get_request_header("Host") + _url;
if ((ret = _uri->initialize(uri)) != ERROR_SUCCESS) {
return ret;
}
@ -822,7 +834,7 @@ string SrsHttpMessage::url()
string SrsHttpMessage::host()
{
return get_request_header("Host");
return _uri->get_host();
}
string SrsHttpMessage::path()

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

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

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

@ -165,12 +165,16 @@ int SrsHttpServer::initialize()
std::string mount = _srs_config->get_vhost_http_mount(vhost);
std::string dir = _srs_config->get_vhost_http_dir(vhost);
// replace the vhost variable
mount = srs_string_replace(mount, "[vhost]", vhost);
// the dir mount must always ends with "/"
if (mount != "/" && mount.rfind("/") != mount.length() - 1) {
mount += "/";
}
// mount the http of vhost.
if ((ret = mux.handle(mount, new SrsVodStream(dir))) != ERROR_SUCCESS) {
srs_error("http: mount dir=%s for vhost=%s failed. ret=%d", dir.c_str(), vhost.c_str(), ret);
return ret;