Changeset 3098 for pjproject/trunk

Timestamp:

Feb 11, 2010 12:50:42 PM (15 years ago)

Author:

ming

Message:

More ticket #1018:

• Immediately process response body after receiving the header.
• Fix GET method when Content-Length header is not specified.
• Fix checking when HTTP request is cancelled.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c (modified) (7 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

@@ -185 +185 @@
     pj_http_req *hreq = (pj_http_req*) pj_activesock_get_user_data(asock);
 
-    if (hreq->state == ABORTING)
+    if (hreq->state == ABORTING || hreq->state == IDLE)
         return PJ_FALSE;
 
@@ -208 +208 @@
     PJ_UNUSED_ARG(op_key);
 
-    if (hreq->state == ABORTING)
+    if (hreq->state == ABORTING || hreq->state == IDLE)
         return PJ_FALSE;
 
@@ -282 +282 @@
     TRACE_((THIS_FILE, "\nData received: %d bytes", size));
 
-    if (hreq->state == ABORTING)
+    if (hreq->state == ABORTING || hreq->state == IDLE)
         return PJ_FALSE;
 
@@ -326 +326 @@
             hreq->response.data = NULL;
             hreq->response.size = 0;
-            if (rem > 0) {
-                /* There is some response data remaining after parsing the
-                 * header, move it to the front of the buffer.
-                 */
-                pj_memmove((char *)data, (char *)data + size - rem, rem);
-                *remainder = rem;
-            }
-            /* Speed up the operation a bit rather than waiting for EOF */
-            if (hreq->response.content_length == 0) {
-                return http_on_data_read(asock, NULL, 0, PJ_SUCCESS, NULL);
-            }
-
+
+            if (rem > 0 || hreq->response.content_length == 0)
+                http_on_data_read(asock, (rem == 0 ? NULL:
+                                  (char *)data + size - rem),
+                                  rem, PJ_SUCCESS, NULL);
         }
 
@@ -343 +336 @@
     }
 
-    pj_assert(hreq->state == READING_DATA);
+    if (hreq->state != READING_DATA)
+        return PJ_FALSE;
     if (hreq->cb.on_data_read) {
         /* If application wishes to receive the data once available, call
@@ -386 +380 @@
      * or if it's already EOF.
      */
-    if ((pj_ssize_t)hreq->tcp_state.current_read_size >= 
-        hreq->response.content_length ||
+    if ((hreq->response.content_length >=0 &&
+        (pj_ssize_t)hreq->tcp_state.current_read_size >=
+        hreq->response.content_length) ||
         (status == PJ_EEOF && hreq->response.content_length == -1)) 
     {
@@ -783 +778 @@
                                   &http_req->addr, &http_req->hurl.host,
                                   http_req->hurl.port);
-        if (status != PJ_SUCCESS || 
+        if (status != PJ_SUCCESS ||
             !pj_sockaddr_has_addr(&http_req->addr) ||
-            (http_req->param.addr_family==pj_AF_INET() && 
-             http_req->addr.ipv4.sin_addr.s_addr==PJ_INADDR_NONE)) 
+            (http_req->param.addr_family==pj_AF_INET() &&
+             http_req->addr.ipv4.sin_addr.s_addr==PJ_INADDR_NONE))
         {
             return status; // cannot resolve host name