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 260fe80fcc8b76b56e6f1bc0fbe015400bfe50d8..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;
 }
 
        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;
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": operator>>()" << endl;


@@ -82,11 +83,25 @@ 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()) {
                } 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];
                                to(m.headers["Content-Length"], size);
                                char* const buf2 = new char[size+1];

-                               if (is.readsome(buf2, size)) {
-                                       m.body = buf2;
+                               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 else dar error?
+#ifdef DEBUG
+                                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                                               << ": 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;
                        }
                                }
                                delete []buf2;
                        }