Changeset 56 in cheroxy for trunk/src

Timestamp:

12/13/12 18:26:44 (11 years ago)

Author:

cheese

Message:

#1 fix to return from CRXProxy::ReceiveResponse if receive zero-byte(infinite-loop bug).

Location:

trunk/src

Files:

• CRXProxy.cpp (modified) (1 diff)
• main.cpp (modified) (6 diffs)

trunk/src/CRXProxy.cpp

@@ -160 +160 @@
             CRX_ERROR_SET (aResult, "Failed to receive from server.");
             return aResult;
+        }
+        else if (aResult == 0)
+        {
+            CRX_ADD_SUBCLASS_ERROR (mServer);
+            CRX_ERROR_SET (aResult, "Receive zero-byte from server.");
+            break;
         }
 

trunk/src/main.cpp

@@ -147 +147 @@
                                   aFilterFileExtension);
 
+        /* 1. receive request from client */
         aResult = aProxy->ReceiveRequest ();
         if (aResult < 0)
@@ -153 +154 @@
         }
 
+        /* 1.1. modify and print request data */
         if (gViewRequest && !aFilter.CheckRequestFilter (CRX_FILTER_REQUEST_FILE_EXTENSION, aRequest))
         {
@@ -162 +164 @@
         }
 
+        /* 2. send request to web server */
         aResult = aProxy->SendRequest ();
         if (aResult < 0)
@@ -168 +171 @@
         }
 
+        /* 3. receive response from web server */
         aResult = aProxy->ReceiveResponse ();
         if (aResult < 0)
@@ -174 +178 @@
         }
 
+        /* 3.1. if request url is matched, print response */
         if (gViewResponse && !aFilter.CheckRequestFilter (CRX_FILTER_REQUEST_FILE_EXTENSION, aRequest))
         {
@@ -182 +187 @@
         }
 
+        /* 4. send response to client */
         aResult = aProxy->SendResponse ();
         if (aResult < 0)