6b5d81231f6dcb4895d9522b80b2552711a4e87e max Tue Aug 6 03:22:14 2024 -0700 adding resolvPrefix to our hg.conf statements for the udc resolver, refs #34240 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index e7d1630..ae0841b 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -660,34 +660,35 @@ char *cacheDir = getenv("UDC_CACHEDIR"); if (isEmpty(cacheDir)) cacheDir = cfgOptionDefault("udc.cacheDir", udcDefaultDir()); udcSetDefaultDir(cacheDir); } else udcDisableCache(); } void setUdcOptions(struct cart *cart) /* do udc setup: set timeout and resolver and anything else that requires cart or hg.conf */ { setUdcTimeout(cart); char *prots = cfgOption("resolvProts"); +char *prefix = cfgOption("resolvPrefix"); char *cmd = cfgOption("resolvCmd"); -if (prots && cmd) - udcSetResolver(prots, cmd); +if ((prots && cmd) || (prefix && cmd)) + udcSetResolver(prots, prefix, cmd); } char *wrapWhiteFont(char *s) /* Write white font around s */ { static char buf[256]; safef(buf, sizeof(buf), "%s", s); return buf; } char *hDocumentRoot() /* get the path to the DocumentRoot, or the default */ { return cfgOptionDefault("browser.documentRoot", DOCUMENT_ROOT);