X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/616f525d9555a3ce6d4a15c8eba2bfe3dfb08291..dea314b92324ad67455bb039e2078652ab0e5824:/Server/src/httpmessage.cpp

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 87054ec..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;
@@ -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];
-				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);
@@ -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 "
-						<< 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;