HTTP usage optimizes

src/connectors/conn_http.cpp

@@ -463,9 +463,8 @@ namespace Connector_HTTP {
     //wait for a response
     while (myCConn->conn->connected() && conn.connected()){
       conn.spool();
-      if (myCConn->conn->Received().size() || myCConn->conn->spool()){
         //check if the whole header was received
-        if (H.Read(*(myCConn->conn))){
+      if (myCConn->conn->spool() && H.Read(*(myCConn->conn))){
           //208 means the fragment is too new, retry in 3s
           if (H.url == "208"){
             while (myCConn->conn->Received().size() > 0){
@@ -489,7 +488,6 @@ namespace Connector_HTTP {
           }
           break; //continue down below this while loop
       }
-      }
       //keep trying unless the timeout triggers
       if (timeout++ > 4000){
         DEBUG_MSG(DLVL_HIGH, "Canceled connection %s, 4s timeout", uid.c_str());
@@ -632,8 +630,7 @@ namespace Connector_HTTP {
     conn.setBlocking(false); //do not block on conn.spool() when no data is available
     HTTP::Parser Client;
     while (conn.connected()){
-      if (conn.spool() || conn.Received().size()){
+        if (conn.spool() && Client.Read(conn)){
-        if (Client.Read(conn)){
           std::string handler = proxyGetHandleType(Client);
           DEBUG_MSG(DLVL_HIGH, "Received request: %s (%d) => %s (%s)", Client.getUrl().c_str(), conn.getSocket(), handler.c_str(), Client.GetVar("stream").c_str());
           #if DEBUG >= DLVL_HIGH
@@ -665,7 +662,6 @@ namespace Connector_HTTP {
             break;
           }
           Client.Clean(); //clean for any possible next requests
-        }
       }else{
         Util::sleep(10); //sleep 10ms
       }

src/connectors/conn_http_dynamic.cpp

@@ -163,8 +163,7 @@ namespace Connector_HTTP {
     
     while (conn.connected()){
       if ( !handlingRequest){
-        if (conn.spool() || conn.Received().size()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
             #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
             #endif
@@ -267,7 +266,6 @@ namespace Connector_HTTP {
               HTTP_S.SendResponse("200", "OK", conn);
             }
             HTTP_R.Clean(); //clean for any possible next requests
-          }
         }else{
           //sleep for 250ms before next attempt
           Util::sleep(250);

src/connectors/conn_http_json.cpp

@@ -44,18 +44,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          //make sure it ends in a \n
-          if ( *(conn.Received().get().rbegin()) != '\n'){
-            std::string tmp = conn.Received().get();
-            conn.Received().get().clear();
-            if (conn.Received().size()){
-              conn.Received().get().insert(0, tmp);
-            }else{
-              conn.Received().append(tmp);
-            }
-          }
-          if (HTTP_R.Read(conn.Received().get())){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -143,7 +132,6 @@ namespace Connector_HTTP {
           
           }
       }
-      }
       if (inited){
 
       unsigned int now = Util::epoch();

src/connectors/conn_http_live.cpp

@@ -128,8 +128,7 @@ namespace Connector_HTTP {
 
     while (conn.connected()){
       if ( !handlingRequest){
-        if (conn.spool() || conn.Received().size()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
   #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
   #endif
@@ -217,7 +216,6 @@ namespace Connector_HTTP {
             }
             ready4data = true;
             HTTP_R.Clean(); //clean for any possible next requests
-          }
         }else{
           Util::sleep(250);
         }

src/connectors/conn_http_progressive_flv.cpp

@@ -46,8 +46,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -81,7 +80,6 @@ namespace Connector_HTTP {
             HTTP_R.Clean(); //clean for any possible next requests
           }
       }
-      }
       if (ready4data){
         if ( !inited){
           //we are ready, connect the socket!

src/connectors/conn_http_progressive_mp3.cpp

@@ -45,8 +45,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -78,7 +77,6 @@ namespace Connector_HTTP {
             HTTP_R.Clean(); //clean for any possible next requests
           }
       }
-      }
       if (ready4data){
         if ( !inited){
           //we are ready, connect the socket!

src/connectors/conn_http_progressive_mp4.cpp

@@ -445,8 +445,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
             DEBUG_MSG(DLVL_DEVEL, "Received request: %s", HTTP_R.getUrl().c_str());
             conn.setHost(HTTP_R.GetHeader("X-Origin"));
             streamname = HTTP_R.GetHeader("X-Stream");
@@ -560,7 +559,6 @@ namespace Connector_HTTP {
             }
             inited = true;
         }
-        }
       }else{
         unsigned int now = Util::epoch();
         if (now != lastStats){

src/connectors/conn_http_progressive_ogg.cpp

@@ -53,8 +53,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -64,7 +63,6 @@ namespace Connector_HTTP {
             HTTP_R.Clean(); //clean for any possible next requests
         }
       }
-      }
       if (ready4data){
         if ( !inited){
           //we are ready, connect the socket!

src/connectors/conn_http_smooth.cpp

@@ -217,8 +217,7 @@ namespace Connector_HTTP {
 
     while (conn.connected()){
       if ( !handlingRequest){
-        if (conn.spool() || conn.Received().size()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
   #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
   #endif
@@ -443,8 +442,6 @@ namespace Connector_HTTP {
             ready4data = true;
             //Clean for any possible next requests
             HTTP_R.Clean();
-          }
-          
         }else{
           //Wait 250ms before checking for new data.
           Util::sleep(250);

src/connectors/conn_http_srt.cpp

@@ -47,8 +47,7 @@ namespace Connector_HTTP {
     while (conn.connected()){
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
-        if (conn.Received().size() || conn.spool()){
+        if (conn.spool() && HTTP_R.Read(conn)){
-          if (HTTP_R.Read(conn)){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -143,7 +142,6 @@ namespace Connector_HTTP {
             curIndex = 1;   // set to 1, first srt 'track'
           }
       }
-      }
 
       unsigned int now = Util::epoch();
       if (now != lastStats){