From 7f0c7dddde8bb8d619b3449b3fb19aabe9fea686 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 2 Aug 2007 17:34:21 +0000
Subject: Bug 380375: The local XML file './data/bugzilla-update.xml' cannot be
created if the proxy requires authentication - Patch by Frédéric Buclin
r=mkanat a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/xml/administration.xml | 9 ++++++---
template/en/default/admin/params/core.html.tmpl | 3 ++-
template/en/default/index.html.tmpl | 4 +++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index 1fe8b9d72..9c85248a5 100644
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -1850,9 +1850,12 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT
upgrade_notification parameter, see
. Administrators will see these
notifications when they access the index.cgi
- page, i.e. generally when logging in. Bugzilla will check once a
- week for new releases, unless the parameter is set to
- disabled
.
+ page, i.e. generally when logging in. Bugzilla will check once per
+ day for new releases, unless the parameter is set to
+ disabled
. If you are behind a proxy, you may have to set
+ the proxy_url parameter accordingly. If the proxy
+ requires authentication, use the
+ http://user:pass@proxy_url/ syntax.
diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index 9ad312cfb..3fe66de27 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -92,7 +92,8 @@
proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _
"releases, see the upgrade_notification parameter. In case you are " _
"behind a proxy, it may be necessary to enter its URL if the web server " _
- "group cannot access the HTTP_PROXY environment variable.",
+ "group cannot access the HTTP_PROXY environment variable. If you have to " _
+ "authenticate, use the http://user:pass@proxy_url/
syntax.",
upgrade_notification => "$terms.Bugzilla can inform you when a new release is available. " _
"The notification will appear on the $terms.Bugzilla homepage, " _
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 132b77c74..c8448398f 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -80,7 +80,9 @@ function addSidebar() {
notify you about new releases.
[% ELSIF release.error == "cannot_download" %]
The local XML file '[% release.xml_file FILTER html %]' cannot be created.
- Please make sure the web server can write in this directory.
+ Please make sure the web server can write in this directory and that you can access
+ the web. If you are behind a proxy, set the
+ proxy_url parameter correctly.
[% ELSIF release.error == "no_update" %]
The local XML file '[% release.xml_file FILTER html %]' cannot be updated.
Please make sure the web server can edit this file.
--
cgit v1.2.3-24-g4f1b