From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 19 Feb 2006 23:16:48 +0000 (+0000)
Subject: Shmulik Regev fixed an issue with multi-pass authentication and compressed
X-Git-Tag: curl-7_15_2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29e446e508d42b960d4a8a097586606da561c7ab;p=thirdparty%2Fcurl.git

Shmulik Regev fixed an issue with multi-pass authentication and compressed
content when libcurl didn't honor the internal ignorebody flag.
---

diff --git a/CHANGES b/CHANGES
index 084b6c527e..832470d9b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (20 February 2006)
+- Shmulik Regev fixed an issue with multi-pass authentication and compressed
+  content when libcurl didn't honor the internal ignorebody flag.
+
 Daniel (18 February 2006)
 - Ulf Härnhammar fixed a format string (printf style) problem in the Negotiate
   code. It should however not be the cause of any troubles. He also fixed a
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 521502b45d..e72a56b247 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o multi-pass authentication and compressed content
  o minor format string mistake in the GSS/Negotiate code
  o cached DNS entries could remain in the cache too long
  o improved GnuTLS check in configure
@@ -64,6 +65,6 @@ advice from friends like these:
  Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan
  Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,
  David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher, Kent
- Boortz, Karl Moerder, Shmulik Regev, Ulf Härnhammar
+ Boortz, Karl Moerder, Shmulik Regev, Ulf Härnhammar, Shmulik Regev
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/transfer.c b/lib/transfer.c
index 2fbc2c6156..65c8999347 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1158,12 +1158,14 @@ CURLcode Curl_readwrite(struct connectdata *conn,
 
               case DEFLATE:
                 /* Assume CLIENTWRITE_BODY; headers are not encoded. */
-                result = Curl_unencode_deflate_write(data, k, nread);
+                if(!k->ignorebody)
+                  result = Curl_unencode_deflate_write(data, k, nread);
                 break;
 
               case GZIP:
                 /* Assume CLIENTWRITE_BODY; headers are not encoded. */
-                result = Curl_unencode_gzip_write(data, k, nread);
+                if(!k->ignorebody)
+                  result = Curl_unencode_gzip_write(data, k, nread);
                 break;
 
               case COMPRESS: