Se emprolija un poco:

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

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index 04bd6c823de5f41bf37a62d90f4d9380e7088415..b54201e6dc7daf862c2e16feba675974a103ae81 100644 (file)
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -25,8 +25,9 @@
 // $Id$
 //
 
 // $Id$
 //
 

-#include "plaqui/server/httpheaders.h"

 #include "plaqui/server/httperror.h"
 #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 "plaqui/server/string.h"
 //#include <cstdlib>
 #ifdef DEBUG


@@ -41,33 +42,41 @@ namespace Server {
 
 HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG
 
 HTTPHeaders::~HTTPHeaders(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-istream& operator>>(istream& is, HTTPHeaders& h) throw(HTTPError) {
+istream& operator>>(istream& is, HTTPHeaders& h)
+               throw(HTTPError, sockerr, ios::failure) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": operator>>()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator>>()" << endl;

 #endif // DEBUG
        char buf[BUFSIZ];
 #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.
        string sbuf = buf;
        string::size_type pos = sbuf.find(":");
        if (pos == string::npos) {
                // FIXME poner mejores excepciones.

-               throw HTTPError(400, sbuf + ": No es una cabecera válida.");
+               throw HTTPError(HTTPMessage::BAD_REQUEST, 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

-       cerr << __FILE__ << "    " << sbuf.substr(0, pos) << " = "
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << "    " << sbuf.substr(0, pos) << " = "

                << h[sbuf.substr(0, pos)] << endl;
 #endif // DEBUG
        return is;
 }
 
                << 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
 #ifdef DEBUG

-       cerr << __FILE__ << ": operator<<()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator<<()" << endl;

 #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) {