cc91854c275763be567dd246d23336660dea58a0 angie Wed May 22 12:25:00 2019 -0700 Adding hg.conf setting sessionDataDirOld so that isValidBigDataUrl won't complain about absolute paths of trashCleaner-saved files from old sessions. refs #22440 diff --git src/hg/lib/customFactory.c src/hg/lib/customFactory.c index 143203d..6ca66a9 100644 --- src/hg/lib/customFactory.c +++ src/hg/lib/customFactory.c @@ -2560,32 +2560,34 @@ } } boolean isValidBigDataUrl(char *url, boolean doAbort) /* return True if the URL is a valid bigDataUrl. * It can be a local filename if this is allowed by udc.localDir */ { if ((startsWith("http://", url) || startsWith("https://", url) || startsWith("ftp://", url))) return TRUE; // we allow bigDataUrl's to point to trash (or sessionDataDir, if configured) char *sessionDataDir = cfgOption("sessionDataDir"); +char *sessionDataDirOld = cfgOption("sessionDataDirOld"); if (startsWith(trashDir(), url) || - (isNotEmpty(sessionDataDir) && startsWith(sessionDataDir, url))) + (isNotEmpty(sessionDataDir) && startsWith(sessionDataDir, url)) || + (isNotEmpty(sessionDataDirOld) && startsWith(sessionDataDirOld, url))) return TRUE; char *prefix = cfgOption("udc.localDir"); if (prefix == NULL) { if (doAbort) errAbort("Only network protocols http, https, or ftp allowed in bigDataUrl: '%s'", url); return FALSE; } if (!startsWith(prefix, url)) { if (doAbort) errAbort("bigDataUrl '%s' on local file system has to start with '%s' (see udc.localDir directive in cgi-bin/hg.conf)", url, prefix); return FALSE;