- Alexey Simak fixed curl_easy_reset() to reset the max redirect limit properly

3 files changed, 8 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index 7f59f6b09..e55a993e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@
                                   Changelog
 
 Daniel Stenberg (5 Apr 2008)
+- Alexey Simak fixed curl_easy_reset() to reset the max redirect limit properly
+
 - Based on the Debian bug report #474224 that complained about the FTP error
   message when libcurl doesn't get a 220 back immediately on connect, I now
   changed it to be more specific on what the problem is. Also worth noticing:
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 912983ad0..8f4056fc4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -17,6 +17,7 @@ This release includes the following bugfixes:
 
  o CURLOPT_NOBODY first set to TRUE and then FALSE for HTTP no longer causes
    the confusion that could lead to a hung transfer
+ o curl_easy_reset() resets the max redirect limit properly
 
 This release includes the following known bugs:
 
@@ -33,6 +34,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Michal Marek, Daniel Fandrich, Scott Barrett
+ Michal Marek, Daniel Fandrich, Scott Barrett, Alexey Simak
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/easy.c b/lib/easy.c
index 145619c85..65fde81fb 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -715,9 +715,9 @@ void curl_easy_reset(CURL *curl)
   /* use fread as default function to read input */
   data->set.fread_func = (curl_read_callback)fread;
 
-  data->set.infilesize = -1; /* we don't know any size */
-  data->set.postfieldsize = -1;
-
+  data->set.infilesize = -1;      /* we don't know any size */
+  data->set.postfieldsize = -1;   /* unknown size */
+  data->set.maxredirs = -1;       /* allow any amount by default */
   data->state.current_speed = -1; /* init to negative == impossible */
 
   data->set.httpreq = HTTPREQ_GET; /* Default HTTP request */
@@ -733,7 +733,7 @@ void curl_easy_reset(CURL *curl)
   /* Set the default size of the SSL session ID cache */
   data->set.ssl.numsessions = 5;
 
-  data->set.proxyport = 1080;
+  data->set.proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */
   data->set.proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
   data->set.httpauth = CURLAUTH_BASIC;  /* defaults to basic */
   data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */