filetime should be -1 if the remote time was unknown as 0 is actually a

valid time. we now store the filetime as a long to know for sure it can
hold -1 (there exist some unsigned time_t cases)

diff --git a/lib/getinfo.c b/lib/getinfo.c
index 88a139e3aab80bf7ab6e2597e20c3b528e042a20..6149073ac6cb9aa18e2c87043be8fc063b35218f 100644 (file)
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -46,7 +46,7 @@ CURLcode Curl_initinfo(struct SessionHandle *data)
 
   info->httpcode = 0;
   info->httpversion=0;
-  info->filetime=0;
+  info->filetime=-1; /* -1 is an illegal time and thus means unknown */
 
   return CURLE_OK;
 }

diff --git a/lib/transfer.c b/lib/transfer.c
index c42970c5872fb7231da9749e47c8d1fde267b925..dc628982b2fb30b63ab761dc06699a4e512769b5 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -627,7 +627,7 @@ Transfer(struct connectdata *c_conn)
                       (data->set.timecondition || data->set.get_filetime) ) {
                 time_t secs=time(NULL);
                 timeofdoc = curl_getdate(p+strlen("Last-Modified:"), &secs);
-                if(data->set.get_filetime)
+                if(data->set.get_filetime>=0)
                   data->info.filetime = timeofdoc;
               }
               else if ((httpcode >= 300 && httpcode < 400) &&

diff --git a/lib/urldata.h b/lib/urldata.h
index ed0099ddd17a8f56ad9ecb3b2024cd229e29370c..1bb51b44dbcab6e6da3ddd0ea53dcf837e665afe 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -352,8 +352,8 @@ struct connectdata {
 struct PureInfo {
   int httpcode;
   int httpversion;
-  time_t filetime; /* If requested, this is might get set. It may be 0 if
-                      the time was unretrievable */
+  long filetime; /* If requested, this is might get set. Set to -1 if
+                    the time was unretrievable */
   long header_size;  /* size of read header(s) in bytes */
   long request_size; /* the amount of bytes sent in the request(s) */
 };