4fdbee9b0b51fa1a9d8da8e366a27e9abf306b80 galt Wed Mar 22 16:00:15 2017 -0700 too much hassle to bother with for now. needs code from kent stuff. diff --git src/htslib/knetfile.c src/htslib/knetfile.c index cdd1617..7749aac 100644 --- src/htslib/knetfile.c +++ src/htslib/knetfile.c @@ -394,33 +394,30 @@ knetFile *fp; char *p, *proxy, *q; int l; if (strstr(fn, "http://") != fn) return 0; // set ->http_host for (p = (char*)fn + 7; *p && *p != '/'; ++p); l = p - fn - 7; fp = (knetFile*)calloc(1, sizeof(knetFile)); fp->http_host = (char*)calloc(l + 1, 1); strncpy(fp->http_host, fn + 7, l); fp->http_host[l] = 0; for (q = fp->http_host; *q && *q != ':'; ++q); if (*q == ':') *q++ = 0; // get http_proxy proxy = getenv("http_proxy"); - if (checkNoProxy(fp->http_host)) - proxy = NULL; -/* See if host endsWith element on no_proxy list. */ // set ->host, ->port and ->path if (proxy == 0) { fp->host = strdup(fp->http_host); // when there is no proxy, server name is identical to http_host name. fp->port = strdup(*q? q : "80"); fp->path = strdup(*p? p : "/"); } else { fp->host = (strstr(proxy, "http://") == proxy)? strdup(proxy + 7) : strdup(proxy); for (q = fp->host; *q && *q != ':'; ++q); if (*q == ':') *q++ = 0; fp->port = strdup(*q? q : "80"); fp->path = strdup(fn); } fp->type = KNF_TYPE_HTTP; fp->ctrl_fd = fp->fd = -1; fp->seek_offset = 0;