From 002b75d0c9d57873be727adc20823e7ef23581fe Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 8 Oct 2013 14:03:33 +0200
Subject: [PATCH] Fixed some minor mistakes in progressive connectors.

---
 src/connectors/conn_http_progressive_flv.cpp |  4 ++--
 src/connectors/conn_http_progressive_mp4.cpp | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/connectors/conn_http_progressive_flv.cpp b/src/connectors/conn_http_progressive_flv.cpp
index 27200a2c..61dec82a 100644
--- a/src/connectors/conn_http_progressive_flv.cpp
+++ b/src/connectors/conn_http_progressive_flv.cpp
@@ -134,7 +134,7 @@ namespace Connector_HTTP {
         unsigned int now = Util::epoch();
         if (now != lastStats){
           lastStats = now;
-          ss.SendNow(conn.getStats("HTTP_Progressive").c_str());
+          ss.SendNow(conn.getStats("HTTP_Progressive_FLV").c_str());
         }
         if (ss.spool()){
           while (Strm.parsePacket(ss.Received())){
@@ -186,7 +186,7 @@ namespace Connector_HTTP {
       }
     }
     conn.close();
-    ss.SendNow(conn.getStats("HTTP_Dynamic").c_str());
+    ss.SendNow(conn.getStats("HTTP_Progressive_FLV").c_str());
     ss.close();
     return 0;
   } //Progressive_Connector main function
diff --git a/src/connectors/conn_http_progressive_mp4.cpp b/src/connectors/conn_http_progressive_mp4.cpp
index abeb0328..ea76dfd3 100644
--- a/src/connectors/conn_http_progressive_mp4.cpp
+++ b/src/connectors/conn_http_progressive_mp4.cpp
@@ -50,17 +50,7 @@ namespace Connector_HTTP {
       //Only attempt to parse input when not yet init'ed.
       if ( !inited){
         if (conn.Received().size() || conn.spool()){
-          //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 (HTTP_R.Read(conn)){
 #if DEBUG >= 5
             std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
@@ -195,7 +185,7 @@ namespace Connector_HTTP {
       }
     }
     conn.close();
-    ss.SendNow(conn.getStats("HTTP_Dynamic").c_str());
+    ss.SendNow(conn.getStats("HTTP_Progressive_MP4").c_str());
     ss.close();
     return 0;
   } //Progressive_Connector main function