El Transmitter ya anda bien (se puede escuchar con un nc -p [puerto] -l -u :).

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

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index 65d5adcc2c9466ccf17f1ea6e8dc929eda77bba1..04bd6c823de5f41bf37a62d90f4d9380e7088415 100644 (file)
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -26,6 +26,7 @@
 //
 
 #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 "plaqui/server/string.h"
 //#include <cstdlib>
 #ifdef DEBUG


@@ -44,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


@@ -54,7 +55,7 @@ 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 string("Wrong header: ") + sbuf;
+               throw HTTPError(400, sbuf + ": No es una cabecera válida.");

        }
        h[sbuf.substr(0, pos)] = String(sbuf.substr(pos + 1)).trim();
 #ifdef DEBUG
        }
        h[sbuf.substr(0, pos)] = String(sbuf.substr(pos + 1)).trim();
 #ifdef DEBUG


@@ -70,7 +71,7 @@ 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 << "\n\r";
+               os << i->first << ": " << i->second << "\r\n";

        }
        return os;
 }
        }
        return os;
 }