David Phillips' FD_SETSIZE fix

                                  Changelog

Daniel (18 November 2004)

- David Phillips fixed libcurl to not crash anymore when more than FD_SETSIZE

  file descriptors are in use. Test case 518 added to verify.

Daniel (15 November 2004)

- To test my fix for the CURLINFO_REDIRECT_TIME bug, I added time_redirect and

  num_redirects support to the -w writeout option for the command line tool.

This release includes the following bugfixes:

 o now gracefully bails out when exceeding FD_SETSIZE file descriptors

 o CURLINFO_REDIRECT_TIME works

 o building with gssapi libs and hdeaders in the default dirs

 o curl_getdate() parsing of dates later than year 2037 with 32 bit time_t

 Peter Wullinger, Guillaume Arluison, Alexander Krasnostavsky, Mohun Biswas,

 Tomas Pospisek, Gisle Vanem, Dan Fandrich, Paul Nolan, Andres Garcia,

 Tim Sneddon, Ian Gulliver, Jean-Philippe Barrette-LaPierre, Jeff Phillips

 Tim Sneddon, Ian Gulliver, Jean-Philippe Barrette-LaPierre, Jeff Phillips,

 Wojciech Zwiefka, David Phillips

        Thanks! (and sorry if I forgot to mention someone)

  memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c	\

  content_encoding.c share.c http_digest.c md5.c http_negotiate.c	\

  http_ntlm.c inet_pton.c strtoofft.c strerror.c hostares.c hostasyn.c	\

  hostip4.c hostip6.c hostsyn.c hostthre.c inet_ntop.c parsedate.c

  hostip4.c hostip6.c hostsyn.c hostthre.c inet_ntop.c parsedate.c	\

  select.c

HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h	\

  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\

  http_chunks.h strtok.h connect.h llist.h hash.h content_encoding.h	\

  share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h	\

  inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h	\

  setup.h transfer.h

  setup.h transfer.h select.h

#include "strerror.h"

#include "connect.h"

#include "memory.h"

#include "select.h"

/* The last #include file should be: */

#include "memdebug.h"

int waitconnect(curl_socket_t sockfd, /* socket */

                long timeout_msec)

{

  fd_set fd;

  fd_set errfd;

  struct timeval interval;

  int rc;

#ifdef mpeix

  /* Call this function once now, and ignore the results. We do this to

#endif

  /* now select() until we get connect or timeout */

  FD_ZERO(&fd);

  FD_SET(sockfd, &fd);

  FD_ZERO(&errfd);

  FD_SET(sockfd, &errfd);

  interval.tv_sec = (int)(timeout_msec/1000);

  timeout_msec -= interval.tv_sec*1000;

  interval.tv_usec = timeout_msec*1000;

  rc = select(sockfd+1, NULL, &fd, &errfd, &interval);

  rc = Curl_select(CURL_SOCKET_BAD, sockfd, timeout_msec);

  if(-1 == rc)

    /* error, no connect here, try next */

    return WAITCONN_SELECT_ERROR;

    /* timeout, no connect today */

    return WAITCONN_TIMEOUT;

  if(FD_ISSET(sockfd, &errfd))

  if(rc & CSELECT_ERR)

    /* error condition caught */

    return WAITCONN_FDSET_ERROR;

#ifdef HAVE_UNISTD_H

#include <unistd.h>

#endif

#ifdef HAVE_SYS_SELECT_H

#include <sys/select.h>

#endif

#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#include "strerror.h"

#include "memory.h"

#include "inet_ntop.h"

#include "select.h"

#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)

#include "inet_ntoa_r.h"

 */

static CURLcode AllowServerConnect(struct connectdata *conn)

{

  fd_set rdset;

  struct timeval dt;

  int timeout_ms;

  struct SessionHandle *data = conn->data;

  curl_socket_t sock = conn->sock[SECONDARYSOCKET];

  struct timeval now = Curl_tvnow();

  long timeout = data->set.connecttimeout?data->set.connecttimeout:

    (data->set.timeout?data->set.timeout: 0);

  FD_ZERO(&rdset);

  FD_SET(sock, &rdset);

  if(timeout) {

    timeout -= timespent;

    if(timeout<=0) {

  }

  /* we give the server 60 seconds to connect to us, or a custom timeout */

  dt.tv_sec = (int)(timeout?timeout:60);

  dt.tv_usec = 0;

  timeout_ms = (timeout?timeout:60) * 1000;

  switch (select(sock+1, &rdset, NULL, NULL, &dt)) {

  switch (Curl_select(sock, CURL_SOCKET_BAD, timeout_ms)) {

  case -1: /* error */

    /* let's die here */

    failf(data, "Error while waiting for server connect");

  ssize_t gotbytes;

  char *ptr;

  long timeout;              /* timeout in seconds */

  struct timeval interval;

  fd_set rkeepfd;

  fd_set readfd;

  int interval_ms;

  struct SessionHandle *data = conn->data;

  char *line_start;

  int code=0; /* default ftp "error code" to return */

  if (ftpcode)

    *ftpcode = 0; /* 0 for errors */

  FD_ZERO (&readfd);            /* clear it */

  FD_SET (sockfd, &readfd);     /* read socket */

  /* get this in a backup variable to be able to restore it on each lap in the

     select() loop */

  rkeepfd = readfd;

  ptr=buf;

  line_start = buf;

    }

    if(!ftp->cache) {

      readfd = rkeepfd;            /* set every lap */

      interval.tv_sec = 1; /* use 1 second timeout intervals */

      interval.tv_usec = 0;

      interval_ms = 1 * 1000;  /* use 1 second timeout intervals */

      switch (select (sockfd+1, &readfd, NULL, NULL, &interval)) {

      switch (Curl_select(sockfd, CURL_SOCKET_BAD, interval_ms)) {

      case -1: /* select() error, stop reading */

        result = CURLE_RECV_ERROR;

        failf(data, "FTP response aborted due to select() error: %d", errno);