From a58874178be375675733a949cfd5bf780771a3f0 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 1 May 2017 16:49:09 +0800
Subject: [PATCH] Fix merge build failed.

---
 trunk/src/app/srs_app_http_conn.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp
index 15a833b7c..2358ae86f 100644
--- a/trunk/src/app/srs_app_http_conn.cpp
+++ b/trunk/src/app/srs_app_http_conn.cpp
@@ -57,6 +57,7 @@ using namespace std;
 #include <srs_app_http_hooks.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_app_st.hpp>
 
 SrsHttpConn::SrsHttpConn(IConnectionManager* cm, st_netfd_t fd, ISrsHttpServeMux* m, string cip)
 : SrsConnection(cm, fd, cip)
@@ -216,7 +217,11 @@ int SrsResponseOnlyHttpConn::pop_message(ISrsHttpMessage** preq)
 {
     int ret = ERROR_SUCCESS;
     
-    SrsStSocket skt(stfd);
+    SrsStSocket skt;
+    
+    if ((ret = skt.initialize(stfd)) != ERROR_SUCCESS) {
+        return ret;
+    }
     
     if ((ret = parser->parse_message(&skt, this, preq)) != ERROR_SUCCESS) {
         return ret;