From 1ae9178605c5e5da8bc01177effdca72d1bc1bda Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 15 Apr 2014 11:19:15 +0800
Subject: [PATCH] add favicon.ico, change to 0.9.65

---
 trunk/auto/depends.sh                         |   4 +
 .../api-server/static-dir/favicon.ico         | Bin 0 -> 5430 bytes
 trunk/src/app/srs_app_http.cpp                |  86 +++++++++++-------
 trunk/src/app/srs_app_http.hpp                |   2 +
 trunk/src/app/srs_app_http_conn.cpp           |   2 +
 trunk/src/core/srs_core.hpp                   |   2 +-
 6 files changed, 64 insertions(+), 32 deletions(-)
 create mode 100644 trunk/research/api-server/static-dir/favicon.ico

diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index 4d7220586..e312cff9b 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -365,6 +365,10 @@ ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players &&
 rm -f ${SRS_OBJS}/nginx/crossdomain.xml &&
 ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml
 
+# for favicon.ico
+rm -rf ${SRS_OBJS}/nginx/html/favicon.ico &&
+ln -sf `pwd`/research/api-server/static-dir/favicon.ico ${SRS_OBJS}/nginx/html/favicon.ico
+
 # nginx.html to detect whether nginx is alive
 echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html
 
diff --git a/trunk/research/api-server/static-dir/favicon.ico b/trunk/research/api-server/static-dir/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..62fd6c026000902030df76745ef703c61e2d6a2e
GIT binary patch
literal 5430
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
Xo#DoF5*2X@WlyiY;p>UxL<;@}iABNn

literal 0
HcmV?d00001

diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp
index 5d4eb869f..638c70d25 100644
--- a/trunk/src/app/srs_app_http.cpp
+++ b/trunk/src/app/srs_app_http.cpp
@@ -116,7 +116,7 @@ int SrsHttpHandler::process_request(SrsSocket* skt, SrsHttpMessage* req)
     return do_process_request(skt, req);
 }
 
