X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/00cffd5f7c35a915c09d55e6292775e9e01bdeec..f6e29f2008bf5f440000fb647a4782136929c1a1:/Server/src/request.cpp?ds=sidebyside

diff --git a/Server/src/request.cpp b/Server/src/request.cpp
index d17ca72..f40c9f9 100644
--- a/Server/src/request.cpp
+++ b/Server/src/request.cpp
@@ -61,13 +61,16 @@ PlaQui::Server::Request::CHARS_UNRESERVED = CHARS_ALPHANUM + CHARS_MARK;
 const std::string
 PlaQui::Server::Request::CHARS_HEX = CHARS_DIGIT + std::string("abcdefABCDEF");
 
+PlaQui::Server::Request::~Request(void) {
+}
+
 void PlaQui::Server::Request::set_request(const std::string& req,
 		const std::string& host, unsigned port) {
 #ifdef DEBUG
 	std::cerr << __FILE__ << ": req = " << req << " | host = " << host
 		<< " | port = " << port << std::endl;
 #endif // DEBUG
-	PlaQui::Server::String request(req);
+	String request(req);
 	(*this)["REMOTE_HOST"] = host;
 	std::stringstream ss;
 	ss << port;
@@ -78,9 +81,8 @@ void PlaQui::Server::Request::set_request(const std::string& req,
 		throw "HTTP/1.1 501 Method Not Implemented";
 	}
 	// Averiguo método.
-	std::string::size_type pos = request.find_first_of(
-			PlaQui::Server::String::SPACE_CHARS);
-	PlaQui::Server::String method = request.substr(0, pos); 
+	std::string::size_type pos = request.find_first_of(String::SPACE_CHARS);
+	String method = request.substr(0, pos); 
 	if ((method.to_upper() == "GET") || (method.to_upper() == "POST")) {
 		(*this)["REQUEST_METHOD"] = method;
 	} else {
@@ -95,13 +97,13 @@ void PlaQui::Server::Request::set_request(const std::string& req,
 		throw "HTTP/1.1 400 Bad Request";
 	}
 	// Si tiene más espacios, tengo la URI y el protocolo (o un error).
-	pos = request.find_first_of(PlaQui::Server::String::SPACE_CHARS);
+	pos = request.find_first_of(String::SPACE_CHARS);
 	if (pos != std::string::npos) {
 		// Si el resto es un protocolo válido, agrego más variables.
-		PlaQui::Server::String protocol = request.substr(pos + 1);
+		String protocol = request.substr(pos + 1);
 		protocol = protocol.trim();
-		if ((PlaQui::Server::String(protocol).to_upper() == "HTTP/1.0")
-				|| (PlaQui::Server::String(protocol).to_upper() == "HTTP/1.1")) {
+		if ((String(protocol).to_upper() == "HTTP/1.0")
+				|| (String(protocol).to_upper() == "HTTP/1.1")) {
 			(*this)["SERVER_PROTOCOL"] = protocol;
 		// Si no es un error.
 		} else {