Set kill_recv on stream end

2015-06-06 20:19:58 +01:00
parent 5a857fc6c5
commit c96e902472
1 changed files with 7 additions and 4 deletions
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -144,8 +144,8 @@ read_stream(void)
            log_println("RECV: </stream:stream>");
            log_println("--> Stream end callback fired");
            write_stream(STREAM_END);
-            _shutdown();
-            return 0;
+            log_println("STREAM END");
+            kill_recv = TRUE;
        }
        memset(buf, 0, sizeof(buf));
    }
@@ -380,8 +380,11 @@ server_send(char *stream)
 void
 server_stop(void)
 {
-    kill_recv = TRUE;
-    pthread_join(server_thread, NULL);
+    if (!kill_recv) {
+        log_println("SERVER STOP");
+        kill_recv = TRUE;
+        pthread_join(server_thread, NULL);
+    }
 }

 static void