]> git.pld-linux.org Git - packages/curl.git/commitdiff
- timeout bugfixes
authormis <mis@pld-linux.org>
Sat, 27 Oct 2001 14:06:58 +0000 (14:06 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    curl-readtimeout-fix.patch -> 1.1

curl-readtimeout-fix.patch [new file with mode: 0644]

diff --git a/curl-readtimeout-fix.patch b/curl-readtimeout-fix.patch
new file mode 100644 (file)
index 0000000..88e16eb
--- /dev/null
@@ -0,0 +1,31 @@
+--- 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 @@
+   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 */
+-    if(timeout <=0 ) {
+-      failf(data, "Transfer aborted due to timeout");
+-      return -SELECT_TIMEOUT; /* already too little time */
+-    }
+-  }
++  if(data->set.timeout) 
++    timeout = data->set.timeout;
++  
+   FD_ZERO (&readfd);          /* clear it */
+   FD_SET (sockfd, &readfd);     /* read socket */
This page took 0.038444 seconds and 4 git commands to generate.