Unverified Commit e4169a8f authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #916 from ikedas/pr-910_add-1 by ikedas

Replace `http_host` parameter with `wwsympa_url_local` parameter (addition to #910)
parents 18e03550 42f47f11
......@@ -1377,10 +1377,9 @@ our @params = (
'gettext_comment' =>
'This is used to construct URLs of web interface.',
},
{ 'name' => 'http_host',
{ 'name' => 'wwsympa_url_local',
'gettext_id' => 'URL prefix of WWSympa behind proxy',
'vhost' => '1',
'file' => 'sympa.conf',
'optional' => '1',
},
{ 'name' => 'static_content_url',
......@@ -2223,6 +2222,10 @@ our @params = (
{ 'name' => 'filesystem_encoding',
'default' => 'utf-8',
},
{ 'name' => 'http_host', # ??? - 6.2.54
'vhost' => '1',
'optional' => '1',
},
#FIXME: Is it currently available?
{ 'name' => 'automatic_list_prefix',
......
......@@ -36,11 +36,13 @@ sub new {
my $self = $class->SUPER::new(@args);
# Determin mail domain (a.k.a. "robot") the request is dispatched.
# N.B. As of 6.2.15, the http_host parameter will match with the host name
# N.B. As of 6.2.15, the http_host parameter (replaced with
# wwsympa_url_local parameter on 6.2.55b) will match with the host name
# and path locally detected by server. If remotely detected host name
# and / or path should be differ, the proxy must adjust them.
# N.B. As of 6.2.34, wwsympa_url parameter may be optional.
my @vars = Sympa::WWW::Tools::get_robot('http_host', 'wwsympa_url');
my @vars =
Sympa::WWW::Tools::get_robot('wwsympa_url_local', 'wwsympa_url');
if (@vars) {
@ENV{qw(ORIG_SCRIPT_NAME ORIG_PATH_INFO)} =
@ENV{qw(SCRIPT_NAME PATH_INFO)};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment