X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/a143e957a68145eece4b5b60e0bf8bee0d0693cd..289cd57714db01c97f3fa7cb65efedf30114919f:/Server/src/httpheaders.cpp

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index cef6d05..b54201e 100644
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -25,40 +25,58 @@
 // $Id$
 //
 
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpmessage.h"
 #include "plaqui/server/httpheaders.h"
+#include "plaqui/server/string.h"
 //#include <cstdlib>
 #ifdef DEBUG
 #	include <iostream>
 #endif // DEBUG
 
 using namespace std;
-using namespace PlaQui::Server;
+
+namespace PlaQui {
+
+namespace Server {
 
 HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": destructor." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": destructor." << endl;
 #endif // DEBUG
 }
 
-istream& operator>>(istream& is, HTTPHeaders& h) {
+istream& operator>>(istream& is, HTTPHeaders& h)
+		throw(HTTPError, sockerr, ios::failure) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": operator>>()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": operator>>()" << endl;
 #endif // DEBUG
 	char buf[BUFSIZ];
-	is.getline(buf, BUFSIZ);
+	// Fin del stream, no había cabeceras.
+	if (!is.getline(buf, BUFSIZ)) {
+		throw ios::failure("eof");
+	}
 	string sbuf = buf;
 	string::size_type pos = sbuf.find(":");
 	if (pos == string::npos) {
 		// FIXME poner mejores excepciones.
-		throw "Wrong header";
+		throw HTTPError(HTTPMessage::BAD_REQUEST, sbuf + ": No es una cabecera válida.");
 	}
-	h[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+	h[sbuf.substr(0, pos)] = String(sbuf.substr(pos + 1)).trim();
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< "    " << sbuf.substr(0, pos) << " = "
+		<< h[sbuf.substr(0, pos)] << endl;
+#endif // DEBUG
 	return is;
 }
 
-ostream& operator<<(ostream& os, const HTTPHeaders& h) {
+ostream& operator<<(ostream& os, const HTTPHeaders& h) throw(sockerr) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": operator<<()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": operator<<()" << endl;
 #endif // DEBUG
 	for (HTTPHeaders::const_iterator i = h.begin();
 			i != h.end(); ++i) {
@@ -67,3 +85,7 @@ ostream& operator<<(ostream& os, const HTTPHeaders& h) {
 	return os;
 }
 
+} // namespace Server
+
+} // namespace PlaQui
+