Order of precedence

merge-requests/8/head
Bob Mottram 2021-01-07 11:24:10 +00:00
parent 05aef23532
commit 428fb88f2c
1 changed files with 7 additions and 7 deletions

View File

@ -9730,13 +9730,6 @@ class PubServer(BaseHTTPRequestHandler):
GETstartTime, GETtimings) GETstartTime, GETtimings)
return return
# favicon image
if 'favicon.ico' in self.path:
self._getFavicon(callingDomain, self.server.baseDir,
self.server.debug,
'favicon.ico')
return
# default newswire favicon, for links to sites which # default newswire favicon, for links to sites which
# have no favicon # have no favicon
if 'newswire_favicon.ico' in self.path: if 'newswire_favicon.ico' in self.path:
@ -9745,6 +9738,13 @@ class PubServer(BaseHTTPRequestHandler):
'newswire_favicon.ico') 'newswire_favicon.ico')
return return
# favicon image
if 'favicon.ico' in self.path:
self._getFavicon(callingDomain, self.server.baseDir,
self.server.debug,
'favicon.ico')
return
# check authorization # check authorization
authorized = self._isAuthorized() authorized = self._isAuthorized()
if self.server.debug: if self.server.debug: