From a143e957a68145eece4b5b60e0bf8bee0d0693cd Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Thu, 6 Nov 2003 06:16:15 +0000
Subject: [PATCH] Se corrigen algunos errores. Tengo un problema con la
 sobrecarga del operator>> (declarandolo como friend) que no logro resolver.

---
 Server/src/httpheaders.cpp | 28 ++++++++++++++-----------
 Server/src/httpmessage.cpp | 42 +++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index 67ec270..cef6d05 100644
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -31,34 +31,38 @@
 #	include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::HTTPHeaders::~HTTPHeaders(void) {
+using namespace std;
+using namespace PlaQui::Server;
+
+HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": destructor." << std::endl;
+	cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-istream& operator>>(std::istream& is, PlaQui::Server::httpheaders& h) {
+istream& operator>>(istream& is, HTTPHeaders& h) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator>>()" << std::endl;
+	cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
 	char buf[BUFSIZ];
 	is.getline(buf, BUFSIZ);
-	std::string sbuf = buf;
-	std::string::size_type pos = sbuf.find(":");
-	if (pos == std::string::npos) {
+	string sbuf = buf;
+	string::size_type pos = sbuf.find(":");
+	if (pos == string::npos) {
 		// FIXME poner mejores excepciones.
 		throw "Wrong header";
 	}
-	(*this)[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+	h[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
 	return is;
 }
 
-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPHeaders& h) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator<<()" << std::endl;
+	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	for (HTTPMessage::const_iterator i = begin(); i != end(); ++i) {
-		os << i->first << ": " << i->second << "\r\l";
+	for (HTTPHeaders::const_iterator i = h.begin();
+			i != h.end(); ++i) {
+		os << i->first << ": " << i->second << "\r\n";
 	}
 	return os;
 }
diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 2d3a18b..737f636 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -26,37 +26,41 @@
 //
 
 #include "plaqui/server/httpmessage.h"
+#include <sstream>
 #include <cstdlib>
 #ifdef DEBUG
 #	include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::HTTPMessage::~HTTPMessage(void) {
+using namespace std;
+using namespace PlaQui::Server;
+
+HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": destructor." << std::endl;
+	cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-		http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& version):
+		version(version) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+	cerr << __FILE__ << ": version = " << version << endl;
 #endif // DEBUG
 }
 
 /*
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
-		const std::string& http_version):
+HTTPMessage::HTTPMessage(const string& _body,
+		const string& http_version):
 		http_version(http_version) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": http_version = " << http_version
-		<< " | body = " << body << std::endl;
+	cerr << __FILE__ << ": http_version = " << http_version
+		<< " | body = " << body << endl;
 #endif // DEBUG
 	set_body(_body);
 }
 */
 
-void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
+void HTTPMessage::set_body(const string& _body) {
 	body = _body;
 	if (body.length()) {
 		stringstream ss; // TODO ver forma mas linda de convertir
@@ -65,30 +69,30 @@ void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
 	}
 }
 
-const std::string& PlaQui::Server::HTTPMessage::get_body(void) {
+const string& HTTPMessage::get_body(void) const {
 	return body;
 }
 
-istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
+istream& operator>>(istream& is, HTTPMessage& m) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator>>()" << std::endl;
+	cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
 	char buf[BUFSIZ];
 	bool is_header = true;
 	stringstream body_ss;
 	while (is.getline(buf, BUFSIZ)) {
-		std::string sbuf = buf;
+		string sbuf = buf;
 		if (sbuf.length())
 			if (is_header) {
 				istringstream(buf) >> m.headers;
 			} else {
-				body_ss << buf << std::endl;
+				body_ss << buf << endl;
 			}
 		} else {
 			if (is_header) {
 				is_header = false;
 			} else {
-				body_ss << buf << std::endl;
+				body_ss << buf << endl;
 			}
 		}
 	}
@@ -97,11 +101,11 @@ istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
 	return is;
 }
 
-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, HTTPMessage) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": operator<<()" << std::endl;
+	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	return os << headers << "\r\l" // Fin de cabeceras
+	return os << headers << "\r\n" // Fin de cabeceras
 		<< body;
 }
 
-- 
2.43.0