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 084b6c527e1507cfae9d9a9e03559787270023a1..832470d9b90d9f52e07061d8ac2ae6bb95f7b9b9 100644 (file)
--- 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 521502b45df77fff3ca1ee1aca1937713b837d0c..e72a56b2476b2e5d267af33b9d999b857a1e977b 100644 (file)
--- 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 2fbc2c6156e2e48cd4c90f4856c25c15e02e7f4a..65c89993473f0ed34309534a886813e7bee781b2 100644 (file)
--- 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: