5faaad7e4a0cde71c69f9c73db7fe94cf5db8bdc angie Thu Jun 9 11:42:40 2016 -0700 Revert "Added checking of wiki.loggedInCookie (numeric user ID) using random numbers as suggested by Max" This reverts commit a240964d6dfdd6f8661487b64538d33518d88501. Conflicts: src/hg/hgSession/hgSession.c -- doSessionDetail was moved up by Jonathan's changes, so it needed to be changed to get userName the old way. diff --git src/hg/lib/cart.c src/hg/lib/cart.c index b915d5e..2074c8c 100644 --- src/hg/lib/cart.c +++ src/hg/lib/cart.c @@ -1544,37 +1544,30 @@ cookieName, userIdKey, domain, cookieDate()); else printf("Set-Cookie: %s=%s; path=/; expires=%s\r\n", cookieName, userIdKey, cookieDate()); } if (geoMirrorEnabled()) { // This occurs after the user has manually choosen to go back to the original site; we store redirect value into a cookie so we // can use it in subsequent hgGateway requests before loading the user's cart char *redirect = cgiOptionalString("redirect"); if (redirect) { printf("Set-Cookie: redirect=%s; path=/; domain=%s; expires=%s\r\n", redirect, cgiServerName(), cookieDate()); } } -/* Validate login cookies if login is enabled */ -if (loginSystemEnabled()) - { - char *loginCookieString = loginSystemValidateCookies(); - if (loginCookieString) - printf("Set-Cookie: %s", loginCookieString); - } } struct cart *cartForSession(char *cookieName, char **exclude, struct hash *oldVars) /* This gets the cart without writing any HTTP lines at all to stdout. */ { 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()); char *httpProxy = cfgOption("httpProxy"); /* most cgis call this routine */ if (httpProxy) setenv("http_proxy", httpProxy, TRUE); /* net.c cannot see the cart, pass the value through env var */