From 61c0c168b921763c7d5013329fb4d947ac6dd450 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 13 Jan 2016 12:52:19 +0800
Subject: [PATCH] merge from srs2.

---
 trunk/src/app/srs_app_http_api.cpp  | 1 +
 trunk/src/app/srs_app_http_conn.cpp | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp
index fa6188165..041c68d43 100644
--- a/trunk/src/app/srs_app_http_api.cpp
+++ b/trunk/src/app/srs_app_http_api.cpp
@@ -46,6 +46,7 @@ using namespace std;
 #include <srs_kernel_consts.hpp>
 #include <srs_app_server.hpp>
 #include <srs_protocol_amf0.hpp>
+#include <srs_protocol_utility.hpp>
 
 int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data)
 {
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index fceb1d58a..2ced26fa1 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -345,12 +345,6 @@ int SrsHttpResponseReader::read(char* data, int nb_data, int* nb_read)
         return ret;
     }
     
-    // for some server, content-length is -1, while not chunked, directly read
-    // everything as body.
-    if (owner->content_length() == -1 && !owner->is_chunked()) {
-        return read_specified(data, nb_data, nb_read);
-    }
-    
     // chunked encoding.
     if (owner->is_chunked()) {
         return read_chunked(data, nb_data, nb_read);