From d3ea2ff01c51df0df95cd23157267048e2c2fdcd Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Fri, 7 Nov 2003 14:42:05 +0000
Subject: [PATCH] Se arreglan detalles, ya compila pero se cuelga cuando se
 conecta un cliente.

---
 Constructor/Makefile                       |   2 +-
 Server/include/plaqui/server/httpmessage.h |   2 ++
 Server/src/controlserver.cpp               |  16 ++++++++--------
 Server/src/httpheaders.cpp                 |   2 +-
 Server/src/httpmessage.cpp                 |   2 +-
 Server/src/httprequest.cpp                 |   2 +-
 Server/src/httpresponse.cpp                |   2 +-
 Server/src/string.cpp                      |   4 ++--
 docs/cliente_servidor.dia                  | Bin 2851 -> 2648 bytes
 9 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Constructor/Makefile b/Constructor/Makefile
index 4347391..67d9350 100644
--- a/Constructor/Makefile
+++ b/Constructor/Makefile
@@ -3,7 +3,7 @@
 # $Id$
 #
 
-CXXFLAGS=-Wall -g `pkg-config --cflags libglademm-2.0`
+CXXFLAGS=-Wall -O2 `pkg-config --cflags libglademm-2.0`
 LDFLAGS=`pkg-config --libs libglademm-2.0`
 
 TARGETS=main
