Mas msg lindos

[z.facultad/75.42/plaqui.git] / Server / src / httpmessage.cpp

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index c97da08abc2d9712c494b6f24607e9cfda5d545b..cda5064dda83969e3ab46b51d8cf2f6f0a64f1f3 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -41,14 +41,16 @@ namespace Server {
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 }
 
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG
 #endif // DEBUG
 }
 
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": version = " << version << " | body ("
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": version = " << version << " | body ("

                << _body.length() << ") = " << _body << endl;
 #endif // DEBUG
        headers["Accept-Ranges"] = "bytes";
                << _body.length() << ") = " << _body << endl;
 #endif // DEBUG
        headers["Accept-Ranges"] = "bytes";


@@ -66,7 +68,8 @@ const string& HTTPMessage::get_body(void) const {
 
 istream& operator>>(istream& is, HTTPMessage& m) {
 #ifdef DEBUG
 
 istream& operator>>(istream& is, HTTPMessage& m) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": operator>>()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator>>()" << endl;

 #endif // DEBUG
        char buf[BUFSIZ];
        while (is.getline(buf, BUFSIZ)) {
 #endif // DEBUG
        char buf[BUFSIZ];
        while (is.getline(buf, BUFSIZ)) {


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

-                               if (is.readsome(buf2, size)) {
-                                       m.body = buf2;
-                               }
+                               if (is.readsome(buf2, size) == size) {
+                                       // Agrego fin de string porque el readsome no lo hace.
+                                       buf2[size] = '\0';
+                                       m.set_body(buf2);
+                               } // TODO else dar error?

                                delete []buf2;
                        }
                        // Después de una línea vacía, haya obtenido el body o no, sale del
                                delete []buf2;
                        }
                        // Después de una línea vacía, haya obtenido el body o no, sale del


@@ -97,7 +102,8 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": operator<<()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator<<()" << endl;

 #endif // DEBUG
        return os << m.headers << "\r\n" // Fin de cabeceras
                << m.body;
 #endif // DEBUG
        return os << m.headers << "\r\n" // Fin de cabeceras
                << m.body;