diff options
| author |   Gervase Markham <gerv@gerv.net> | 2015-08-07 11:13:20 +0100 |
|---|---|---|
| committer | Gervase Markham <gerv@gerv.net> | 2015-08-07 11:13:20 +0100 |
| commit | 2d2c85f63dbde9b49079a0ab0c8c5ddcda33acec (patch) | |
| tree | 23c6bed69f7543c086716dc6c52e32f95267e2a1 /Bugzilla | |
| parent | Bug 1189813: Include javascript_urls in header.html.tmpl DEFAULT directive (diff) | |
| download | bugzilla-2d2c85f63dbde9b49079a0ab0c8c5ddcda33acec.tar.gz bugzilla-2d2c85f63dbde9b49079a0ab0c8c5ddcda33acec.tar.bz2 bugzilla-2d2c85f63dbde9b49079a0ab0c8c5ddcda33acec.zip | |
Bug 1191255 - Remove requirement to specify SMTP server during installation on Windows. r=LpSolit, a=simon
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Config.pm | 21 | ||||
| -rw-r--r-- | Bugzilla/Config/Common.pm | 4 |
2 files changed, 3 insertions, 22 deletions
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm index 1e22b5239..b4ff803bd 100644 --- a/Bugzilla/Config.pm +++ b/Bugzilla/Config.pm @@ -266,27 +266,6 @@ sub update_params { $op_file->close; } - if (ON_WINDOWS && !-e SENDMAIL_EXE - && $param->{'mail_delivery_method'} eq 'Sendmail') - { - my $smtp = $answer->{'SMTP_SERVER'}; - if (!$smtp) { - print "\nBugzilla requires an SMTP server to function on", - " Windows.\nPlease enter your SMTP server's hostname: "; - $smtp = <STDIN>; - chomp $smtp; - if ($smtp) { - $param->{'smtpserver'} = $smtp; - } - else { - print "\nWarning: No SMTP Server provided, defaulting to", - " localhost\n"; - } - } - - $param->{'mail_delivery_method'} = 'SMTP'; - } - write_params($param); if (-e $old_file) { diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm index 414894773..a5b32c1db 100644 --- a/Bugzilla/Config/Common.pm +++ b/Bugzilla/Config/Common.pm @@ -299,7 +299,7 @@ sub check_mail_delivery_method { my $check = check_multi(@_); return $check if $check; my $mailer = shift; - if ($mailer eq 'sendmail' and ON_WINDOWS) { + if ($mailer eq 'Sendmail' and ON_WINDOWS) { # look for sendmail.exe return "Failed to locate " . SENDMAIL_EXE unless -e SENDMAIL_EXE; @@ -346,6 +346,8 @@ sub check_smtp_server { my $host = shift; my $port; + return '' unless $host; + if ($host =~ /:/) { ($host, $port) = split(/:/, $host, 2); unless ($port && detaint_natural($port)) { |