X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/6bffb655ac989fe4f115763270f84175bf24e4bb..3a8788fb198a1e0590823745f39fbff81056db09:/Server/src/httpmessage.cpp?ds=sidebyside

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index ba2b825..578f563 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -48,8 +48,8 @@ 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
 	set_body(_body);
 }
@@ -58,7 +58,7 @@ 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.
+		ss << (body.length()); // FIXME No se por que tengo que sumarle 1.
 		headers["Accept-Ranges"] = "bytes";
 		headers["Content-Length"] = ss.str();
 	}
@@ -73,7 +73,6 @@ 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();
@@ -85,16 +84,14 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 		} 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];
+				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 +105,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;
 }