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

diff --git a/TODO-RELEASE b/TODO-RELEASE
index a5771e550858596d05f3a93af93b085236da5e3f..0a94de87b91d318c74efb4dab1f55042244f14fd 100644 (file)
--- 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 c6ff5f50f75ce5c785a54424968070726a248149..349b81da636dc037231e1e440ce1c409daaa87fe 100644 (file)
--- 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,