From 72c400af1abadfef944f66d6a81a199d1526d96c Mon Sep 17 00:00:00 2001
From: Manax <paul.ripault.etu@univ-lille.fr>
Date: Mon, 1 Mar 2021 16:36:05 +0100
Subject: [PATCH] fin tp5 ?

---
 webserver/client.c     |  14 +++++++++-----
 webserver/client.o     | Bin 3064 -> 3280 bytes
 webserver/makefile.dep |   2 +-
 webserver/pawnee       | Bin 18080 -> 18184 bytes
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/webserver/client.c b/webserver/client.c
index 19fffad..62184d0 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
GIT binary patch
delta 1060
zcmew%enE1A2Ga!2iCVJt0Un*TCpt@ycyxyD@aT3u;n8{g1p@;EL#OK(k6u;~%cIlv
zMR({Ik8al;9=)azk>fi+G*}^6ywmjoVI?;_x<g+;?6?NA#=xWXK&e1;?Gc7jE{|^4
z2OgcSKVEBs6~XNSThn>~tl-AP&BlBi>=+n2_r@Ij|G&F6=HSFHVIrX(y;BoFeBVDF
zy{!u#{Quv1ZgMzdAfw{sm5kC#{H<00|NlSk`Um7{k8alwFzdnIIC+?XVe$h;UnbR*
z$@)xSs*Y)z@gtC8M?QfzCTCtYrn@}s91ILH3=9l5AaMo;1|CKR1_qcsGdm*>JICaW
z9Fmh0m@hCsnrz78&uBe4kVTx)2~3uPNJ&oy1_mJpMh39iFf$k!7@|P3jEP_}15D<F
z$jJ_@5{xw<7GpD*>;RK}lM7khxN}nT7>WyuGV@B(CU0hqm12;FI*f&Zfq|QWf#J`8
z2vD6Y$R=)R4wYqMU|;~nD-V?K0;NH^Kw>amQIj3n#3y&KNk}#!so+I2chTfRHgU;S
zNV0rLvgal*WD}RXfh5b1B>QLbMK<wzW>63^Fff4Z7DSSjhl<18x(#ZI3RE1VUI<CO
z5mX$e{sdILIaC~^UKmNeBSd`iadtt;R0tdF22Lb3^^+&Ei%a$($%-P$&Y%2|UEFpx
zlB_tA>~SP<2_*5yNaB){MLCQaA5He;IM4WQvLvTD=K?l}vm+))a+)*hO`gc5J~@De
zW%3?Q5h(8mrv#G$(_|qoJ5FV0h+^5vfy}~_bGTHP9GE9><Pe*jz|1mv4TO7%%Z~BK
pWI=9w&KXeE1(PGW%{e)s7EJ}~UBj)ysR8mi0|P@MSVV`D2LR)|Fz^5X

delta 849
zcmca0`9pky2Gb6XiCVIu1|FTYH#$qNc=WO|FfcH9bh>^(Fkc{;4?Ma<KX`Pz-tg$W
z=Fxfl1z2(Gfl`6y+A9pDTpr!7FFZP3f4tTNshN0RjPb$5Z^nED@(c`}d*?j(|G&F+
z&V$M3jA6Wf-JyRxdRrGf`2WB2+T?|dffll0qai~39OOZcK$zcp-1QIGu5Q;4Fnf1^
z1Wq2FY{2BpWN1FQ9zvaCnr1W~B;&{@(8lD<%f>W|hn<6gL56{W!3HGGz`(%B$iTn=
zm;b}V&M|o+r_|&P%oiBvPi|!KXH1*CkVRb5ih+Sah=Gv-Y#dA*0|SFMNOtlCZkEYQ
zSVR~jK|IC;FqsM_b3x?f39J%~l^_;l{p63VZj;^EA|-{O4q#$nU;qX5pZ^dbJNY7;
zIHSg7Ms{&V`^gL0#0BHgR4$z?$SyD0jV8JR%AY#fkX>AICzJ;>eKVAQVDdzE@%lSZ
z9!z!{l>ZP)voJ6)2rw`(z})m6Dh^YB0?Pjar9tWik<|Y~5(oJcW{xx{uo)O8hjR!@
znnKtNFf(sM^*Bvd<Pet(h020V7C|yOadIPvxMVGotQeB))X5t;#3%pY&|sWDS&{QR
z<ATW_In6l**dRs=Og7{)XL`Umc_OFS<OVJc81n#x`HIVq=`zz~Ep9ue4@?j>+!`R}
uDsDSQg~>0u?KwS|AtpIYHsmqq>;Od@0|P_b<U$^E&HxUGT;k+HE_ndQhT{zY

diff --git a/webserver/makefile.dep b/webserver/makefile.dep
index 425baca..65ca8f9 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
GIT binary patch
delta 3280
zcmZ3`%h=J!I6*@2fgl4IIDkn8hK`Av%Q-)AL3ke~-qh#3%MRh(oh-<x&-sEG!h12<
zlTn{j0Lqh?+{oB2ct;T;2d5`XGTqjFG;iNcrq%B~j;&#HJO04gfwMs83=;zbgFFKR
z10w?i0~=UVBbbz*tjMg+^on6}zmX^tgVp3jW^u+oFj)g8OTlCqh@5<YS%PsPh{bpY
zOa_3-qhQh)L{4^Km0*kou^7E47qaS4-oPR;S;2v2atgBu;|j2N0hpWtCUwB%`pJT<
z`jaDAB^cYme9_4ZO~o1Q!R$;BIr##s#AF2)mdOW=geU)JRb?+OD9X$$Nt>+9ro&oN
zl#`k_*_ZA5WMy{g$pP#<lXcj6Cfl)dO-^8!kh}->BLl+=TL^;#LNOeeJds^ovOx&K
z{Q!*$nCyqi2idh5IVZnm7nc-(C;^in?7<W`{G=z#a)>j^Pd4RP&d4$OE=NBj|KwcG
z>ynZXC1COd)Lc+>N==UCQdYfzBq9q|10fzDiOX$n<dSCHB(RCGUP+&UAwz<Jf#GGs
zzyJULt4e|RARAr=fcZ*#3=C-#AVx4S7{2xFycp-v`N*UB$%lXtpI+8mtPBhuy}ZR>
z%C?)Cf#JXCHC+aVFZ}W@AQ{_-dLWAR7KpO^Q6lQm&ALvPfx)BoKndsn2U7g<4Isl0
zLurp*+l?TVy{4-sYYWM^v_h3~{C|)JHW8+<!M0G3fq|h^Kh&eyHcgj-fx)BmX$g-<
zw{4If1H%j5|NsBL$oT*N|1nn2$=yPV^#LB8wI@1Dk9c&3?(pb#J>k)L{6){-|NlE(
zzj*YrO7Vj9yT0fS{o>K>y2GQ_R01q=d<V#JFOvWL{|^@LbbWwO;)|@r0iooEM|bE8
zh#l8J)};RX|KGr)^+2gWbL|m^QZA2f*9RV*u0LLDf)(|ex<L$jVf*+0|JDOw1ve)5
zi%6Ku@-i?$T=4!6*abgM9uD>BeCpBoW`i9AL+9R@ga7|`w}MEIUejMZ3=EyeUxfUf
zd{0EG{uU1d!;8g#|Nr-BuKmDJD(2B^dlMuS@b~}!{h%!RqU`Vg|HobbfPDBm)T4K5
z0?07mKOViU3m*Lc-+2z?_URyRb-KRrXs&(1P$C2M*$0na)A>B0AcF=_^&hZNAY(nc
zT|anq9<P5f1L9;5=S9sQu+J1dx<fxe&EMxB4>sV107zZy0shvi|6oHv?tvQeV$1LU
z|G@zO^>_0dh0fYH-L7vsk9qXk8uGw`XV35d|6hxByZ!--Yw<8J$bq%JSn~V-|6O2b
z^_sHiFfi=@4@wwze<pK^sff(@4GNtf|4Vs1dTn2EGcddm`!m^5Oy0QlH^?O~7#J7?
zJbGIb{{R2K3+$@SWBWlR>x-km{{L@=>YESJcjWiv$zmGy&D;<#efkCVuCPb1Z3Rd=
z>DT}NJG2-W7+x#9F!}%gzelfaE=b(#*Z=?fC&)7}ya452u#4dyHR!Cp1GaS^$ocz0
zh3kt|zd;H1Pjl^`|KJF<0vV$E8y2BV-oGb56jC$z{1f6lP@J=alsp3212X0X$M66D
z(~i47U}ETYy~Dr#K<DunUw=+E7nZMYf%*xg=>``A!;8sqO*?=6|KIKUXCJ5n={)|z
z3Q6T5kjhNB%6^DSh`T{S)_MFz^e>R3e>B(rfH-<7NQ)U<OU$qT|6i2<@&qaR(p>um
zqNoF;NC>XT0%T?F7l!)9-L5}6kH7E-rI}va9FVFrKmPyU53=h8NPXIbN#Y`632F=s
zp&q@uAUfDb^QlMk8;%#ro3+H#I3_7@Ozu$dWl~L<d>ulmDejugp-_{=D9vo0z`(%3
z&A`Cm^6vltH4F?4U*7-!e}#d8f#t*h|23de^27iCZx|RDPJjIWpNElw;rgfl|8*D{
z7>qvu|L?=dz_9uA|Nl9R3=Gm={{Qb`WMG)`_5c4hj0_B4zW)FJg>kZ*k`iOX<V+=f
z)(LO_|KBiqu99+;#QXpMVbuc28!`+G3^5E03}4^>|NjUi;K(P?#^lV)#&nm5or8e^
zBoA`R_74yzFu>%Q*%?6!K=N}K7#J3RoNT2m#kPlmf#KfA$x+Huu6Gz180<g&|DS<k
zYBER@*i=wa(EjQF|8h`Lftd<Y3knbh1_l{M28IWdXDYih{@DCbnVoBL022r20cZ`^
zF!`gdKI4_iihA*k29q20<QerRFVwSVESUUIPhPMA>O)XE2bp+avY@^_<ATY7`tpnk
zn+x^R86~%YvK9ja!!algQU<~wCO<UT&uB1tp`rNX3x;CM91II4Uo;eFJTUp9p(ryK
zL&Ic7BX`CNlM{_ZnfVwVOinZsXS_1G(nwzt)?@*h0>jJ<LJSU*4;u9|zL*?nEYA32
za-gy3<T_&`LjkBqU@G|-7#Nrs_!u0}#6j&Lka)x7hhY6bjrAE1Ox83BXIwG4(Zrnb
z$>g0T<&1YG8=9&!{+JwTDzA7!9AYLYSV1gRMg|5U20n)6!XO?41JC4{rt+MgObiSP
z3=#}4CLc6)XW|o`%w?u$cob?mI3X}FFl>fu-7Esp8V#WsjxsVZ2rx)6{Ft0+28xB5
zX6lSzCSNoapWI+BA<51JvGBVnL^(Ku85kHuCm%EuXEXtkT<%N|6J9t>b~3kPtN{r!
zP6U&yz~r9E8_mTfPctzv2r@}9z#23V0~r`@OnzuCZulG|%OJ_{2in+Rfl9xFI-md=
z60uP6e;|`5cUVXmo(2`R43Z2Cj!-Em<qOpbYtm{%#nmQXv=BG6Vg@-{lHmu`KBy#v
z8#Bbi{ZJ2sQ#=C$gEvSQW9(!`OLxXuVD@@2c@RWOU1f&&4c)Yd%#fz*@5vJ_#TmsX
zAG8!_)C7~ZAae2t%Nb(HIhm<>C3?vWxrv#1ddUpM`N`R-C7b7288NaIgIkcB4_R+v
zgf%QTXV`vc+?-&qz{teFJh{n1PtX9;WM+WT`jZbj=nE!5GYpJ&n9S&?&$$39x?r-U
zqdDgRDDS}JN=I{ePJ`vRg2@LR>lrspc68F`ya3Hw7baIanZtVtu%P`o`Jj_N=M`ua
zU77sT$(`}$WJhOxPFO~|Gr7{)oYO%G63h;pcRIT>GQOD1=&H~80vZD^CR@6ibHYOK
z$K*;^d)6NY3=9mD3%P_RUvSmnk}!m5m*AYt<YvZcU<Kg@PIh!N=WMit@Yp9GbdU!C
Da3Kjp

delta 3072
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
GH+2Bs7M^$j

-- 
GitLab