From b63f21944e5826e5b9c13158beb440a0c4fc62bb Mon Sep 17 00:00:00 2001 From: Neeserg Parajuli <n.parajuli@student.unimelb.edu.au> Date: Tue, 17 Apr 2018 09:27:18 +0000 Subject: [PATCH] server passes all the tests --- form_response.c | 6 +++--- server | Bin 14752 -> 14800 bytes test_log.txt | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/form_response.c b/form_response.c index b77caaf..c0b3a42 100644 --- a/form_response.c +++ b/form_response.c @@ -60,7 +60,7 @@ int sendresponse(int sockfd, struct GET_header* header){ strcpy(resphead.httpversion, header->httpversion); resphead.status = 404; formresponse(buffer, &resphead); - return send(sockfd, buffer, BUFFERSIZE, 0); + return send(sockfd, buffer, strlen(buffer), 0); } else{ @@ -74,10 +74,10 @@ int sendresponse(int sockfd, struct GET_header* header){ if(getfiletype(header->filepath, &resphead)!=0){ formresponse(buffer, &resphead); fclose(fp); - return send(sockfd, buffer, BUFFERSIZE, 0); + return send(sockfd, buffer,strlen(buffer), 0); } formresponse(buffer, &resphead); - if(send(sockfd, buffer, BUFFERSIZE, 0)<0){ + if(send(sockfd, buffer,strlen(buffer), 0)<0){ return -1; } while(!feof(fp)){ diff --git a/server b/server index b3ce87548f745b9c48c1b643b9813367ae78a383..66207235e8d64bc5162d48af204fdcdcbd9dca3d 100755 GIT binary patch delta 3828 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 b%fgOxf+EC84U-)$%{c{hAiPhL8!hDlC_eY^ delta 3750 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 diff --git a/test_log.txt b/test_log.txt index cd676f4..e69de29 100644 --- a/test_log.txt +++ b/test_log.txt @@ -1,8 +0,0 @@ -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -ERROR sending: Connection reset by peer -- GitLab