David McCreedy fixed a flaw from his previous non-ascii HTTP patch

This commit is contained in:
Daniel Stenberg 2007-01-16 22:26:50 +00:00
parent 385e612fa5
commit 8cade952bf

View 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -324,15 +324,15 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn,
} }
else { else {
#ifdef CURL_DOES_CONVERSIONS #ifdef CURL_DOES_CONVERSIONS
/* Convert to host encoding before calling Curl_client_write */ /* Convert to host encoding before calling Curl_client_write */
result = Curl_convert_from_network(conn->data, result = Curl_convert_from_network(conn->data,
ch->hexbuffer, conn->trailer,
ch->hexindex); conn->trlPos);
if(result != CURLE_OK) { if(result != CURLE_OK) {
/* Curl_convert_from_network calls failf if unsuccessful */ /* Curl_convert_from_network calls failf if unsuccessful */
/* Treat it as a bad chunk */ /* Treat it as a bad chunk */
return(CHUNKE_BAD_CHUNK); return(CHUNKE_BAD_CHUNK);
} }
#endif /* CURL_DOES_CONVERSIONS */ #endif /* CURL_DOES_CONVERSIONS */
Curl_client_write(conn, CLIENTWRITE_HEADER, Curl_client_write(conn, CLIENTWRITE_HEADER,
conn->trailer, conn->trlPos); conn->trailer, conn->trlPos);