- Se agrega el metodo Model::Simulator::set_open() para abrir y cerrar bombas y

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index ba2b82596de3a251209b7ef77e30c445c2a191be..c97da08abc2d9712c494b6f24607e9cfda5d545b 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -48,20 +48,16 @@ HTTPMessage::~HTTPMessage(void) {
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG
-       cerr << __FILE__ << ": version = " << version << " | body.length = "
-               << _body.length() << endl;
+       cerr << __FILE__ << ": 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()+1); // 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 {
@@ -73,28 +69,23 @@ istream& operator>>(istream& is, HTTPMessage& m) {
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
        char buf[BUFSIZ];
-       bool is_header = true;
        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()) {
-                               // Descarta la línea vacía para separar las cabeceras.
-                               is.getline(buf, BUFSIZ);
-                               stringstream ss(m.headers["Content-Length"]);
                                streamsize size;
-                               ss >> size;
-                               char* buf2 = new char[size+1];
+                               to(m.headers["Content-Length"], size);
+                               char* const buf2 = new char[size+1];
                                if (is.readsome(buf2, size)) {
                                        m.body = buf2;
                                }
-                               delete buf2[];
+                               delete []buf2;
                        }
                        // Después de una línea vacía, haya obtenido el body o no, sale del
                        // while.
@@ -108,7 +99,7 @@ ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
        cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-       return os << m.headers << "\n\r" // Fin de cabeceras
+       return os << m.headers << "\r\n" // Fin de cabeceras
                << m.body;
 }