Changeset 44 in cheroxy for trunk/src/CRXHttpResponse.cpp

Timestamp:

11/22/12 15:21:02 (11 years ago)

Author:

cheese

Message:

#1 change logic more detail

File:

• trunk/src/CRXHttpResponse.cpp (modified) (7 diffs)

trunk/src/CRXHttpResponse.cpp

@@ -12 +12 @@
 #include <string.h>
 
-#define CRLF                "\r\n"
-#define CRLF2               "\r\n\r\n"  
-
 #define CONTENT_LENGTH      "Content-Length: "
 #define TRANSFER_ENCODING   "Transfer-Encoding: "
@@ -56 +53 @@
 
 int
-CRXHttpResponse::SetResponse (const char    * aHttpResponse,
-                              const int     aResponseLength)
+CRXHttpResponse::SetResponseAll (const char * aHttpResponse,
+                                 const int  aResponseLength)
 {
     int             aResult = 0;
@@ -70 +67 @@
         return ERROR_HTTP_RESPONSE_INVALID_LENGTH;
 
-    if (GetHeader ().length () == 0)
+    if (GetHeader ().rfind (CRLF2) == std::string::npos)
     {
         aEndOfHeader = strstr (aHttpResponse, CRLF2);
@@ -80 +77 @@
         aHeader.assign (aHttpResponse, aHeaderLength);
 
-        SetMessage (aHeader.c_str ());
-    }
-
-    aResult = ParseContent (aHttpResponse + aHeaderLength, aResponseLength - aHeaderLength);
+        SetHeader (aHeader.c_str ());
+    }
+
+    aResult = SetContent (aHttpResponse + aHeaderLength, aResponseLength - aHeaderLength);
     if (aResult)
     {
-        return ERROR_HTTP_RESPONSE_FAILED_TO_PARSE_CONTENT;
+        aResult = ERROR_HTTP_RESPONSE_FAILED_TO_PARSE_CONTENT;
     }
     /*----------------------------------------------------------------*/
@@ -93 +90 @@
 }
 
-CRXHttpResponse &
-CRXHttpResponse::operator = (const char * aHttpMessage)
+void
+CRXHttpResponse::SetHeader (const char * aHttpMessage)
 {
     /*----------------------------------------------------------------*/
     SetMessage (aHttpMessage);
     /*----------------------------------------------------------------*/
-
-    return *this;
 }
 
@@ -166 +161 @@
 
 int
-CRXHttpResponse::ParseContent (const char   * aContent,
+CRXHttpResponse::SetContent (const char * aContent,
                                const int    aLength)
 {
@@ -207 +202 @@
 
 int             CRXHttpResponse::GetStatusCode      (void) const { return mStatusCode; }
+bool            CRXHttpResponse::IsChunked          (void) const { return mIsChunked; }
 int             CRXHttpResponse::GetContentLength   (void) const { return mContentLength; }
 const char *    CRXHttpResponse::GetContentBody     (void) const { return mContent.mBody; }