From 65f404fb425631a2662cee624e8f35c1518f62f0 Mon Sep 17 00:00:00 2001 From: "wenjie.zhao" Date: Fri, 13 Mar 2015 02:01:24 +0800 Subject: [PATCH] for #340, refine ts prefix code. --- trunk/conf/hls.conf | 1 - trunk/src/app/srs_app_config.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 0bbf13ad5..0263b7ea7 100644 --- a/trunk/conf/hls.conf +++ b/trunk/conf/hls.conf @@ -9,7 +9,6 @@ vhost __defaultVhost__ { enabled on; hls_fragment 10; hls_window 60; - # hls_entry_prefix http://127.0.0.1/; hls_path ./objs/nginx/html; } } diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index a5207afc4..a66a77258 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -3152,17 +3152,17 @@ string SrsConfig::get_hls_entry_prefix(string vhost) return ""; } - std::string hls_entry_prefix = conf->arg0(); - if (hls_entry_prefix.empty()) { + std::string prefix = conf->arg0(); + if (prefix.empty()) { return ""; } - char last_char = hls_entry_prefix[hls_entry_prefix.length() - 1]; - if (last_char != '/') { - hls_entry_prefix.append("/"); + const char last = prefix[prefix.length() - 1]; + if (last != '/') { + return prefix.append("/"); } - return hls_entry_prefix; + return prefix; } string SrsConfig::get_hls_path(string vhost)