X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/31a4d1fea320e59487fa28bbb406ee50d4e7ec76..HEAD:/Server/src/httpmessage.cpp

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index cda5064..c110808 100644
--- 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,14 +83,26 @@ 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);
-				} // TODO else dar error?
+#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;
 			}
 			// Después de una línea vacía, haya obtenido el body o no, sale del