diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-05-01 13:00:38 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-05-01 13:00:38 +0000 |
| commit | 0569c9c1be11590c36799518565eb760eaaca539 (patch) | |
| tree | ba13b85ac7703ab11edafb215b5ca3d757b46f27 | |
| parent | 5a91746b80fd41b9915574d8514f1d40e9cfd1b6 (diff) | |
David McCreedy's "http.c fix to Curl_proxyCONNECT for non-ASCII platforms" patch
| -rw-r--r-- | TODO-RELEASE | 2 | ||||
| -rw-r--r-- | lib/http.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index a5771e550..0a94de87b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,8 +11,6 @@ To be addressed in 7.19.5 (planned release: May 2009) 229 - [PATCH] to correct spelling in ABI -230 - [PATCH] http.c fix to Curl_proxyCONNECT for non-ASCII platforms. - 231 - [PATCH] TPF-platform specific changes to various files - committed with minor changes - awaiting feedback diff --git a/lib/http.c b/lib/http.c index c6ff5f50f..349b81da6 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1544,10 +1544,18 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, else for(i = 0; i < gotbytes; ptr++, i++) { perline++; /* amount of bytes in this line so far */ - if(*ptr=='\n') { + if(*ptr=='\x0a') { char letter; int writetype; +#ifdef CURL_DOES_CONVERSIONS + /* convert from the network encoding */ + result = Curl_convert_from_network(data, line_start, perline); + /* Curl_convert_from_network calls failf if unsuccessful */ + if(result) + return result; +#endif /* CURL_DOES_CONVERSIONS */ + /* output debug if that is requested */ if(data->set.verbose) Curl_debug(data, CURLINFO_HEADER_IN, |