-bool SrsHttpHandler::is_handler_valid(SrsHttpMessage* req, int& status_code, std::string& reason_phrase) 
+bool SrsHttpHandler::is_handler_valid(SrsHttpMessage* req, int& status_code, string& reason_phrase) 
 {
     if (!req->match()->unmatched_url.empty()) {
         status_code = HTTP_NotFound;
@@ -203,83 +203,90 @@ int SrsHttpHandler::best_match(const char* path, int length, SrsHttpHandlerMatch
     return ret;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_status_line(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_status_line(stringstream& ss)
 {
     ss << "HTTP/1.1 200 OK " << __CRLF
        << "Server: SRS/"RTMP_SIG_SRS_VERSION"" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_status_line_error(std::stringstream& ss, int code, std::string reason_phrase)
+SrsHttpHandler* SrsHttpHandler::res_status_line_error(stringstream& ss, int code, string reason_phrase)
 {
     ss << "HTTP/1.1 " << code << " " << reason_phrase << __CRLF
        << "Server: SRS/"RTMP_SIG_SRS_VERSION"" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type(stringstream& ss)
 {
     ss << "Content-Type: text/html;charset=utf-8" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_xml(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_xml(stringstream& ss)
 {
     ss << "Content-Type: text/xml;charset=utf-8" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_javascript(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_javascript(stringstream& ss)
 {
-    ss << "Content-Type: text/javascript;charset=utf-8" << __CRLF
+    ss << "Content-Type: text/javascript" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_swf(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_swf(stringstream& ss)
 {
-    ss << "Content-Type: application/x-shockwave-flash;charset=utf-8" << __CRLF
+    ss << "Content-Type: application/x-shockwave-flash" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_css(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_css(stringstream& ss)
 {
     ss << "Content-Type: text/css;charset=utf-8" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_json(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_ico(stringstream& ss)
+{
+    ss << "Content-Type: image/x-icon" << __CRLF
+        << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
+    return this;
+}
+
+SrsHttpHandler* SrsHttpHandler::res_content_type_json(stringstream& ss)
 {
     ss << "Content-Type: application/json;charset=utf-8" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_m3u8(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_m3u8(stringstream& ss)
 {
     ss << "Content-Type: application/x-mpegURL;charset=utf-8" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_type_mpegts(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_content_type_mpegts(stringstream& ss)
 {
-    ss << "Content-Type: video/MP2T;charset=utf-8" << __CRLF
+    ss << "Content-Type: video/MP2T" << __CRLF
         << "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_content_length(std::stringstream& ss, int64_t length)
+SrsHttpHandler* SrsHttpHandler::res_content_length(stringstream& ss, int64_t length)
 {
     ss << "Content-Length: "<< length << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_enable_crossdomain(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_enable_crossdomain(stringstream& ss)
 {
     ss << "Access-Control-Allow-Origin: *" << __CRLF
         << "Access-Control-Allow-Methods: "
@@ -289,19 +296,19 @@ SrsHttpHandler* SrsHttpHandler::res_enable_crossdomain(std::stringstream& ss)
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_header_eof(std::stringstream& ss)
+SrsHttpHandler* SrsHttpHandler::res_header_eof(stringstream& ss)
 {
     ss << __CRLF;
     return this;
 }
 
-SrsHttpHandler* SrsHttpHandler::res_body(std::stringstream& ss, std::string body)
+SrsHttpHandler* SrsHttpHandler::res_body(stringstream& ss, string body)
 {
     ss << body;
     return this;
 }
 
-int SrsHttpHandler::res_flush(SrsSocket* skt, std::stringstream& ss)
+int SrsHttpHandler::res_flush(SrsSocket* skt, stringstream& ss)
 {
     return skt->write(ss.str().c_str(), ss.str().length(), NULL);
 }
@@ -317,7 +324,7 @@ int SrsHttpHandler::res_options(SrsSocket* skt)
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_text(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_text(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -334,7 +341,7 @@ int SrsHttpHandler::res_text(SrsSocket* skt, SrsHttpMessage* req, std::string bo
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_xml(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_xml(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -351,7 +358,7 @@ int SrsHttpHandler::res_xml(SrsSocket* skt, SrsHttpMessage* req, std::string bod
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_javascript(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_javascript(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -368,7 +375,7 @@ int SrsHttpHandler::res_javascript(SrsSocket* skt, SrsHttpMessage* req, std::str
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_swf(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_swf(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -385,7 +392,7 @@ int SrsHttpHandler::res_swf(SrsSocket* skt, SrsHttpMessage* req, std::string bod
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_css(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_css(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -402,7 +409,24 @@ int SrsHttpHandler::res_css(SrsSocket* skt, SrsHttpMessage* req, std::string bod
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_m3u8(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_ico(SrsSocket* skt, SrsHttpMessage* req, string body)
+{
+    std::stringstream ss;
+    
+    res_status_line(ss)->res_content_type_ico(ss)
+        ->res_content_length(ss, (int)body.length());
+        
+    if (req->requires_crossdomain()) {
+        res_enable_crossdomain(ss);
+    }
+    
+    res_header_eof(ss)
+        ->res_body(ss, body);
+    
+    return res_flush(skt, ss);
+}
+
+int SrsHttpHandler::res_m3u8(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -419,7 +443,7 @@ int SrsHttpHandler::res_m3u8(SrsSocket* skt, SrsHttpMessage* req, std::string bo
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_mpegts(SrsSocket* skt, SrsHttpMessage* req, std::string body)
+int SrsHttpHandler::res_mpegts(SrsSocket* skt, SrsHttpMessage* req, string body)
 {
     std::stringstream ss;
     
@@ -436,7 +460,7 @@ int SrsHttpHandler::res_mpegts(SrsSocket* skt, SrsHttpMessage* req, std::string
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_json(SrsSocket* skt, SrsHttpMessage* req, std::string json)
+int SrsHttpHandler::res_json(SrsSocket* skt, SrsHttpMessage* req, string json)
 {
     std::stringstream ss;
     
@@ -453,7 +477,7 @@ int SrsHttpHandler::res_json(SrsSocket* skt, SrsHttpMessage* req, std::string js
     return res_flush(skt, ss);
 }
 
-int SrsHttpHandler::res_error(SrsSocket* skt, SrsHttpMessage* req, int code, std::string reason_phrase, std::string body)
+int SrsHttpHandler::res_error(SrsSocket* skt, SrsHttpMessage* req, int code, string reason_phrase, string body)
 {
     std::stringstream ss;
 
@@ -577,7 +601,7 @@ bool SrsHttpMessage::requires_crossdomain()
     return _requires_crossdomain;
 }
 
-void SrsHttpMessage::set_url(std::string url)
+void SrsHttpMessage::set_url(string url)
 {
     _url = url;
 }
@@ -789,7 +813,7 @@ SrsHttpUri::~SrsHttpUri()
 {
 }
 
-int SrsHttpUri::initialize(std::string _url)
+int SrsHttpUri::initialize(string _url)
 {
     int ret = ERROR_SUCCESS;
     
@@ -856,7 +880,7 @@ const char* SrsHttpUri::get_query()
     return path.data();
 }
 
-std::string SrsHttpUri::get_uri_field(std::string uri, http_parser_url* hp_u, http_parser_url_fields field)
+string SrsHttpUri::get_uri_field(string uri, http_parser_url* hp_u, http_parser_url_fields field)
 {
     if((hp_u->field_set & (1 << field)) == 0){
         return "";
diff --git a/trunk/src/app/srs_app_http.hpp b/trunk/src/app/srs_app_http.hpp
index 47453994d..fdce5b179 100644
--- a/trunk/src/app/srs_app_http.hpp
+++ b/trunk/src/app/srs_app_http.hpp
@@ -237,6 +237,7 @@ public:
     virtual SrsHttpHandler* res_content_type_javascript(std::stringstream& ss);
     virtual SrsHttpHandler* res_content_type_swf(std::stringstream& ss);
     virtual SrsHttpHandler* res_content_type_css(std::stringstream& ss);
+    virtual SrsHttpHandler* res_content_type_ico(std::stringstream& ss);
     virtual SrsHttpHandler* res_content_type_json(std::stringstream& ss);
     virtual SrsHttpHandler* res_content_type_m3u8(std::stringstream& ss);
     virtual SrsHttpHandler* res_content_type_mpegts(std::stringstream& ss);
@@ -252,6 +253,7 @@ public:
     virtual int res_javascript(SrsSocket* skt, SrsHttpMessage* req, std::string body);
     virtual int res_swf(SrsSocket* skt, SrsHttpMessage* req, std::string body);
     virtual int res_css(SrsSocket* skt, SrsHttpMessage* req, std::string body);
+    virtual int res_ico(SrsSocket* skt, SrsHttpMessage* req, std::string body);
     virtual int res_m3u8(SrsSocket* skt, SrsHttpMessage* req, std::string body);
     virtual int res_mpegts(SrsSocket* skt, SrsHttpMessage* req, std::string body);
     virtual int res_json(SrsSocket* skt, SrsHttpMessage* req, std::string json);
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 0e9dd9200..c5fbfe7f7 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -202,6 +202,8 @@ int SrsHttpVhost::do_process_request(SrsSocket* skt, SrsHttpMessage* req)
         return res_swf(skt, req, str);
     } else if (srs_string_ends_with(fullpath, ".css")) {
         return res_css(skt, req, str);
+    } else if (srs_string_ends_with(fullpath, ".ico")) {
+        return res_ico(skt, req, str);
     } else {
         return res_text(skt, req, str);
     }
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 05fbe5777..f298b8908 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 "64"
+#define VERSION_REVISION "65"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"