From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 28 Sep 2004 22:26:47 +0000 (+0000)
Subject: Bertrand Demiddelaer fixed curl_easy_reset() so that it doesn't mistakingly
X-Git-Tag: upstream/7.37.1~12095
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2576ac1c76953e573668f8f016f822bc2f2403f6;p=platform%2Fupstream%2Fcurl.git

Bertrand Demiddelaer fixed curl_easy_reset() so that it doesn't mistakingly
enable the progress meter.
---

diff --git a/CHANGES b/CHANGES
index b9c091f..77de749 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (29 September 2004)
+- Bertrand Demiddelaer fixed curl_easy_reset() so that it doesn't mistakingly
+  enable the progress meter.
+
 Daniel (28 September 2004)
 - "Mekonikum" found out that if you built curl without SSL support, although
   your current SSL installation supports Engine, the compile fails.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69bfe18..bf84090 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,9 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o curl_easy_reset() no longer enables the progress meter
+ o build fix for SSL disabled curl with SSL Engine support present
+ o configure --with-ssl=PATH now ignores pkg-config path info
  o CURLOPT_SSLENGINE can be set to NULL even if no engine support is available
  o LDAP crash when more than one record was received
  o connect failures properly stores an error message in the errorbuffer
@@ -43,6 +46,6 @@ advice from friends like these:
  Casey O'Donnell, Roland Krikava, Alex, Alexander Krasnostavsky, Kjetil
  Jacobsen, Ling Thio, Roman Koifman, Harshal Pradhan, Jonas Forsman, David
  Tarendash, Daniel at touchtunes, Bertrand Demiddelaer, Andreas Rieke,
- Jean-Claude Chauve, Dan Fandrich, Peter Sylvester
+ Jean-Claude Chauve, Dan Fandrich, Peter Sylvester, "Mekonikum"
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/easy.c b/lib/easy.c
index 53bd13b..4782fc4 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -77,6 +77,7 @@
 #include "hostip.h"
 #include "share.h"
 #include "memory.h"
+#include "progress.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
@@ -561,6 +562,7 @@ void curl_easy_reset(CURL *curl)
 
   /* make libcurl quiet by default: */
   data->set.hide_progress = TRUE;  /* CURLOPT_NOPROGRESS changes these */
+  data->progress.flags |= PGRS_HIDE;
 
   /* Set the default size of the SSL session ID cache */
   data->set.ssl.numsessions = 5;