X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f27c218d18ebf7198e07249aca1eed625da914fd..34fb46485db0fb44f8dcc532866d988f8e54caa2:/Server/src/httprequest.cpp?ds=sidebyside diff --git a/Server/src/httprequest.cpp b/Server/src/httprequest.cpp index f1119fd..d62b785 100644 --- a/Server/src/httprequest.cpp +++ b/Server/src/httprequest.cpp @@ -44,36 +44,26 @@ HTTPRequest::~HTTPRequest(void) { } HTTPRequest::HTTPRequest(const string& uri, const HTTPMethod& method, - const string& query, const string& version): - HTTPMessage(version), method(method), uri(uri), query(query) { + const string& query, const string& body, const string& version): + HTTPMessage(body, version), method(method), uri(uri), query(query) { #ifdef DEBUG cerr << __FILE__ << ": uri = " << uri << " | " - << "method = " << ((method == GET) ? "GET" : "POST") << " | " + << "method = " << method_str() << " | " << "query = " << query << " | " + << "body.length = " << body.length() << " | " << "version = " << version << endl; #endif // DEBUG } -/* -HTTPRequest::HTTPRequest(const Serializable& body, - const string& version): - HTTPMessage(body, version) { -#ifdef DEBUG - cerr << __FILE__ << ": http_version = " << http_version - << " | body = " << body.serialize() << endl; -#endif // DEBUG -} - -HTTPRequest::HTTPRequest(const string& uri, - const HTTPRequest::HTTPMethod& method, - string& query, string& version): - HTTPMessage(body, version) { -#ifdef DEBUG - cerr << __FILE__ << ": http_version = " << http_version - << " | body = " << body.serialize() << endl; -#endif // DEBUG +string HTTPRequest::method_str(void) const { + switch (method) { + case POST: + return "POST"; + case GET: + default: + return "GET"; + } } -*/ istream& operator>>(istream& is, HTTPRequest& req) throw(HTTPError, ios::failure) { @@ -158,12 +148,12 @@ ostream& operator<<(ostream& os, const HTTPRequest& req) { #ifdef DEBUG cerr << __FILE__ << ": operator<<()" << endl; #endif // DEBUG - os << req.method << " " << req.uri; + os << req.method_str() << " " << req.uri; if (req.query.length()) { os << "?" << req.query; } - // TODO ver que este bien el \n/r - os << " HTTP/" << req.version << "\n\r" << static_cast(req); + os << " HTTP/" << req.version << "\r\n" + << static_cast(req); return os; }