Merge branch 'master' into bkey

pool/page_reg.php

@@ -34,8 +34,8 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
  $pg .= '<table cellpadding=5 cellspacing=0 border=1><tr><td class=dc>';
 
  $pg .= '<h1>Login</h1>';
- if (isset($data['data']['error']))
+ if (isset($data['data']['error']) && !isset($_POST['pass2']))
-	$pg .= "<br><b>".$data['data']['error']." - please try again</b><br><br>";
+	$pg .= "<br><span class=err>".$data['data']['error']." - please try again</span><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>
@@ -55,8 +55,8 @@ Your miner password should be '<b>x</b>' and <b>must not</b> use your login pass
  $pg.= '</td></tr><tr><td class=dc>';
 
  $pg .= '<h1>Register</h1>';
- if (isset($data['data']['error']))
+ if (isset($data['data']['error']) && isset($_POST['pass2']))
-	$pg .= "<br><b>".$data['data']['error']." - please try again</b><br><br>";
+	$pg .= "<br><span class=err>".$data['data']['error']." - please try again</span><br><br>";
  $pg .= makeForm('');
  $pg .= "
 <table>

src/ckpool.c

@@ -2136,6 +2136,8 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (!ckp.handover)
+		manage_old_child(&ckp, &ckp.main);
 	write_namepid(&ckp.main);
 	open_process_sock(&ckp, &ckp.main, &ckp.main.us);
 	launch_logger(&ckp.main);