b535013b6598af52d63ad9865b8377b83d84fa2d max Mon Jun 19 10:25:52 2017 -0700 fixing a few more things in hgLogin/hgSession: empty returnto url uses the new function, fixing typo in hLoginHostCgiBinUrl removing hgLogin from URL, removing the slash in loginUrl() as hLoginHostCgiBinUrl adds a slash already, refs #19632 diff --git src/hg/lib/wikiLink.c src/hg/lib/wikiLink.c index fd98553..33f27e0 100644 --- src/hg/lib/wikiLink.c +++ src/hg/lib/wikiLink.c @@ -288,31 +288,31 @@ if (isEmpty(wikiHost) || sameString(wikiHost, "HTTPHOST")) wikiHost = hHttpHost(); return cloneString(wikiHost); } boolean loginUseHttps() /* Return TRUE unless https is disabled in hg.conf. */ { return cfgOptionBooleanDefault(CFG_LOGIN_USE_HTTPS, TRUE); } static char *loginUrl() /* Return the URL for the login host. */ { char buf[2048]; -safef(buf, sizeof(buf), "%s/hgLogin", hLoginHostCgiBinUrl()); +safef(buf, sizeof(buf), "%shgLogin", hLoginHostCgiBinUrl()); return cloneString(buf); } char* getHttpBasicToken() /* Return HTTP Basic Auth Token or NULL. Result has to be freed. */ { char *auth = getenv("HTTP_AUTHORIZATION"); // e.g. "Basic bwF4OmQxUglhanM=" if (auth==NULL) return NULL; char *token = cloneNotFirstWord(auth); if (isEmpty(token)) { fprintf(stderr, "wikiLinkc.: Illegal format of HTTP Authorization Header?"); return NULL;