From e71bc0cbc5c207c09bdd2c37bbf615024d7fca8a Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 17 Jan 2015 23:44:21 +0800 Subject: [PATCH] for bug #277, refine the http server. --- trunk/src/app/srs_app_http.cpp | 4 +++- trunk/src/core/srs_core.hpp | 1 - trunk/src/main/srs_main_server.cpp | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/trunk/src/app/srs_app_http.cpp b/trunk/src/app/srs_app_http.cpp index 8d0406c51..ff9a10f87 100644 --- a/trunk/src/app/srs_app_http.cpp +++ b/trunk/src/app/srs_app_http.cpp @@ -564,7 +564,9 @@ int SrsGoHttpServeMux::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r srs_assert(h); if ((ret = h->serve_http(w, r)) != ERROR_SUCCESS) { - srs_error("handler serve http failed. ret=%d", ret); + if (!srs_is_client_gracefully_close(ret)) { + srs_error("handler serve http failed. ret=%d", ret); + } return ret; } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index aabdfb6f7..24af1406f 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -48,7 +48,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt" #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" #define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/1.0release" -#define RTMP_SIG_SRS_HTTP_SERVER RTMP_SIG_SRS_URL"/wiki/v1_CN_HTTPServer#feature" #define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index fcb6c6eab..3b010bd55 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -154,10 +154,6 @@ void show_macro_features() void check_macro_features() { // for special features. -#ifdef SRS_AUTO_HTTP_SERVER - srs_warn("http server is dev feature, @see %s", RTMP_SIG_SRS_HTTP_SERVER); -#endif - #ifndef SRS_PERF_MERGED_READ srs_warn("MR(merged-read) is disabled, hurts read performance. @see %s", RTMP_SIG_SRS_ISSUES(241)); #endif