]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
David McCreedy fixed a flaw from his previous non-ascii HTTP patch
authorDaniel Stenberg <daniel@haxx.se>
Tue, 16 Jan 2007 22:26:50 +0000 (22:26 +0000)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 16 Jan 2007 22:26:50 +0000 (22:26 +0000)
lib/http_chunks.c

index d9774a2c341bfd721340fdee6579df88eaf822d0..1b03a5569908de62fd10ccb2e51286c3a408328a 100644 (file)
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -324,15 +324,15 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
         }
         else {
 #ifdef CURL_DOES_CONVERSIONS
-        /* Convert to host encoding before calling Curl_client_write */
-        result = Curl_convert_from_network(conn->data,
-                                           ch->hexbuffer,
-                                           ch->hexindex);
-        if(result != CURLE_OK) {
-          /* Curl_convert_from_network calls failf if unsuccessful */
-          /* Treat it as a bad chunk */
-          return(CHUNKE_BAD_CHUNK);
-        }
+          /* Convert to host encoding before calling Curl_client_write */
+          result = Curl_convert_from_network(conn->data,
+                                             conn->trailer,
+                                             conn->trlPos);
+          if(result != CURLE_OK) {
+            /* Curl_convert_from_network calls failf if unsuccessful */
+            /* Treat it as a bad chunk */
+            return(CHUNKE_BAD_CHUNK);
+          }
 #endif /* CURL_DOES_CONVERSIONS */
           Curl_client_write(conn, CLIENTWRITE_HEADER,
                             conn->trailer, conn->trlPos);