- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 3a563cd2a48e3615a856ff440713851e75da0f73..578f563645ffeb8b6a41a02435d3a0daa1db5b23 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -25,6 +25,7 @@
 // $Id$
 //
 
 // $Id$
 //
 

+#include "plaqui/server/string.h"

 #include "plaqui/server/httpmessage.h"
 #include <sstream>
 #include <cstdlib>
 #include "plaqui/server/httpmessage.h"
 #include <sstream>
 #include <cstdlib>


@@ -44,30 +45,21 @@ HTTPMessage::~HTTPMessage(void) {
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-HTTPMessage::HTTPMessage(const string& version):
-               version(version) {
+HTTPMessage::HTTPMessage(const string& _body, const string& _version):
+               version(_version) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": version = " << version << endl;
-#endif // DEBUG
-}
-
-/*
-HTTPMessage::HTTPMessage(const string& _body,
-               const string& http_version):
-               http_version(http_version) {
-#ifdef DEBUG
-       cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << endl;
+       cerr << __FILE__ << ": version = " << version << " | body ("
+               << _body.length() << ") = " << _body << endl;

 #endif // DEBUG
        set_body(_body);
 }
 #endif // DEBUG
        set_body(_body);
 }

-*/

 
 void HTTPMessage::set_body(const string& _body) {
        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir
 
 void HTTPMessage::set_body(const string& _body) {
        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir

-               ss << body.length();
+               ss << (body.length()); // FIXME No se por que tengo que sumarle 1.
+               headers["Accept-Ranges"] = "bytes";

                headers["Content-Length"] = ss.str();
        }
 }
                headers["Content-Length"] = ss.str();
        }
 }


@@ -81,28 +73,31 @@ istream& operator>>(istream& is, HTTPMessage& m) {
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
        char buf[BUFSIZ];
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
        char buf[BUFSIZ];

-       bool is_header = true;
-       stringstream body_ss;

        while (is.getline(buf, BUFSIZ)) {
        while (is.getline(buf, BUFSIZ)) {

-               string sbuf = buf;
+               String sbuf(buf);
+               sbuf.trim();

                if (sbuf.length()) {
                if (sbuf.length()) {

-                       if (is_header) {
-                               stringstream ss;
-                               ss << buf;
-                               ss >> m.headers;
-                       } else {
-                               body_ss << buf << endl;
-                       }
+                       stringstream ss;
+                       ss << sbuf;
+                       ss >> m.headers;
+               // Fin de las cabeceras.

                } else {
                } else {

-                       if (is_header) {
-                               is_header = false;
-                       } else {
-                               body_ss << buf << endl;
+                       // 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;
+                               char* const buf2 = new char[size+1];
+                               if (is.readsome(buf2, size)) {
+                                       m.body = buf2;
+                               }
+                               delete []buf2;

                        }
                        }

+                       // Después de una línea vacía, haya obtenido el body o no, sale del
+                       // while.
+                       break;

                }
        }
                }
        }

-       // TODO si el body es un serializable, deberia auto deserializarse.
-       m.body = body_ss.str();

        return is;
 }
 
        return is;
 }
 


@@ -114,6 +109,28 @@ ostream& operator<<(ostream& os, const HTTPMessage& m) {
                << m.body;
 }
 
                << m.body;
 }
 

+string HTTPMessage::reason(unsigned code) {
+       switch (code) {
+               // TODO completar los códigos.
+               case OK:
+                       return "OK";
+               case BAD_REQUEST:
+                       return "Bad Request";
+               case NOT_FOUND:
+                       return "Not Found";
+               case LENGTH_REQUIRED:
+                       return "Length Required";
+               case INTERNAL_SERVER_ERROR:
+                       return "Internal Server Error";
+               case NOT_IMPLEMENTED:
+                       return "Not Implemented";
+               case HTTP_VERSION_NOT_SUPPORTED:
+                       return "HTTP Version Not Supported";
+               default:
+                       return "No Reason";
+       }
+}
+

 } // namespace Server
 
 } // namespace PlaQui
 } // namespace Server
 
 } // namespace PlaQui