a28f852664b23a2c5952b1f6ea4bb47636ddd51e angie Fri Jun 23 10:22:15 2017 -0700 Use cgiScriptDirUrl() instead of "/cgi-bin/". refs #19647 diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index a571f23..f5de944 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -3337,32 +3337,32 @@ char *hLoginHostCgiBinUrl() /* Return the current full absolute URL of the cgi-bin directory of the host * used for logins. Genome-euro/genome-asia use genome.ucsc.edu for the login, * as we have only one single server for user accounts. * Returns a string in the format * http(s)://<host>/cgi-bin/ e.g. http://genome.ucsc.edu/cgi-bin/ * - the <host> is coming from the wiki.host variable in hg.conf. * - https is used unless login.useHttps=off in hg.conf * * If login.relativeLink=on is set, return only the empty string. * (see hLocalCgiBinUrl) * Result has to be free'd. */ { char buf[2048]; -safef(buf, sizeof(buf), "http%s://%s/cgi-bin/", - loginUseHttps() ? "s" : "", wikiLinkHost()); +safef(buf, sizeof(buf), "http%s://%s%s", + loginUseHttps() ? "s" : "", wikiLinkHost(), cgiScriptDirUrl()); return cloneString(buf); } boolean hHostHasPrefix(char *prefix) /* Return TRUE if this is running on web-server with host name prefix */ { if (prefix == NULL) return FALSE; char *httpHost = hHttpHost(); if (httpHost == NULL) return FALSE; return startsWith(prefix, httpHost); }