Changeset 46 in cheroxy for trunk/include

Timestamp:

11/26/12 15:23:31 (11 years ago)

Author:

cheese

Message:

#1 rename http message to http header and change way to process response content as binary

Location:

trunk/include

Files:

• CRXHttpHeader.h (copied) (copied from trunk/include/CRXHttpMessage.h ) (2 diffs)
• CRXHttpRequest.h (modified) (2 diffs)
• CRXHttpResponse.h (modified) (4 diffs)
• CRXProxy.h (modified) (1 diff)

trunk/include/CRXHttpHeader.h

@@ -1 +1 @@
 /**
- * CRXHttpMessage.h
+ * CRXHttpHeader.h
  */
 #ifndef __CRXHTTPMESSAGE_H__
@@ -10 +10 @@
 #define CRLF2               "\r\n\r\n"  
 
-class CRXHttpMessage
+class CRXHttpHeader
 {
 protected:
-    std::string mHttpMessage;
+    std::string mHttpHeader;
     std::string mHttpVersion;
 
 public:
-    CRXHttpMessage              (void);
-    virtual ~CRXHttpMessage     (void);
+    CRXHttpHeader           (void);
+    virtual ~CRXHttpHeader  (void);
 
 protected:
-    virtual void    Parse           (void) = 0;
-    virtual void    Reset           (void) = 0;
+    virtual void    Parse   (void) = 0;
 
 public:
-    void            SetMessage      (const char * aHttpMessage);
-    std::string     GetMessage      (void) const;
-
-    void            ResetMessage    (void);
+    void            Set     (const char * aHeader);
+    std::string     Get     (void) const;
 };
 

trunk/include/CRXHttpRequest.h

@@ -5 +5 @@
 #define __CRXHTTPREQUEST_H__
 
-#include "CRXHttpMessage.h"
+#include "CRXHttpHeader.h"
 
-class CRXHttpRequest : public CRXHttpMessage
+class CRXHttpRequest : public CRXHttpHeader
 {
 private:
@@ -25 +25 @@
     void                Parse               (void);
     void                ParseFileExtension  (void);
-    void                Reset               (void);
 
 public:

trunk/include/CRXHttpResponse.h

@@ -5 +5 @@
 #define __CRXHTTPRESPONSE_H__
 
-#include "CRXHttpMessage.h"
+#include "CRXHttpHeader.h"
+
+#include <vector>
 
 #define ERROR_HTTP_RESPONSE                                 -4000
@@ -13 +15 @@
 #define ERROR_HTTP_RESPONSE_FAILED_TO_PARSE_CONTENT         ERROR_HTTP_RESPONSE - 4
 
-class CRXHttpResponse : public CRXHttpMessage
+class CRXHttpResponse : public CRXHttpHeader
 {
 private:
-    int         mStatusCode;
-    std::string mStatusString;
-    bool        mIsChunked;     /* Transfer-Encoding */
-    int         mContentLength;
-
-    struct __content_body__ {
-        char    * mBody;
-        int     mLength;
-    } mContent;
+    int                 mStatusCode;
+    std::string         mStatusString;
+    bool                mIsChunked;     /* Transfer-Encoding */
+    unsigned int        mContentLength;
+    std::vector <char>  mContent;
 
 public:
@@ -33 +31 @@
     void                Parse               (void);
     void                Reset               (void);
-    void                ResetContent        (void);
 
 public:
@@ -39 +36 @@
 
     bool                IsChunked           (void) const;
-    int                 SetResponseAll      (const char * aHttpResponse,
-                                             const int  aResponseLength);
-    void                SetHeader           (const char * aHttpResponse);
+    void                SetHeader           (const char * aHeader);
     std::string         GetHeader           (void) const;
     int                 SetContent          (const char * aContent,

trunk/include/CRXProxy.h

@@ -7 +7 @@
 #include "CRXException.h"
 #include "CRXSocket.h"
-#include "CRXHttpMessage.h"
+#include "CRXHttpHeader.h"
 #include "CRXHttpRequest.h"
 #include "CRXHttpResponse.h"