David McCreedy's "http.c fix to Curl_proxyCONNECT for non-ASCII platforms" patch

1 files changed, 9 insertions, 1 deletions

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,