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 87054ec75be24217780cec4ce7a56f53dba8a1f0..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;


@@ -85,7 +86,8 @@ istream& operator>>(istream& is, HTTPMessage& m) {
                                streamsize size, readed;
                                to(m.headers["Content-Length"], size);
                                char* const buf2 = new char[size+1];
                                streamsize size, readed;
                                to(m.headers["Content-Length"], size);
                                char* const buf2 = new char[size+1];

-                               if ((readed = 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);
                                        // Agrego fin de string porque el readsome no lo hace.
                                        buf2[size] = '\0';
                                        m.set_body(buf2);


@@ -98,7 +100,7 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 #ifdef DEBUG
                                        cerr << __FILE__ << "(" << __LINE__ << ")"
                                                << ": operator>>() ERROR: No se pudo leer el mensaje completo. Se leyeron sóolo "
 #ifdef DEBUG
                                        cerr << __FILE__ << "(" << __LINE__ << ")"
                                                << ": operator>>() ERROR: No se pudo leer el mensaje completo. Se leyeron sóolo "

-                                               << readed << " bytes de " << size << " que deberían haberse leído." << endl;
+                                               << is.gcount() << " bytes de " << size << " que deberían haberse leído." << endl;

 #endif // DEBUG
                                }
                                delete []buf2;
 #endif // DEBUG
                                }
                                delete []buf2;