From: Gisle Vanem <gvanem@broadpark.no>
Date: Tue, 20 Aug 2013 09:42:34 +0000 (+0200)
Subject: transfer: the recent sessionhandle change broke CURL_DOES_CONVERSIONS
X-Git-Tag: curl-7_33_0~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=062e5bfd9c3a05b9234144dc782e232804916b5e;p=thirdparty%2Fcurl.git

transfer: the recent sessionhandle change broke CURL_DOES_CONVERSIONS
---

diff --git a/lib/transfer.c b/lib/transfer.c
index e899d19c48..31553eb46f 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -101,11 +101,13 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp)
 #ifdef CURL_DOES_CONVERSIONS
   bool sending_http_headers = FALSE;
 
-  if((conn->handler->protocol&(CURLPROTO_HTTP|CURLPROTO_RTSP)) &&
-     (data->state.proto.http->sending == HTTPSEND_REQUEST)) {
-    /* We're sending the HTTP request headers, not the data.
-       Remember that so we don't re-translate them into garbage. */
-    sending_http_headers = TRUE;
+  if(conn->handler->protocol&(CURLPROTO_HTTP|CURLPROTO_RTSP)) {
+    const struct HTTP *http = data->req.protop;
+
+    if(http->sending == HTTPSEND_REQUEST)
+      /* We're sending the HTTP request headers, not the data.
+         Remember that so we don't re-translate them into garbage. */
+      sending_http_headers = TRUE;
   }
 #endif