From c5bf3972956f41005347937e25e8244f15c57e1e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 10 Aug 2015 16:41:25 +0800
Subject: [PATCH] fix the http error header.

---
 trunk/src/app/srs_app_http_api.cpp  | 23 ++++++++++++++++++++++-
 trunk/src/app/srs_app_http_api.hpp  |  9 +++++++++
 trunk/src/app/srs_app_http_conn.cpp | 12 +++++++-----
 trunk/src/app/srs_app_server.cpp    | 15 ++++++++++++++-
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp
index c95cb9289..d23a21d26 100644
--- a/trunk/src/app/srs_app_http_api.cpp
+++ b/trunk/src/app/srs_app_http_api.cpp
@@ -109,7 +109,8 @@ int SrsGoApiV1::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
             << SRS_JFIELD_STR("authors", "the primary authors and contributors") << SRS_JFIELD_CONT
             << SRS_JFIELD_STR("requests", "the request itself, for http debug") << SRS_JFIELD_CONT
             << SRS_JFIELD_STR("vhosts", "dumps vhost to json") << SRS_JFIELD_CONT
-            << SRS_JFIELD_STR("streams", "dumps streams to json")
+            << SRS_JFIELD_STR("streams", "dumps streams to json") << SRS_JFIELD_CONT
+            << SRS_JFIELD_STR("errors", "always return an error 100.")
         << SRS_JOBJECT_END
         << SRS_JOBJECT_END;
     
@@ -474,6 +475,26 @@ int SrsGoApiStreams::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
     return srs_http_response_json(w, ss.str());
 }
 
+SrsGoApiError::SrsGoApiError()
+{
+}
+
+SrsGoApiError::~SrsGoApiError()
+{
+}
+
+int SrsGoApiError::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
+{
+    std::stringstream ss;
+    
+    ss << SRS_JOBJECT_START
+        << SRS_JFIELD_ERROR(100) << SRS_JFIELD_CONT
+        << SRS_JFIELD_STR("msg", "SRS demo error.")
+        << SRS_JOBJECT_END;
+    
+    return srs_http_response_json(w, ss.str());
+}
+
 SrsHttpApi::SrsHttpApi(IConnectionManager* cm, st_netfd_t fd, SrsHttpServeMux* m)
     : SrsConnection(cm, fd)
 {
diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp
index c5f4ed462..cdc5d0af0 100644
--- a/trunk/src/app/srs_app_http_api.hpp
+++ b/trunk/src/app/srs_app_http_api.hpp
@@ -159,6 +159,15 @@ public:
     virtual int serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
 };
 
+class SrsGoApiError : public ISrsHttpHandler
+{
+public:
+    SrsGoApiError();
+    virtual ~SrsGoApiError();
+public:
+    virtual int serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
+};
+
 class SrsHttpApi : public SrsConnection
 {
 private:
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 64e095be0..f29cc1dd2 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -102,13 +102,15 @@ int SrsHttpResponseWriter::write(char* data, int size)
 {
     int ret = ERROR_SUCCESS;
     
+    // write the header data in memory.
     if (!header_wrote) {
         write_header(SRS_CONSTS_HTTP_OK);
-        
-        if ((ret = send_header(data, size)) != ERROR_SUCCESS) {
-            srs_error("http: send header failed. ret=%d", ret);
-            return ret;
-        }
+    }
+    
+    // whatever header is wrote, we should try to send header.
+    if ((ret = send_header(data, size)) != ERROR_SUCCESS) {
+        srs_error("http: send header failed. ret=%d", ret);
+        return ret;
     }
     
     // check the bytes send and content length.
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
index 147dfbd17..939454583 100644
--- a/trunk/src/app/srs_app_server.cpp
+++ b/trunk/src/app/srs_app_server.cpp
@@ -770,7 +770,7 @@ int SrsServer::http_handle()
     
 #ifdef SRS_AUTO_HTTP_API
     srs_assert(http_api_mux);
-    if ((ret = http_api_mux->handle("/", new SrsGoApiRoot())) != ERROR_SUCCESS) {
+    if ((ret = http_api_mux->handle("/", new SrsHttpNotFoundHandler())) != ERROR_SUCCESS) {
         return ret;
     }
     if ((ret = http_api_mux->handle("/api", new SrsGoApiApi())) != ERROR_SUCCESS) {
@@ -809,6 +809,19 @@ int SrsServer::http_handle()
     if ((ret = http_api_mux->handle("/api/v1/streams", new SrsGoApiStreams())) != ERROR_SUCCESS) {
         return ret;
     }
+    // for error test which always response error code 100.
+    if ((ret = http_api_mux->handle("/api/v1/errors", new SrsGoApiError())) != ERROR_SUCCESS) {
+        return ret;
+    }
+    
+    // TODO: FIXME: for console.
+    // TODO: FIXME: support reload.
+    std::string dir = _srs_config->get_http_stream_dir() + "/srs-console";
+    if ((ret = http_api_mux->handle("/console/", new SrsHttpFileServer(dir))) != ERROR_SUCCESS) {
+        srs_error("http: mount console dir=%s failed. ret=%d", dir.c_str(), ret);
+        return ret;
+    }
+    srs_trace("http: console mount to %s", dir.c_str());
 #endif
 
     return ret;