Changeset 3089 for pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

Timestamp:

Feb 5, 2010 4:03:29 PM (14 years ago)

Author:

ming

Message:

Misc (#1018):

• httpdemo: make the 2nd parameter (output filename) optional (result will be printed to stdout if output file is not provided.
• remove trailing "\n" from PJ_LOG.
• change response.status_code from pj_str_t to pj_uint16_t.
• remove PJ_EPENDING status checking from on_complete.

File:

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

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

@@ -218 +218 @@
 
     hreq->tcp_state.current_send_size += sent;
-    TRACE_((THIS_FILE, "\nData sent: %d out of %d bytes\n", 
+    TRACE_((THIS_FILE, "\nData sent: %d out of %d bytes", 
            hreq->tcp_state.current_send_size, hreq->tcp_state.send_size));
     if (hreq->tcp_state.current_send_size == hreq->tcp_state.send_size) {
@@ -280 +280 @@
     pj_http_req *hreq = (pj_http_req*) pj_activesock_get_user_data(asock);
 
-    TRACE_((THIS_FILE, "\nData received: %d bytes\n", size));
+    TRACE_((THIS_FILE, "\nData received: %d bytes", size));
 
     if (hreq->state == ABORTING)
@@ -472 +472 @@
     void *newdata;
     pj_scanner scanner;
+    pj_str_t s;
     pj_status_t status;
 
@@ -509 +510 @@
         pj_scan_get_until_ch(&scanner, ' ', &response->version);
         pj_scan_advance_n(&scanner, 1, PJ_FALSE);
-        pj_scan_get_until_ch(&scanner, ' ', &response->status_code);
+        pj_scan_get_until_ch(&scanner, ' ', &s);
+        response->status_code = (pj_uint16_t)pj_strtoul(&s);
         pj_scan_advance_n(&scanner, 1, PJ_FALSE);
         pj_scan_get_until_ch(&scanner, '\n', &response->reason);
@@ -909 +911 @@
         pj_strcat2(&pkt, "\n");
         pkt.ptr[pkt.slen] = 0;
-        TRACE_((THIS_FILE, "%s\n", pkt.ptr));
+        TRACE_((THIS_FILE, "%s", pkt.ptr));
     } else {
         pkt.ptr = hreq->param.reqdata.data;