正在显示
3 个修改的文件
包含
3 行增加
和
6 行删除
| @@ -564,7 +564,9 @@ int SrsGoHttpServeMux::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r | @@ -564,7 +564,9 @@ int SrsGoHttpServeMux::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r | ||
| 564 | 564 | ||
| 565 | srs_assert(h); | 565 | srs_assert(h); |
| 566 | if ((ret = h->serve_http(w, r)) != ERROR_SUCCESS) { | 566 | if ((ret = h->serve_http(w, r)) != ERROR_SUCCESS) { |
| 567 | - srs_error("handler serve http failed. ret=%d", ret); | 567 | + if (!srs_is_client_gracefully_close(ret)) { |
| 568 | + srs_error("handler serve http failed. ret=%d", ret); | ||
| 569 | + } | ||
| 568 | return ret; | 570 | return ret; |
| 569 | } | 571 | } |
| 570 | 572 |
| @@ -48,7 +48,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -48,7 +48,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 48 | #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt" | 48 | #define RTMP_SIG_SRS_CONTRIBUTORS_URL RTMP_SIG_SRS_URL"/blob/master/AUTHORS.txt" |
| 49 | #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" | 49 | #define RTMP_SIG_SRS_HANDSHAKE RTMP_SIG_SRS_KEY"("RTMP_SIG_SRS_VERSION")" |
| 50 | #define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/1.0release" | 50 | #define RTMP_SIG_SRS_RELEASE RTMP_SIG_SRS_URL"/tree/1.0release" |
| 51 | -#define RTMP_SIG_SRS_HTTP_SERVER RTMP_SIG_SRS_URL"/wiki/v1_CN_HTTPServer#feature" | ||
| 52 | #define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id | 51 | #define RTMP_SIG_SRS_ISSUES(id) RTMP_SIG_SRS_URL"/issues/"#id |
| 53 | #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) | 52 | #define RTMP_SIG_SRS_VERSION __SRS_XSTR(VERSION_MAJOR)"."__SRS_XSTR(VERSION_MINOR)"."__SRS_XSTR(VERSION_REVISION) |
| 54 | 53 |
| @@ -154,10 +154,6 @@ void show_macro_features() | @@ -154,10 +154,6 @@ void show_macro_features() | ||
| 154 | void check_macro_features() | 154 | void check_macro_features() |
| 155 | { | 155 | { |
| 156 | // for special features. | 156 | // for special features. |
| 157 | -#ifdef SRS_AUTO_HTTP_SERVER | ||
| 158 | - srs_warn("http server is dev feature, @see %s", RTMP_SIG_SRS_HTTP_SERVER); | ||
| 159 | -#endif | ||
| 160 | - | ||
| 161 | #ifndef SRS_PERF_MERGED_READ | 157 | #ifndef SRS_PERF_MERGED_READ |
| 162 | srs_warn("MR(merged-read) is disabled, hurts read performance. @see %s", RTMP_SIG_SRS_ISSUES(241)); | 158 | srs_warn("MR(merged-read) is disabled, hurts read performance. @see %s", RTMP_SIG_SRS_ISSUES(241)); |
| 163 | #endif | 159 | #endif |
-
请 注册 或 登录 后发表评论