X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ad06ae2e40db5ce588092d90e1e089f527c27f84..7e74b790d290cd7d776349503bb361c47933c01f:/Server/src/httpmessage.cpp

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 6aad1ef..260fe80 100644
--- 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.length = "
-		<< _body.length() << endl;
+	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()+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 {
@@ -70,23 +68,22 @@ 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;
+				to(m.headers["Content-Length"], size);
 				char* const buf2 = new char[size+1];
 				if (is.readsome(buf2, size)) {
 					m.body = buf2;
@@ -103,9 +100,10 @@ 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 << "\n\r" // Fin de cabeceras
+	return os << m.headers << "\r\n" // Fin de cabeceras
 		<< m.body;
 }