From 0b80b40310779205625a7b586cf7e173051f05ed Mon Sep 17 00:00:00 2001
From: Abhisha Nirmalathas <a.nirmalathas1@student.unimelb.edu.au>
Date: Sun, 28 Apr 2019 11:11:32 +1000
Subject: [PATCH] final check 2

---
 http-server.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/http-server.c b/http-server.c
index 3525901..17528a2 100644
--- a/http-server.c
+++ b/http-server.c
@@ -41,14 +41,10 @@ static int const HTTP_400_LENGTH = 47;
 static char const * const HTTP_404 = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";
 static int const HTTP_404_LENGTH = 45;
 
-<<<<<<< http-server.c
 // global structures required for memory deallocation
 static Request* req;
 static User_list* user_list;
 int keep_alive = 1;
-=======
-volatile sig_atomic_t kill;
->>>>>>> http-server.c
 
 
 bool player_session(char* buff, int sockfd, char* file_name, char* response){
@@ -379,15 +375,10 @@ void exit_handler(int signum){
     /**
      * Closes TCP Connection
     */
-<<<<<<< http-server.c
     keep_alive = 0;
     if (user_list){
         free_users(user_list);
     }
-=======
-    kill = 1;
-    printf("keep alive changed");
->>>>>>> http-server.c
 }
 
 
-- 
GitLab