From 52263457bf72763cb965fddff2defde1e0696fc3 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 1 Apr 2014 15:42:27 +0800
Subject: [PATCH] fix bug of no http-server feature

---
 trunk/auto/options.sh               | 1 +
 trunk/src/app/srs_app_http.hpp      | 4 ++++
 trunk/src/app/srs_app_http_conn.cpp | 4 ++++
 trunk/src/app/srs_app_http_conn.hpp | 4 ++++
 trunk/src/app/srs_app_server.cpp    | 6 ++++++
 5 files changed, 19 insertions(+)

diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index 0576c1acf..1585a5351 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -34,6 +34,7 @@ SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12
 SRS_PREFIX=/usr/local/srs
 SRS_JOBS=1
 SRS_STATIC=RESERVED
+SRS_HTTP_PARSER=NO
 # private internal
 # dev, open all features for dev, no gperf/prof/arm.
 SRS_DEV=NO
diff --git a/trunk/src/app/srs_app_http.hpp b/trunk/src/app/srs_app_http.hpp
index b2def0155..b271ae0f2 100644
--- a/trunk/src/app/srs_app_http.hpp
+++ b/trunk/src/app/srs_app_http.hpp
@@ -31,6 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_app_st.hpp>
 
+#ifdef SRS_HTTP_PARSER
+
 // http specification
 namespace srs
 {
@@ -50,6 +52,8 @@ namespace srs
     #define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
 };
 
+#endif
+
 #ifdef SRS_HTTP_CALLBACK
 
 class SrsRequest;
diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 8930cba6b..796286399 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_app_http_conn.hpp>
 
+#ifdef SRS_HTTP_SERVER
+
 #include <sstream>
 using namespace std;
 
@@ -254,3 +256,5 @@ int SrsHttpConn::on_body(http_parser* parser, const char* at, size_t length)
 
     return 0;
 }
+
+#endif
diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp
index edd7e6ebf..910c0b7a3 100644
--- a/trunk/src/app/srs_app_http_conn.hpp
+++ b/trunk/src/app/srs_app_http_conn.hpp
@@ -30,6 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
+#ifdef SRS_HTTP_SERVER
+
 #include <srs_app_st.hpp>
 #include <srs_app_conn.hpp>
 
@@ -82,3 +84,5 @@ private:
 };
 
 #endif
+
+#endif
diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
index 518f0a211..cac7a9dc6 100644
--- a/trunk/src/app/srs_app_server.cpp
+++ b/trunk/src/app/srs_app_server.cpp
@@ -440,7 +440,13 @@ int SrsServer::accept_client(SrsListenerType type, st_netfd_t client_stfd)
     } else if (type == SrsListenerHttpApi) {
         conn = new SrsHttpApi(this, client_stfd);
     } else if (type == SrsListenerHttpStream) {
+#ifdef SRS_HTTP_SERVER
         conn = new SrsHttpConn(this, client_stfd);
+#else
+        srs_warn("close http client for server not support http-server");
+        srs_close_stfd(client_stfd);
+        return ret;
+#endif
     } else {
         // TODO: FIXME: handler others
     }