aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-09-28 22:26:47 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-09-28 22:26:47 +0000
commit2576ac1c76953e573668f8f016f822bc2f2403f6 (patch)
treef84deb90042e3aa0cbe0f238b8fda8293a932bcb
parentbfeea8e6b72208c04f3f577852587a33fad82c82 (diff)
Bertrand Demiddelaer fixed curl_easy_reset() so that it doesn't mistakingly
enable the progress meter.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES5
-rw-r--r--lib/easy.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b9c091fbc..77de7496b 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 69bfe18eb..bf840903f 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 53bd13b93..4782fc459 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;