diff --git a/Server/include/plaqui/server/httpmessage.h b/Server/include/plaqui/server/httpmessage.h
index 33f546f..b188e19 100644
--- a/Server/include/plaqui/server/httpmessage.h
+++ b/Server/include/plaqui/server/httpmessage.h
@@ -50,6 +50,8 @@ namespace Server {
 			/// Version HTTP.
 			std::string version;
 
+		public:
+
 			/// Cabeceras HTTP.
 			HTTPHeaders headers;
 
diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 348d772..144d236 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -56,7 +56,7 @@ void ControlServer::real_run(void) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": real_run()" << endl;
 #endif // DEBUG
-	char buf[BUFSIZ];
+	//char buf[BUFSIZ];
 	while (!stop) {
 		HTTPRequest request;
 		socket >> request;
@@ -99,11 +99,11 @@ void ControlServer::real_run(void) {
 		// Command command = parse_command(request.uri);
 		//signal_command_received().emit(command);
 #ifdef DEBUG
-		cerr << "Request: " << endl;
-		for (Request::const_iterator i = request.begin(); i != request.end();
-				i++) {
-			cerr << "   " << i->first << ": " << i->second << endl;
-		}
+		cerr << "Request: " << request << endl;
+		//for (HTTPRequest::const_iterator i = request.begin();
+		//		i != request.end(); i++) {
+		//	cerr << "   " << i->first << ": " << i->second << endl;
+		//}
 #endif // DEBUG
 		// FIXME - hacer respuesta XML.
 		// La respuesta hay que mandarla asincrónicamente porque no puedo
@@ -127,8 +127,8 @@ Accept-Ranges: bytes
 		response_xml << "        <p>versión 0.2</p>" << endl;
 		response_xml << "        <h2>Pedido HTTP</h2>" << endl;
 		response_xml << "        <ul>" << endl;
-		for (Request::const_iterator i = request.begin(); i != request.end();
-				i++) {
+		for (HTTPHeaders::const_iterator i = request.headers.begin();
+				i != request.headers.end(); i++) {
 			response_xml << "           <li><b>" << i->first << ":</b> "
 				<< i->second << endl;
 		}
diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index 89d8de4..8ebb3a7 100644
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -66,7 +66,7 @@ ostream& operator<<(ostream& os, const HTTPHeaders& h) {
 #endif // DEBUG
 	for (HTTPHeaders::const_iterator i = h.begin();
 			i != h.end(); ++i) {
-		os << i->first << ": " << i->second << "\r\n";
+		os << i->first << ": " << i->second << "\n\r";
 	}
 	return os;
 }
diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 3a563cd..685fa69 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -110,7 +110,7 @@ ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	return os << m.headers << "\r\n" // Fin de cabeceras
+	return os << m.headers << "\n\r" // Fin de cabeceras
 		<< m.body;
 }
 
diff --git a/Server/src/httprequest.cpp b/Server/src/httprequest.cpp
index 2fb8661..ce9c5ab 100644
--- a/Server/src/httprequest.cpp
+++ b/Server/src/httprequest.cpp
@@ -155,7 +155,7 @@ ostream& operator<<(ostream& os, const HTTPRequest& req) {
 		os << "?" << req.query;
 	}
 	// TODO ver que este bien el \r\l
-	os << " HTTP/" << req.version << "\r\n" << static_cast<const HTTPMessage&>(req);
+	os << " HTTP/" << req.version << "\n\r" << static_cast<const HTTPMessage&>(req);
 	return os;
 }
 
diff --git a/Server/src/httpresponse.cpp b/Server/src/httpresponse.cpp
index 5a5b246..ab26bd3 100644
--- a/Server/src/httpresponse.cpp
+++ b/Server/src/httpresponse.cpp
@@ -128,7 +128,7 @@ ostream& operator<<(ostream& os, const HTTPResponse& resp) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	os << "HTTP/" << resp.version << " " << resp.status_code << " " << resp.reason << "\r\n";
+	os << "HTTP/" << resp.version << " " << resp.status_code << " " << resp.reason << "\n\r";
 	// TODO ver que este bien el \r\l
 	os << static_cast<const HTTPMessage&>(resp);
 	return os;
diff --git a/Server/src/string.cpp b/Server/src/string.cpp
index 15e783c..cd2eaad 100644
--- a/Server/src/string.cpp
+++ b/Server/src/string.cpp
@@ -54,12 +54,12 @@ String& String::trim(const String& clist) {
 }
 
 String& String::to_lower(void) {
-	transform(begin(), end(), begin(), tolower);
+	transform(begin(), end(), begin(), ::tolower);
 	return *this;
 }
 
 String& String::to_upper(void) {
-	transform(begin(), end(), begin(), toupper);
+	transform(begin(), end(), begin(), ::toupper);
 	return *this;
 }
 
diff --git a/docs/cliente_servidor.dia b/docs/cliente_servidor.dia
index 62764e6b024b63bff4b94b01e7003e1777cf9a81..656218c6d86a29bbdc197656987fcb72dc7cfd98 100644
GIT binary patch
literal 2648
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
G=l}pO{xDbo

literal 2851
zcmV+;3*7V{iwFP!000001MOX3Z{xTTf8S4Gcwg>-oGek2C2ux49CEn6+_l@i-M$os
zK}(FyTS-(UI$0M*zf(U$zgS7h|1B$`M91D_0>rRQYc!H(hVz>l4&VRyHI8}@B+DsF
zZu*vC_Io4=SV)uUP5<+!Uw-iWKi<B1A5#2I{7*9+_rwuNE<fG$XPl?+27|}PM<ZI~
zn6u1?=-kN3;6FHu@Id@%(7)Y2I>a28UtrENI+=6QOK?nX`V$;{nPzOBgv%oW7O|}N
zfTNrK+xz0LKe&BA*g3YEREkrQt*OK*%c&USi*#>n|2X-&9LmK=GQEBKlk>Jb<?@S0
z=jSobrZicS$_S3i%Rq*Y5NdiA6D?FCEmSfsRA@d<S;jL=`I6Fvv54TLBzBLZoHV7C
z2RITB<bWg7aGR32r<^k-Mg}_))$A<OjD|;KacgM*s7D&|+4yUh%PUDNx{!FFIh{mg
z%?C|*NyAd5uxLb~)%~5*kmSei@b=*Tk+bFK;0WuR;ivc-R9d(QFG#i|_6tiw*6%HE
zhcFS@d}V6b<PQ??CBvV8`?dE&?=Hf5-rv||VU=lk)BlTk<Vpkyp;@czOxflxj|}(9
zYW~0_p~++|G6BcQG$LzSjwI%|*S2X4-7C+q8WScFiN^uUlC|;ez-2+K5bp!wwk*R^
zA~Pd&I^zd)Tw~ajOvSA6ah@btJm(g3N6tw`m=uORnk{GviH%9ZyA#3_@oOAZTJ1uT
zn;PwTnr0-=$LoQ-`$Vv!$;8BtxzLyHG*?zjBbzId^<1jl%oWAuQ|`{<J<CYxfsG5_
ztHKX6i@(Mm%-W?pN>I(QOPFv(qVYXj3$=XPyT>t&7B~HvB`i;IK>EF$FQl0jhO<2K
zj?FVFY|lVV;1y2g`z_CvvS<;rES=Hd8LljlQ;U3i^jtX>vbnyh&UaAtgl%u*QVklO
zrR7N^#bZ;3Y4~j)xdxIu603pU?qfSf(CR1-o#}2r_3lh=%>5Cc@W6WSJDl@4TK}dw
z%FMYqAQ)%!<jfv}9xBDmL?g;qUO!3Zak~e5THi%!dZfvWWK?*>0U2-Ir_HrB#=-xb
zlWftMpF)$ydBE1Jw5OF~fn10Xq#C(i|E9TI3xO66zaBa4;8TnHF~1~t`U_nLxi->c
zwgJTZ<N8dJG@q}*AfbygNGksSllI7b5%y?sQYnA=0&c>L`-*1VkZ>H#^vI#SI8C#y
zv}-Wq)<3#?n$Ua(=IGlsM;1)D&4iqUI>kJv(*#E#>@fFg5%xxsL*g{TygMr^LK{xX
zbf9u-&{9ne4zDbvBQ59}BlpU(#Ot*+H2f>^g7l;XRXD6m37UrI>c|N?2I`O#ykkis
z?wojNkQIE%S;00bJV**cQcy=y(1)ZTBn2TUc&en}Q6RMbjY7(g1z!l)16m|4@t)xL
z1tdpw#Ok%7pth)^4W>9zZuw&TPC(lb>DCzO<}_t`r10;b?mqnc^Uojt0jcF@33P)+
z0*mw#Em9upbLT>m2VjmmdQ_JerA4YyTHBIKBeVo+ZL3(nQABE;p<#*lzA@Ajs#RpO
zE?Vm}UwKg%tQ~e*z#%+>-%0k+s&)-xwGgX?SS`eAAyx~qT8Py`toD!=O$eXN?;%)w
znZa6pf)lJG9l0LqiD=I8cbfpp_aH+M@V`*(0?{>yu4#;}$<8t7lfoAhSJU@EW-NyX
z0!#WXZ(guriNR}LVvvx>ad5#Y#!l%^Sjh_B5ab%a*(sPMTc&AzlEqLF;{etGti9r;
zP_}B49bF+)ONYc_Db%P~3S}F<dxemA)skRWVX?kFqOT*nj+&FHu!3cH3Km2`k{y!l
zkYtA>J0#g5$qro-8)Q@C7z-;Yye>i?poatiCjd@bfs>=$Uj7OV^)#0^C3F(R9QWEY
zZ1Hv^UiCDWSK_e-I}Hu{{Lo2&CZ4hA^%N(!133Vk05}0~0^kI|34jv-Cn)@Y!ViE-
zTA`Aw3YC0qP|4dsCCfIDMyTZLf=aIH&R{3ON*~KO5x^vXNdS`oCIL(Wm;^8hU=qM2
zfJp$8^unY+5dkQ0ME_N)+#y~XDyNn#!}i>wo46j(<QK#&0h*A3kU&tTVK&EO8J~>{
z?w)4#$f#c;tG!VH=IVwN>JlY~Ow6Kdece-vimY-=)u}L@&ulWc)>ZF+(VO8UTsobc
z6^-$Go6(#8aCPAohgi!)?A=4GEq&ZNZxg-vDbHCzk12(xtQ12-iV`wBE#<0$nj|)K
zuVw!x&lI0L1=6)TvBPQgpi?<mwvuWv_9C?+q**Co?dw2D5+3+P)xXTd{Lr1{cph<@
zMl{&?8eLq4EMt$IConvn3KYGW3cD<lg?m@43r!rA4))q<V6V}hy*Aq$>|^m>UwKV|
zt!YsKLYq|uNO%f57ZuogRu#C0a{=MrPZ>_~m~svgUx@fZ#1|sI5b=eGFGPGH;tLU9
zi1<Rp_n8V~M#?cQS7I7H>#yCS!+8mnEW^<Vl@z(G1xvnrG3yBKA{iP3xCC$s;1a+k
zfJ*?E04@Ps0=NWl3E<N67RXrUnJZ*0({RzMMh3Zt=UqyTjARBqH42q7=cttNwN=VI
ztss`Ff)oW*3NX38e#|T~ubz7?6lI8t6*#UQ-Pq={YN$%;rM5~1ts7HWZv;9~trNDo
zPPosg6X=pA4Pl_2i<vYeGw7*Nm^98YX^fsxLF{u*8jfKt=M3NQ&OKu|a>vh_5tuE`
zGFv#>l;K!L#!_zUWSdvW)>6ARD%L8aV#`@iCTGMqy0)BEVY03zuHftZ8_q&QCrHFV
zA_fvMkcfdq3?yP+_ja><Q^>A$+t957dDu7f#qT|vMp#VpI_2j>g#S9H@7{foltF@E
z=ULc!4f4gX^%`uw_U&xFcESw=VBa;^KH%)OX({1)1o0yg_pQ|)&tRX_?UV4ZGd^Bo
zzdXN42kIqnSPQ1<nfGbVIZHv_LEfRP^ps_#%8jaR-|%JG%uq)H*e;q?%OV{2+Lo!`
zD`YFwR@Bu%?C@DNR%V9}N4zITpa!Bt4FpoJfw1%yLHtZol7u7)7FEhHY*Pv0>1o?;
z*~PwANW5N4vc6&K(Sr?(jYs6}#PwrHQA^LJ2?FkrKX5N6|NAeFdix0fyYJ8JRD>CR
z93Sn=RhPb3D#F`WAV<B+p?9h-hnCky>l|aGr2<LN@d~vwrP>u$+^Ussb(*(ivtp!f
ztwP<{H=}vb-4MDPLU+TCmfBZeWHW4UsQ=8wbyrwu_3nm6BUV$7XCzy76x5ue!=W(I
z!Ur)mwK!B|v~~kfO^rL;=6LWcKN26_8anh}q*CoE+}}vn%V{rRf{8a}wP~kx=;>?f
zbd*h1i>_=1ZW*52JRYN?x>3ONX%bh>)$JqENA>-8p<p4-LZS4((xg)9l{@taXQ$}C
ztVii>!!uFQe|qGgV#O&MdA6iK^v&jFXF`U@!Y4T9qwVl~I40K*HHKm0c?Ie66dSnI
zxa_!y?{80HE!?mzBIAf8(+Vr4pdZ`Rs!d)Eu_m+L8sO`j!fF9NQeH$|b`<vwOAEvw
z$;oTDYN%ci))eg8X0v*%3d)aaM?8hAz95W$PZOHYUJbV2Z*JYhV>EY<aZk9y4k<6o
z7M9*r6TUi?vkV(aYGyHojO2WxY4zz2pOs^y>Hu1~F12>hLJ()}s2667IP>!@JVofN
zY9U-3R4Ro`g}4`>6-7#>W(YLm92$YtHKO<s;RVT-@5TQ#!}0B#{{wjzl#@;9000Cp
Bcdh^c

-- 
2.43.0