fixed small memory leak in Hypnotoad that only shows when Perl is com…

…piled with -DPERL_USE_SAFE_PUTENV (closes #444)
mojolicious · Jan 15, 2013 · 7276c08 · 7276c08
1 parent da9c22a
commit 7276c08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
 3.81  2013-01-16
   - Improved documentation.
+  - Fixed small memory leak in Hypnotoad that only shows when Perl is compiled
+    with -DPERL_USE_SAFE_PUTENV. (lewoberst)
 
 3.80  2013-01-15
   - Deprecated testing WebSocket messages without calling

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -182,7 +182,7 @@ sub _manage {
     $self->{log}->info("Upgrade successful, stopping $ENV{HYPNOTOAD_PID}.");
     kill 'QUIT', $ENV{HYPNOTOAD_PID};
   }
-  $ENV{HYPNOTOAD_PID} = $$;
+  $ENV{HYPNOTOAD_PID} = $$ unless ($ENV{HYPNOTOAD_PID} // '') eq $$;
 
   # Check heartbeat
   $self->_heartbeat;

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -776,6 +776,8 @@ James Duncan
 
 Jan Jona Javorsek
 
+Jan Schmidt
+
 Jaroslav Muhin
 
 Jesse Vincent