fixed bug in Hypnotoad that prevented disabling of reverse proxy supp…

…ort between zero downtime software upgrades
mojolicious · Mar 7, 2012 · 5a6d37c · 5a6d37c
1 parent 7d78aed
commit 5a6d37c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,9 +1,11 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.58    2012-03-06 00:00:00
+2.58    2012-03-07 00:00:00
         - Added support for MOJO_LISTEN environment variable.
         - Removed listen attribute from Mojo::Server::Morbo.
         - Improved documentation.
+        - Fixed bug in Hypnotoad that prevented disabling of reverse proxy
+          support between zero downtime software upgrades.
         - Fixed small caching bug in Morbo file watcher.
         - Fixed Windows bug in "asset.t".
 

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -152,7 +152,7 @@ sub _config {
   $c->{workers}         ||= 4;
 
   # Daemon settings
-  $ENV{MOJO_REVERSE_PROXY} = 1 if $c->{proxy};
+  $ENV{MOJO_REVERSE_PROXY} = $c->{proxy};
   my $daemon = $self->{daemon};
   $daemon->backlog($c->{backlog}) if defined $c->{backlog};
   $daemon->max_clients($c->{clients} || 1000);
@@ -586,8 +586,7 @@ has been stopped.
 
   proxy => 1
 
-Activate reverse proxy support, defaults to the value of
-the C<MOJO_REVERSE_PROXY> environment variable.
+Activate reverse proxy support.
 
 =head2 C<upgrade_timeout>