Se arregla el bug que hacia que se cuelgue el cliente al desconectarse.

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 737f6365dd0d94debd33e5be2ffb96ec9948e108..260fe80fcc8b76b56e6f1bc0fbe015400bfe50d8 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>


@@ -33,40 +34,32 @@
 #endif // DEBUG
 
 using namespace std;
 #endif // DEBUG
 
 using namespace std;

-using namespace PlaQui::Server;

 
 

-HTTPMessage::~HTTPMessage(void) {
-#ifdef DEBUG
-       cerr << __FILE__ << ": destructor." << endl;
-#endif // DEBUG
-}
+namespace PlaQui {
+       
+namespace Server {

 
 

-HTTPMessage::HTTPMessage(const string& version):
-               version(version) {
+HTTPMessage::~HTTPMessage(void) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

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

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": version = " << version << " | body ("
+               << _body.length() << ") = " << _body << endl;

 #endif // DEBUG
 #endif // DEBUG

+       headers["Accept-Ranges"] = "bytes";

        set_body(_body);
 }
        set_body(_body);
 }

-*/

 
 void HTTPMessage::set_body(const string& _body) {
        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();
-               headers["Content-Length"] = ss.str();
-       }
+       headers["Content-Length"] = String().from(body.length());

 }
 
 const string& HTTPMessage::get_body(void) const {
 }
 
 const string& HTTPMessage::get_body(void) const {


@@ -75,37 +68,68 @@ 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];
 #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;
-               if (sbuf.length())
-                       if (is_header) {
-                               istringstream(buf) >> m.headers;
-                       } else {
-                               body_ss << buf << endl;
-                       }
+               String sbuf(buf);
+               sbuf.trim();
+               if (sbuf.length()) {
+                       stringstream 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()) {
+                               streamsize size;
+                               to(m.headers["Content-Length"], 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.
-       body = body_ss.str();

        return is;
 }
 
        return is;
 }
 

-ostream& operator<<(ostream& os, HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPMessage& m) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

-       return os << headers << "\r\n" // Fin de cabeceras
-               << body;
+       return os << m.headers << "\r\n" // Fin de cabeceras
+               << 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
+