From: Leandro Lucarella <llucax@gmail.com>
Date: Fri, 7 Nov 2003 14:42:05 +0000 (+0000)
Subject: Se arreglan detalles, ya compila pero se cuelga cuando se conecta un cliente.
X-Git-Tag: svn_import~334
X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/d3ea2ff01c51df0df95cd23157267048e2c2fdcd?ds=inline

Se arreglan detalles, ya compila pero se cuelga cuando se conecta un cliente.
---

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 62764e6..656218c 100644
Binary files a/docs/cliente_servidor.dia and b/docs/cliente_servidor.dia differ