Changeset 5545

Timestamp:

Jan 24, 2017 5:59:05 AM (8 years ago)

Author:

riza

Message:

Re #1945 (misc): Prevent automatically adding Content-Type and Content-Length on
printing multipart data when its already printed.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_multipart.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -68 +68 @@
         char *clen_pos;
         const pjsip_hdr *hdr;
+        pj_bool_t ctype_printed = PJ_FALSE;
 
         clen_pos = NULL;
@@ -83 +84 @@
         while (hdr != &part->hdr) {
             int printed = pjsip_hdr_print_on((pjsip_hdr*)hdr, p,
-                                             SIZE_LEFT()-2);
+                                             SIZE_LEFT()-2);
             if (printed < 0)
                 return -1;
@@ -89 +90 @@
             *p++ = '\r';
             *p++ = '\n';
+
+            if (!ctype_printed && hdr->type == PJSIP_H_CONTENT_TYPE)
+                ctype_printed = PJ_TRUE;            
+
             hdr = hdr->next;
         }
 
         /* Automaticly adds Content-Type and Content-Length headers, only
-         * if content_type is set in the message body.
+         * if content_type is set in the message body and haven't been printed.
          */
-        if (part->body && part->body->content_type.type.slen) {
+        if (part->body && part->body->content_type.type.slen && !ctype_printed) 
+        {
             pj_str_t ctype_hdr = { "Content-Type: ", 14};
             const pjsip_media_type *media = &part->body->content_type;