- Se sobreescribe el método Connection::finish() para que cierre el socket.

[z.facultad/75.42/plaqui.git] / Server / src / httpheaders.cpp

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index cef6d057a1273b91385b7278cce77553dd61c95d..0ec62e1e7301e87047a323e8786b61ffeea50f17 100644 (file)
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -26,13 +26,18 @@
 //
 
 #include "plaqui/server/httpheaders.h"
 //
 
 #include "plaqui/server/httpheaders.h"

+#include "plaqui/server/httperror.h"
+#include "plaqui/server/string.h"

 //#include <cstdlib>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 using namespace std;
 //#include <cstdlib>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 using namespace std;

-using namespace PlaQui::Server;
+
+namespace PlaQui {
+
+namespace Server {

 
 HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG
 
 HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG


@@ -40,7 +45,7 @@ HTTPHeaders::~HTTPHeaders(void) {
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-istream& operator>>(istream& is, HTTPHeaders& h) {
+istream& operator>>(istream& is, HTTPHeaders& h) throw(HTTPError) {

 #ifdef DEBUG
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG


@@ -50,9 +55,13 @@ istream& operator>>(istream& is, HTTPHeaders& h) {
        string::size_type pos = sbuf.find(":");
        if (pos == string::npos) {
                // FIXME poner mejores excepciones.
        string::size_type pos = sbuf.find(":");
        if (pos == string::npos) {
                // FIXME poner mejores excepciones.

-               throw "Wrong header";
+               throw HTTPError(400, 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__ << "    " << sbuf.substr(0, pos) << " = "
+               << h[sbuf.substr(0, pos)] << endl;
+#endif // DEBUG

        return is;
 }
 
        return is;
 }
 


@@ -62,8 +71,12 @@ ostream& operator<<(ostream& os, const HTTPHeaders& h) {
 #endif // DEBUG
        for (HTTPHeaders::const_iterator i = h.begin();
                        i != h.end(); ++i) {
 #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;
 }
 
        }
        return os;
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+