From 1ae4cff4ba8129176c2d04e10d8b63000e4c4956 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <erik.zandvliet@ddvtech.com>
Date: Fri, 24 Jan 2014 09:05:40 +0100
Subject: [PATCH] Fixed a bug where filedescriptors were not properly closed in
 the master connector processes, thanks to Delian

---
 src/connectors/conn_http_dynamic.cpp         | 1 +
 src/connectors/conn_http_json.cpp            | 1 +
 src/connectors/conn_http_live.cpp            | 1 +
 src/connectors/conn_http_progressive_flv.cpp | 1 +
 src/connectors/conn_http_progressive_mp3.cpp | 1 +
 src/connectors/conn_http_progressive_mp4.cpp | 1 +
 src/connectors/conn_http_progressive_ogg.cpp | 1 +
 src/connectors/conn_http_smooth.cpp          | 1 +
 src/connectors/conn_http_srt.cpp             | 1 +
 src/connectors/conn_rtmp.cpp                 | 1 +
 src/connectors/conn_ts.cpp                   | 1 +
 11 files changed, 11 insertions(+)

diff --git a/src/connectors/conn_http_dynamic.cpp b/src/connectors/conn_http_dynamic.cpp
index 1055608a..25cf28f9 100644
--- a/src/connectors/conn_http_dynamic.cpp
+++ b/src/connectors/conn_http_dynamic.cpp
@@ -346,6 +346,7 @@ int main(int argc, char ** argv){
         #if DEBUG >= 3
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
         #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_json.cpp b/src/connectors/conn_http_json.cpp
index 37a512bd..8ff8bb55 100644
--- a/src/connectors/conn_http_json.cpp
+++ b/src/connectors/conn_http_json.cpp
@@ -224,6 +224,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_live.cpp b/src/connectors/conn_http_live.cpp
index 297a52d0..63c64797 100644
--- a/src/connectors/conn_http_live.cpp
+++ b/src/connectors/conn_http_live.cpp
@@ -367,6 +367,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_progressive_flv.cpp b/src/connectors/conn_http_progressive_flv.cpp
index c7b0f09e..40cb5cc0 100644
--- a/src/connectors/conn_http_progressive_flv.cpp
+++ b/src/connectors/conn_http_progressive_flv.cpp
@@ -232,6 +232,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_progressive_mp3.cpp b/src/connectors/conn_http_progressive_mp3.cpp
index 9d8d2dbf..bdcd0e93 100644
--- a/src/connectors/conn_http_progressive_mp3.cpp
+++ b/src/connectors/conn_http_progressive_mp3.cpp
@@ -198,6 +198,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_progressive_mp4.cpp b/src/connectors/conn_http_progressive_mp4.cpp
index 3e55945b..02d8fb15 100644
--- a/src/connectors/conn_http_progressive_mp4.cpp
+++ b/src/connectors/conn_http_progressive_mp4.cpp
@@ -205,6 +205,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_progressive_ogg.cpp b/src/connectors/conn_http_progressive_ogg.cpp
index 782fc105..b21f7d62 100644
--- a/src/connectors/conn_http_progressive_ogg.cpp
+++ b/src/connectors/conn_http_progressive_ogg.cpp
@@ -201,6 +201,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_smooth.cpp b/src/connectors/conn_http_smooth.cpp
index a5871b61..adbc0f1c 100644
--- a/src/connectors/conn_http_smooth.cpp
+++ b/src/connectors/conn_http_smooth.cpp
@@ -561,6 +561,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_http_srt.cpp b/src/connectors/conn_http_srt.cpp
index 51a72dd6..27759e28 100644
--- a/src/connectors/conn_http_srt.cpp
+++ b/src/connectors/conn_http_srt.cpp
@@ -237,6 +237,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_rtmp.cpp b/src/connectors/conn_rtmp.cpp
index 8992869a..6f4e96b6 100644
--- a/src/connectors/conn_rtmp.cpp
+++ b/src/connectors/conn_rtmp.cpp
@@ -712,6 +712,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected
diff --git a/src/connectors/conn_ts.cpp b/src/connectors/conn_ts.cpp
index f407ba13..23ee2f9a 100644
--- a/src/connectors/conn_ts.cpp
+++ b/src/connectors/conn_ts.cpp
@@ -223,6 +223,7 @@ int main(int argc, char ** argv){
 #if DEBUG >= 5
         fprintf(stderr, "Spawned new process %i for socket %i\n", (int)myid, S.getSocket());
 #endif
+        S.close();
       }
     }
   } //while connected