- update to 7.9.1

Changed files:
    curl-readtimeout-fix.patch -> 1.2

diff --git a/curl-readtimeout-fix.patch b/curl-readtimeout-fix.patch
index 88e16eb09467545c0720291e536d05e8ecd7c3c3..41303d40aae9ea20da22e453830a4d96351f03b8 100644 (file)
--- a/curl-readtimeout-fix.patch
+++ b/curl-readtimeout-fix.patch
@@ -1,31 +1,33 @@
---- lib/transfer.c     Wed Sep 12 14:02:12 2001
-+++ lib/transfer.c.mis Sat Oct 27 15:28:06 2001
-@@ -287,6 +287,7 @@
-       interval.tv_sec = 1;
-       interval.tv_usec = 0;
- 
-+      start = Curl_tvnow();
-       switch (select (maxfd, &readfd, &writefd, NULL, &interval)) {
-       case -1:                        /* select() error, stop reading */
- #ifdef EINTR
---- lib/ftp.c  Mon Sep 24 14:37:19 2001
-+++ lib/ftp.c.mis      Sat Oct 27 15:49:30 2001
-@@ -190,15 +190,9 @@
+diff -Nru curl-7.9.1.org/lib/ftp.c curl-7.9.1/lib/ftp.c
+--- curl-7.9.1.org/lib/ftp.c   Thu Nov  1 13:47:22 2001
++++ curl-7.9.1/lib/ftp.c       Sun Nov  4 20:24:56 2001
+@@ -200,15 +200,8 @@
    if (ftpcode)
      *ftpcode = 0; /* 0 for errors */
  
 -  if(data->set.timeout) {
 -    /* if timeout is requested, find out how much remaining time we have */
 -    timeout = data->set.timeout - /* timeout time */
--      (Curl_tvlong(Curl_tvnow()) - Curl_tvlong(conn->now)); /* spent time */
+-      Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */
 -    if(timeout <=0 ) {
 -      failf(data, "Transfer aborted due to timeout");
 -      return -SELECT_TIMEOUT; /* already too little time */
 -    }
 -  }
-+  if(data->set.timeout) 
++  if(data->set.timeout)
 +    timeout = data->set.timeout;
-+  
  
    FD_ZERO (&readfd);          /* clear it */
    FD_SET (sockfd, &readfd);     /* read socket */
+diff -Nru curl-7.9.1.org/lib/transfer.c curl-7.9.1/lib/transfer.c
+--- curl-7.9.1.org/lib/transfer.c      Sat Nov  3 00:09:39 2001
++++ curl-7.9.1/lib/transfer.c  Sun Nov  4 20:22:11 2001
+@@ -284,7 +284,7 @@
+       writefd = wkeepfd;
+       interval.tv_sec = 1;
+       interval.tv_usec = 0;
+-
++      start = Curl_tvnow();
+       switch (select (maxfd, &readfd, &writefd, NULL, &interval)) {
+       case -1:                        /* select() error, stop reading */
+ #ifdef EINTR