- Se agrega el método HTTPRequest::method_str() para obtener el método como un

[z.facultad/75.42/plaqui.git] / Server / src / httpresponse.cpp

diff --git a/Server/src/httpresponse.cpp b/Server/src/httpresponse.cpp
index 562dbf9881f200291da337745bab5ad400ecd610..46cc55e11db4fe6adc760eb980fad69c409110ba 100644 (file)
--- a/Server/src/httpresponse.cpp
+++ b/Server/src/httpresponse.cpp
@@ -44,10 +44,11 @@ HTTPResponse::~HTTPResponse(void) {
 #endif // DEBUG
 }
 
-HTTPResponse::HTTPResponse(const string& version):
-               HTTPMessage(version) {
+HTTPResponse::HTTPResponse(const string& body, const string& version):
+               HTTPMessage(body, version) {
 #ifdef DEBUG
-       cerr << __FILE__ << ": version = " << version << endl;
+       cerr << __FILE__ << ": body.length = " << body.length()
+               << " | version = " << version << endl;
 #endif // DEBUG
 }
 
@@ -90,7 +91,7 @@ istream& operator>>(istream& is, HTTPResponse& resp)
        }
        // Averiguo la versión.
        string::size_type pos = line.find_first_of(String::SPACE_CHARS, 5);
-       string ver = line.substr(5, pos); 
+       string ver = line.substr(5, pos - 5); 
        if ((ver == "1.1") || (ver == "1.0")) {
                resp.version = ver;
        } else {
@@ -127,8 +128,7 @@ ostream& operator<<(ostream& os, const HTTPResponse& resp) {
        cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
        os << "HTTP/" << resp.version << " " << resp.status_code << " "
-               << HTTPMessage::reason(resp.status_code) << "\n\r";
-       // TODO ver que este bien el \r\l
+               << HTTPMessage::reason(resp.status_code) << "\r\n";
        os << static_cast<const HTTPMessage&>(resp);
        return os;
 }