diff --git a/webserver/client.c b/webserver/client.c index 19fffad1988ad98f733b3c66dbeb8f7cfbf35718..62184d07e2716fcca96376a2e5b000b8942f29a5 100644 --- a/webserver/client.c +++ b/webserver/client.c @@ -9,11 +9,14 @@ -char* testCorrect(char* str, int first){ - char* strRet; +char* testCorrect(char* str, int first, char* buf){ + int i = strlen(str); + char* strRet; char *correctStr = "GET / HTTP/1.1"; - char *incorrectStr = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 17\r\n\r\n400 Bad request"; - char *correctStr2 = "HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Length: 17\r\n\r\n200 OK"; + sprintf(buf,"HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: %d\r\n\r\n400 Bad request",i); + char *incorrectStr= buf; + sprintf(buf,"HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Length: %d\r\n\r\n200 OK", i); + char *correctStr2= buf; if(strstr(str,correctStr) == NULL && first == 0) { strRet=incorrectStr; //printf("---\n%s\n---",str); @@ -44,8 +47,9 @@ int traitementClient(int socket_client){ } //printf("test avant while\n"); int first = 0; + char buf[8000]; while(!feof(fd) && fgets(str,8000,fd) != NULL){ - char* resTest = testCorrect(str,first); + char* resTest = testCorrect(str,first, buf); if(resTest!=NULL)fprintf(fd,"<Notre Serveur> %s\n",resTest); first=1; fflush(fd); diff --git a/webserver/client.o b/webserver/client.o index 3c7aaca08ec00cfdfd7053bcff251547ae5502d8..1f8a5cf157b63df52b50307dcf065fa7e360212c 100644 Binary files a/webserver/client.o and b/webserver/client.o differ diff --git a/webserver/makefile.dep b/webserver/makefile.dep index 425baca1f824518a15ad49e5df95e4b928fb8b78..65ca8f947e1b16a662bdc5adbad0a1e111a810f6 100644 --- a/webserver/makefile.dep +++ b/webserver/makefile.dep @@ -1,3 +1,3 @@ -socket.o: socket.c socket.h client.h client.o: client.c socket.h client.h main.o: main.c socket.h +socket.o: socket.c socket.h client.h diff --git a/webserver/pawnee b/webserver/pawnee index 65c1d490681a32cb8646f454ae999aff9c33b416..98ddedb3240c1c49910a7cf5d9a4bfe25456e213 100755 Binary files a/webserver/pawnee and b/webserver/pawnee differ