a18cdd4441c5dfa23fd9112d12e01f1123568519 galt Mon Nov 5 13:13:03 2012 -0800 removing the new connFailures capability. it is difficult to distinguish failing sites from struggling sites with this approach -- so leave it out for now. diff --git src/lib/https.c src/lib/https.c index fbe4a36..6f750f2 100644 --- src/lib/https.c +++ src/lib/https.c @@ -240,32 +240,30 @@ tv.tv_sec = (long) (DEFAULTCONNECTTIMEOUTMSEC/1000); // timeout default 10 seconds tv.tv_usec = (long) (((DEFAULTCONNECTTIMEOUTMSEC/1000)-tv.tv_sec)*1000000); err = select(max(fd,params->sv[1]) + 1, &readfds, &writefds, NULL, &tv); /* Evaluate select() return code */ if (err < 0) { xerr("error during select()"); goto cleanup; } else if (err == 0) { /* Timed out - just quit */ - addConnFailure(params->hostName, params->port, - "https timeout expired"); xerr("https timeout expired"); goto cleanup; } else { if (FD_ISSET(params->sv[1], &readfds)) { swt = 0; srd = read(params->sv[1], sbuf, 32768); if (srd == -1) { if (errno != 104) // udcCache often closes causing "Connection reset by peer" xerrno("error reading https socket"); goto cleanup; @@ -335,37 +333,30 @@ } } } cleanup: BIO_free_all(sbio); close(params->sv[1]); /* we are done with it */ return NULL; } int netConnectHttps(char *hostName, int port) /* Return socket for https connection with server or -1 if error. */ { -char *errorString = NULL; -if (checkConnFailure(hostName, port, &errorString)) - { - warn("%s", errorString); - return -1; - } - fflush(stdin); fflush(stdout); fflush(stderr); struct netConnectHttpsParams *params; AllocVar(params); params->hostName = cloneString(hostName); params->port = port; socketpair(AF_UNIX, SOCK_STREAM, 0, params->sv); int rc; rc = pthread_create(¶ms->thread, NULL, netConnectHttpsThread, (void *)params); if (rc)