correct proxy info

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@566 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin 2002-09-26 20:06:52 +00:00
parent 481d5bec34
commit 4e6ae8e953
5 changed files with 25 additions and 13 deletions

View file

@ -74,6 +74,7 @@ upload: distclean dist files VERSION
scp README $(HTMLDIR)/readme.txt scp README $(HTMLDIR)/readme.txt
scp linkchecker-out.*.gz $(HTMLDIR) scp linkchecker-out.*.gz $(HTMLDIR)
scp VERSION $(HTMLDIR)/raw/ scp VERSION $(HTMLDIR)/raw/
scp $(MD5SUMS) $(HTMLDIR)/
#scp dist/* $(HTMLDIR)/ #scp dist/* $(HTMLDIR)/
ncftpput upload.sourceforge.net /incoming dist/* && read -p "Make new SF file releases and then press Enter:" ncftpput upload.sourceforge.net /incoming dist/* && read -p "Make new SF file releases and then press Enter:"
ssh -C -t shell1.sourceforge.net "cd $(PACKAGEDIR) && make" ssh -C -t shell1.sourceforge.net "cd $(PACKAGEDIR) && make"

View file

@ -83,6 +83,8 @@ class HttpUrlData (UrlData):
""" """
# set the proxy, so a 407 status after this is an error # set the proxy, so a 407 status after this is an error
self._setProxy(self.config["proxy"].get(self.scheme)) self._setProxy(self.config["proxy"].get(self.scheme))
if self.proxy:
self.setInfo(linkcheck._("Using HTTP Proxy %s")%`self.proxy`)
self.headers = None self.headers = None
self.auth = None self.auth = None
self.cookies = [] self.cookies = []
@ -100,6 +102,7 @@ class HttpUrlData (UrlData):
if status == 305 and self.headers: if status == 305 and self.headers:
oldproxy = (self.proxy, self.proxyauth) oldproxy = (self.proxy, self.proxyauth)
self._setProxy(self.headers.getheader("Location")) self._setProxy(self.headers.getheader("Location"))
self.setInfo(linkcheck._("Enforced HTTP Proxy %s")%`self.proxy`)
status, statusText, self.headers = self._getHttpRequest() status, statusText, self.headers = self._getHttpRequest()
self.proxy, self.proxyauth = oldproxy self.proxy, self.proxyauth = oldproxy
# follow redirections # follow redirections
@ -212,7 +215,6 @@ class HttpUrlData (UrlData):
""" """
if self.proxy: if self.proxy:
host = self.proxy host = self.proxy
self.setInfo(linkcheck._("Using HTTP Proxy %s")%`self.proxy`)
else: else:
host = self.urlTuple[1] host = self.urlTuple[1]
Config.debug(HURT_ME_PLENTY, "host", host) Config.debug(HURT_ME_PLENTY, "host", host)

View file

@ -4,7 +4,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" "POT-Creation-Date: Thu Sep 26 22:05:37 2002\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Bastian Kleineidam <calvin@users.sourceforge.net>\n" "Last-Translator: Bastian Kleineidam <calvin@users.sourceforge.net>\n"
"Language-Team: LANGUAGE <de@li.org>\n" "Language-Team: LANGUAGE <de@li.org>\n"
@ -39,9 +39,15 @@ msgstr "gefunden"
msgid "Path is empty" msgid "Path is empty"
msgstr "Pfad ist leer" msgstr "Pfad ist leer"
msgid "Using HTTP Proxy %s"
msgstr "Verwende HTTP Proxy %s"
msgid "Access denied by robots.txt, checked only syntax" msgid "Access denied by robots.txt, checked only syntax"
msgstr "Zugriff verweigert durch robots.txt; prüfe lediglich Syntax" msgstr "Zugriff verweigert durch robots.txt; prüfe lediglich Syntax"
msgid "Enforced HTTP Proxy %s"
msgstr "Erzwungener HTTP Proxy %s"
msgid "too much redirections (>= 5)" msgid "too much redirections (>= 5)"
msgstr "zu viele Weiterleitungen (>= 5)" msgstr "zu viele Weiterleitungen (>= 5)"
@ -71,9 +77,6 @@ msgstr ""
"URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um " "URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um "
"Weiterleitungen zu verhindern" "Weiterleitungen zu verhindern"
msgid "Using HTTP Proxy %s"
msgstr "Verwende HTTP Proxy %s"
msgid "Unsupported content encoding %s." msgid "Unsupported content encoding %s."
msgstr "Content-Encoding %s wird nicht unterstützt." msgstr "Content-Encoding %s wird nicht unterstützt."

View file

@ -4,7 +4,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" "POT-Creation-Date: Thu Sep 26 22:05:37 2002\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <fr@li.org>\n" "Language-Team: LANGUAGE <fr@li.org>\n"
@ -39,9 +39,15 @@ msgstr "trouv
msgid "Path is empty" msgid "Path is empty"
msgstr "" msgstr ""
msgid "Using HTTP Proxy %s"
msgstr ""
msgid "Access denied by robots.txt, checked only syntax" msgid "Access denied by robots.txt, checked only syntax"
msgstr "Accès refusé par robots.txt, analyse de la syntaxe seulement" msgstr "Accès refusé par robots.txt, analyse de la syntaxe seulement"
msgid "Enforced HTTP Proxy %s"
msgstr ""
msgid "too much redirections (>= 5)" msgid "too much redirections (>= 5)"
msgstr "" msgstr ""
@ -67,9 +73,6 @@ msgid ""
"redirection" "redirection"
msgstr "" msgstr ""
msgid "Using HTTP Proxy %s"
msgstr ""
msgid "Unsupported content encoding %s." msgid "Unsupported content encoding %s."
msgstr "" msgstr ""

View file

@ -4,7 +4,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: Thu Sep 26 18:43:36 2002\n" "POT-Creation-Date: Thu Sep 26 22:05:37 2002\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Hans Bausewein <hans.bausewein@comerwell.xs4all.nl>\n" "Last-Translator: Hans Bausewein <hans.bausewein@comerwell.xs4all.nl>\n"
"Language-Team: LANGUAGE <nl@li.org>\n" "Language-Team: LANGUAGE <nl@li.org>\n"
@ -39,9 +39,15 @@ msgstr "gevonden"
msgid "Path is empty" msgid "Path is empty"
msgstr "" msgstr ""
msgid "Using HTTP Proxy %s"
msgstr ""
msgid "Access denied by robots.txt, checked only syntax" msgid "Access denied by robots.txt, checked only syntax"
msgstr "Toegang geweigerd door robots.txt; alleen syntax gecontroleerd" msgstr "Toegang geweigerd door robots.txt; alleen syntax gecontroleerd"
msgid "Enforced HTTP Proxy %s"
msgstr ""
msgid "too much redirections (>= 5)" msgid "too much redirections (>= 5)"
msgstr "te veel verwijzingen (>= 5)" msgstr "te veel verwijzingen (>= 5)"
@ -70,9 +76,6 @@ msgstr ""
"URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um " "URLs, die auf (Home-) Verzeichnisse verweisen, sollten mit einem / enden, um "
"Weiterleitungen zu verhindern" "Weiterleitungen zu verhindern"
msgid "Using HTTP Proxy %s"
msgstr ""
msgid "Unsupported content encoding %s." msgid "Unsupported content encoding %s."
msgstr "" msgstr ""