Changeset 3333 for pjproject/trunk

Timestamp:

Oct 4, 2010 1:11:54 AM (14 years ago)

Author:

bennylp

Message:

Another fix for authentication in HTTP client (re #1136):

• missing opaque parameter in the response
• also replaced "\n" with "\r\n"

File:

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

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

@@ -1305 +1305 @@
           8 + /* nc=.. */
           30 + /* cnonce= */
+          12 + chal->opaque.slen + /* opaque=".." */
           0;
     phdr->value.ptr = (char*)pj_pool_alloc(hreq->pool, len);
@@ -1376 +1377 @@
         phdr->value.slen = len;
 
+        if (chal->opaque.slen) {
+            pj_strcat2(&phdr->value, ", opaque=\"");
+            pj_strcat(&phdr->value, &chal->opaque);
+            pj_strcat2(&phdr->value, "\"");
+        }
+
     } else {
         /* Server requires quality protection that we don't support. */
@@ -1475 +1482 @@
         pkt.slen = 0;
         /* Start-line */
-        str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%.*s %.*s %s/%.*s\n",
+        str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%.*s %.*s %s/%.*s\r\n",
                      STR_PREC(hreq->param.method), 
                      STR_PREC(hreq->hurl.path),
@@ -1481 +1488 @@
                      STR_PREC(hreq->param.version));
         /* Header field "Host" */
-        str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "Host: %.*s:%d\n",
+        str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "Host: %.*s:%d\r\n",
                      STR_PREC(hreq->hurl.host), hreq->hurl.port);
         if (!pj_strcmp2(&hreq->param.method, http_method_names[HTTP_PUT])) {
@@ -1490 +1497 @@
                     hreq->param.reqdata.total_size: 
                     hreq->param.reqdata.size, buf);
-            str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%s: %s\n",
+            str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%s: %s\r\n",
                          CONTENT_LENGTH, buf);
         }
@@ -1496 +1503 @@
         /* Append user-specified headers */
         for (i = 0; i < hreq->param.headers.count; i++) {
-            str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%.*s: %.*s\n",
+            str_snprintf(&pkt, BUF_SIZE, PJ_TRUE, "%.*s: %.*s\r\n",
                          STR_PREC(hreq->param.headers.header[i].name),
                          STR_PREC(hreq->param.headers.header[i].value));
@@ -1505 +1512 @@
         }
 
-        pj_strcat2(&pkt, "\n");
+        pj_strcat2(&pkt, "\r\n");
         pkt.ptr[pkt.slen] = 0;
         TRACE_((THIS_FILE, "%s", pkt.ptr));