From 9322e49b932d824e5664aa8c0e0f9a41464537b1 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 5 Dec 2003 14:55:30 +0000 Subject: [PATCH] Se arregla el bug que hacia que el cliente levante mal archivos XML grandes. --- Server/include/plaqui/server/httpmessage.h | 3 ++- Server/src/httpmessage.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Server/include/plaqui/server/httpmessage.h b/Server/include/plaqui/server/httpmessage.h index 37c0287..d712d0d 100644 --- a/Server/include/plaqui/server/httpmessage.h +++ b/Server/include/plaqui/server/httpmessage.h @@ -105,7 +105,8 @@ namespace Server { /** * Obtiene los datos del pedido HTTP desde un texto. */ - friend std::istream& operator>>(std::istream& is, HTTPMessage& m); + friend std::istream& operator>>(std::istream& is, HTTPMessage& m) + throw(HTTPError, sockerr, ios::failure); /** * Convierte el pedido HTTP en texto. 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; -- 2.43.0