Se agrega un try para tratar de solucionar situaciones en las que el server

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index b9d0d28cdb845171ae6541719413ed3896fe0f8c..c11080880bac6d2f57bf3510561a2acee05c468d 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -66,7 +66,8 @@ const string& HTTPMessage::get_body(void) const {
        return body;
 }
 
-istream& operator>>(istream& is, HTTPMessage& m) {
+istream& operator>>(istream& is, HTTPMessage& m)
+               throw(HTTPError, sockerr, ios::failure) {
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": operator>>()" << endl;
@@ -82,19 +83,24 @@ istream& operator>>(istream& is, HTTPMessage& m) {
                } else {
                        // Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
                        if (m.headers.find("Content-Length") != m.headers.end()) {
-                               streamsize size;
+                               streamsize size, readed;
                                to(m.headers["Content-Length"], size);
                                char* const buf2 = new char[size+1];
-                               if (is.readsome(buf2, size) == size) {
+                               is.read(buf2, size);
+                               if (is.gcount() == size) {
                                        // Agrego fin de string porque el readsome no lo hace.
                                        buf2[size] = '\0';
                                        m.set_body(buf2);
 #ifdef DEBUG
+                                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                                               << ": operator>>() raaaaw body: " << buf2 << endl;
+#endif // DEBUG
                                } else {
-                               // TODO dar error?
+                                       // TODO else dar error?
+#ifdef DEBUG
                                        cerr << __FILE__ << "(" << __LINE__ << ")"
-                                               << ": operator>>() ERROR!!! Caracteres extraidos: "
-                                               << n << endl;
+                                               << ": operator>>() ERROR: No se pudo leer el mensaje completo. Se leyeron sóolo "
+                                               << is.gcount() << " bytes de " << size << " que deberían haberse leído." << endl;
 #endif // DEBUG
                                }
                                delete []buf2;