X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/b92547a5de3a3fb4f14a2bea4a4e776b8da3cb5c..c90e905d76aed75379d220478e97fda0d34ec59b:/Server/include/plaqui/server/httprequest.h

diff --git a/Server/include/plaqui/server/httprequest.h b/Server/include/plaqui/server/httprequest.h
index 92c6de7..5f0757e 100644
--- a/Server/include/plaqui/server/httprequest.h
+++ b/Server/include/plaqui/server/httprequest.h
@@ -28,8 +28,12 @@
 #ifndef PLAQUI_HTTPREQUEST_H
 #define PLAQUI_HTTPREQUEST_H
 
-#include "httpmessage.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpmessage.h"
+#include <socket++/sockstream.h>
 #include <string>
+#include <istream>
+#include <ostream>
 
 namespace PlaQui {
 
@@ -78,9 +82,12 @@ namespace Server {
 
 		// Atributos.
 
-		protected:
+		protected: // TODO hacer privados con get() y set() ???
+
+		public:
 
 			/// Método HTTP.
+			/// @todo TODO - convertirlo a string? Hace todo más fácil (y más ineficiente :)
 			HTTPMethod method;
 
 			/// URI.
@@ -104,18 +111,25 @@ namespace Server {
 			HTTPRequest(const std::string& uri = "/",
 					const HTTPMethod& method = GET,
 					const std::string& query = "",
+					const std::string& body = "",
 					const std::string& version = "1.1");
 
+			/**
+			 * Obtiene el método como un string.
+			 */
+			std::string method_str(void) const;
+
 			/**
 			 * Obtiene los datos del pedido HTTP desde un texto.
 			 */
-			friend std::istream& operator>>(std::istream& is, HTTPRequest& req);
+			friend std::istream& operator>>(std::istream& is, HTTPRequest& req)
+				throw(HTTPError, sockerr, std::ios::failure);
 
 			/**
 			 * Convierte el pedido HTTP en texto.
 			 */
 			friend std::ostream& operator<<(std::ostream& os,
-					const HTTPRequest& req);
+					const HTTPRequest& req) throw(sockerr);
 
 	};