36071edc0403574d51170357bab076e39d076826 galt Thu Mar 23 16:42:09 2017 -0700 Adds ftp proxy capability to system. Works with Squid 3.5 ftp_port at least. refs #19124 diff --git src/hg/lib/cart.c src/hg/lib/cart.c index 54e5f99..522e5f2 100644 --- src/hg/lib/cart.c +++ src/hg/lib/cart.c @@ -1608,30 +1608,33 @@ char *hguid = getCookieId(cookieName); char *hgsid = getSessionId(); struct cart *cart = cartNew(hguid, hgsid, exclude, oldVars); cartExclude(cart, sessionVar); if (sameOk(cfgOption("signalsHandler"), "on")) /* most cgis call this routine */ initSigHandlers(hDumpStackEnabled()); /* Proxy Settings * Most cgis call this routine * net.c cannot see the cart, pass the value through env var */ char *httpProxy = cfgOption("httpProxy"); if (httpProxy) setenv("http_proxy", httpProxy, TRUE); char *httpsProxy = cfgOption("httpsProxy"); if (httpsProxy) setenv("https_proxy", httpsProxy, TRUE); +char *ftpProxy = cfgOption("ftpProxy"); +if (ftpProxy) + setenv("ftp_proxy", ftpProxy, TRUE); char *noProxy = cfgOption("noProxy"); if (noProxy) setenv("no_proxy", noProxy, TRUE); return cart; } struct cart *cartAndCookieWithHtml(char *cookieName, char **exclude, struct hash *oldVars, boolean doContentType) /* Load cart from cookie and session cgi variable. Write cookie * and optionally content-type part HTTP preamble to web page. Don't * write any HTML though. */ { // Note: early abort works fine but early warn does not htmlPushEarlyHandlers(); struct cart *cart = cartForSession(cookieName, exclude, oldVars);