Merge pull request #1624 from wyang007/master

Do not trigger DeepLocate with pss.origin is http(s)
xrootd · Feb 18, 2022 · 1a7f005 · 1a7f005
2 parents 753fd54 + 13d977a
commit 1a7f005
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/docs/PreReleaseNotes.txt b/docs/PreReleaseNotes.txt
@@ -37,6 +37,8 @@ Prerelease Notes
   **Commits: 48b1bf4a
   **[Proxy]** Allow for URLs with username.
   **Commits: 05a8c0ed
+  **[XrdPss]** Do not trigger DeepLocate when pss.origin is http(s)
+  **Commits: 753fd54
 
 + **Miscellaneous**
   **[GSI]** Comment out no longer needed trace record

diff --git a/src/XrdPss/XrdPssConfig.cc b/src/XrdPss/XrdPssConfig.cc
@@ -799,7 +799,8 @@ int XrdPssSys::xorig(XrdSysError *errp, XrdOucStream &Config)
 // of domain. Composite listings are normally disabled for out of domain nodes.
 //
    if (!index(mval, '.')
-   || !strcmp(XrdPssUtils::getDomain(mval), XrdPssUtils::getDomain(myHost)))
+   || (!strcmp(XrdPssUtils::getDomain(mval), XrdPssUtils::getDomain(myHost))
+       && !strcmp(protName, "http://") && !strcmp(protName, "https://")))
       XrdPosixConfig::SetEnv("DirlistDflt", 1);
 
 // All done