From a656f7a4d499566863e740b0a2a491a535e3ac43 Mon Sep 17 00:00:00 2001 From: Tiago Mello Date: Wed, 18 Jan 2012 19:32:46 -0200 Subject: Bug 718905: Move user_preferences hook up, before other actions in userprefs.cgi r=dkl, a=LpSolit --- userprefs.cgi | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/userprefs.cgi b/userprefs.cgi index 94fe1def2..f0d5a8e53 100755 --- a/userprefs.cgi +++ b/userprefs.cgi @@ -514,6 +514,16 @@ check_token_data($token, 'edit_user_prefs') if $save_changes; # Do any saving, and then display the current tab. SWITCH: for ($current_tab_name) { + + # Extensions must set it to 1 to confirm the tab is valid. + my $handled = 0; + Bugzilla::Hook::process('user_preferences', + { 'vars' => $vars, + save_changes => $save_changes, + current_tab => $current_tab_name, + handled => \$handled }); + last SWITCH if $handled; + /^account$/ && do { SaveAccount() if $save_changes; DoAccount(); @@ -538,14 +548,6 @@ SWITCH: for ($current_tab_name) { DoSavedSearches(); last SWITCH; }; - # Extensions must set it to 1 to confirm the tab is valid. - my $handled = 0; - Bugzilla::Hook::process('user_preferences', - { 'vars' => $vars, - save_changes => $save_changes, - current_tab => $current_tab_name, - handled => \$handled }); - last SWITCH if $handled; ThrowUserError("unknown_tab", { current_tab_name => $current_tab_name }); -- cgit v1.2.3-24-g4f1b From e226fcca85ec11a7f1004c31070721bfabc67625 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Sat, 21 Jan 2012 12:04:42 +0100 Subject: Bug 469068: SMTP parameters not documented r/a=LpSolit --- docs/en/xml/administration.xml | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml index 46346bf7d..111fc8bad 100644 --- a/docs/en/xml/administration.xml +++ b/docs/en/xml/administration.xml @@ -764,6 +764,68 @@ + + + smtpserver + + + + This is the SMTP server address, if the mail_delivery_method + parameter is set to SMTP. Use "localhost" if you have a local MTA + running, otherwise use a remote SMTP server. Append ":" and the port + number, if a non-default port is needed. + + + + + + + smtp_username + + + + Username to use for SASL authentication to the SMTP server. Leave + this parameter empty if your server does not require authentication. + + + + + + + smtp_password + + + + Password to use for SASL authentication to the SMTP server. This + parameter will be ignored if the smtp_username + parameter is left empty. + + + + + + + smtp_ssl + + + + Enable SSL support for connection to the SMTP server. + + + + + + + smtp_debug + + + + This parameter allows you to enable detailed debugging output. + Log messages are printed the web server's error log. + + + + whinedays -- cgit v1.2.3-24-g4f1b From 7d8c9ccfb3c5983968ff5ae1b38471be18a49501 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Tue, 24 Jan 2012 18:09:59 +0100 Subject: Bug 633061: Require Apache2::SizeLimit 0.96 for proper operation on Linux r=dkl a=mkanat --- Bugzilla/Install/Requirements.pm | 5 ++--- mod_perl.pl | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index ef4bf3d22..1e7fc97c6 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -358,9 +358,8 @@ sub OPTIONAL_MODULES { { package => 'Apache-SizeLimit', module => 'Apache2::SizeLimit', - # 0.93 fixes problems on Linux and Windows, and changes the - # syntax used by SizeLimit. - version => '0.93', + # 0.96 properly determines process size on Linux. + version => '0.96', feature => ['mod_perl'], }, ); diff --git a/mod_perl.pl b/mod_perl.pl index 2f4016952..f3dae34c1 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -59,8 +59,9 @@ Bugzilla::CGI->compile(qw(:cgi :push)); use Apache2::SizeLimit; # This means that every httpd child will die after processing -# a CGI if it is taking up more than 70MB of RAM all by itself. -Apache2::SizeLimit->set_max_unshared_size(70_000); +# a CGI if it is taking up more than 45MB of RAM all by itself, +# not counting RAM it is sharing with the other httpd processes. +Apache2::SizeLimit->set_max_unshared_size(45_000); my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'}; -- cgit v1.2.3-24-g4f1b From e2a95ffbe2beb52bf3e69102b4646ddf5793d8df Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 24 Jan 2012 18:41:55 +0100 Subject: Bug 715870: [Oracle] Related sequences and triggers must be removed when dropping a table r=mkanat a=LpSolit --- Bugzilla/DB/Schema/Oracle.pm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm index cdc39409d..f2d5b8be0 100644 --- a/Bugzilla/DB/Schema/Oracle.pm +++ b/Bugzilla/DB/Schema/Oracle.pm @@ -386,13 +386,31 @@ sub get_rename_table_sql { } if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL}) { push(@sql, _get_notnull_trigger_ddl($new_name, $column)); - push(@sql, "DROP TRIGGER ${$old_name}_${column}"); + push(@sql, "DROP TRIGGER ${old_name}_${column}"); } } return @sql; } +sub get_drop_table_ddl { + my ($self, $name) = @_; + my @sql; + + my @columns = $self->get_table_columns($name); + foreach my $column (@columns) { + my $def = $self->get_column_abstract($name, $column); + if ($def->{TYPE} =~ /SERIAL/i) { + # If there's a SERIAL column on this table, we also need + # to remove the sequence. + push(@sql, "DROP SEQUENCE ${name}_${column}_SEQ"); + } + } + push(@sql, "DROP TABLE $name CASCADE CONSTRAINTS PURGE"); + + return @sql; +} + sub _get_notnull_trigger_ddl { my ($table, $column) = @_; -- cgit v1.2.3-24-g4f1b