fixup Connection: to repair testsbagder/replace-internal-header-with-blank

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/http.c b/lib/http.c
index a719cdd97..841f6cc0b 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1930,14 +1930,15 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
 
     Curl_safefree(conn->allocptr.te);
 
-    cptr = Curl_copy_header_value(cptr);
-    if(!cptr)
-      return CURLE_OUT_OF_MEMORY;
+    if(cptr) {
+      cptr = Curl_copy_header_value(cptr);
+      if(!cptr)
+        return CURLE_OUT_OF_MEMORY;
+    }
 
     /* Create the (updated) Connection: header */
-    conn->allocptr.te = (cptr && *cptr) ?
-      aprintf("%s, TE\r\n" TE_HEADER, cptr) :
-      strdup("Connection: TE\r\n" TE_HEADER);
+    conn->allocptr.te = aprintf("Connection: %s%sTE\r\n" TE_HEADER,
+                                cptr ? cptr : "", (cptr && *cptr) ? ", ":"");
 
     free(cptr);
     if(!conn->allocptr.te)