Se corrige el XML a mano para probarlo.

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 578f563645ffeb8b6a41a02435d3a0daa1db5b23..87054ec75be24217780cec4ce7a56f53dba8a1f0 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -41,27 +41,25 @@ namespace Server {
 
 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
-       cerr << __FILE__ << ": version = " << version << " | body ("
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": version = " << version << " | body ("
                << _body.length() << ") = " << _body << endl;
 #endif // DEBUG
+       headers["Accept-Ranges"] = "bytes";
        set_body(_body);
 }
 
 void HTTPMessage::set_body(const string& _body) {
        body = _body;
-       if (body.length()) {
-               stringstream ss; // TODO ver forma mas linda de convertir
-               ss << (body.length()); // FIXME No se por que tengo que sumarle 1.
-               headers["Accept-Ranges"] = "bytes";
-               headers["Content-Length"] = ss.str();
-       }
+       headers["Content-Length"] = String().from(body.length());
 }
 
 const string& HTTPMessage::get_body(void) const {
@@ -70,26 +68,38 @@ const string& HTTPMessage::get_body(void) const {
 
 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)) {
                String sbuf(buf);
                sbuf.trim();
                if (sbuf.length()) {
-                       stringstream ss;
-                       ss << sbuf;
+                       stringstream ss(sbuf);
                        ss >> m.headers;
                // Fin de las cabeceras.
                } else {
                        // Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
                        if (m.headers.find("Content-Length") != m.headers.end()) {
-                               stringstream ss(m.headers["Content-Length"]);
-                               streamsize size;
-                               ss >> size;
+                               streamsize size, readed;
+                               to(m.headers["Content-Length"], size);
                                char* const buf2 = new char[size+1];
-                               if (is.readsome(buf2, size)) {
-                                       m.body = buf2;
+                               if ((readed = is.readsome(buf2, size)) == size) {
+                                       // Agrego fin de string porque el readsome no lo hace.
+                                       buf2[size] = '\0';
+                                       m.set_body(buf2);
+#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 "
+                                               << readed << " bytes de " << size << " que deberían haberse leído." << endl;
+#endif // DEBUG
                                }
                                delete []buf2;
                        }
@@ -103,7 +113,8 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 
 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;