Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

jetty-distribution/src/main/resources/webapps/ROOT/index.html

@@ -63,7 +63,7 @@
 
   <div id='blog'>
     <h1>Jetty Blog</h1>
-    <iframe src="http://webtide.intalio.com/blog.jsp" />
+    <iframe src="http://www.webtide.com/blog.jsp" />
   </div>
 </body>
 </html>

jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java

@@ -157,7 +157,7 @@ public class ShutdownMonitor extends Thread
             return;
         }
 
-        while (true)
+        while (serverSocket != null)
         {
             Socket socket = null;
             try
@@ -190,7 +190,9 @@ public class ShutdownMonitor extends Thread
                     // Shutdown Monitor
                     debug("Shutting down monitor");
                     close(socket);
+                    socket = null;
                     close(serverSocket);
+                    serverSocket = null;
 
                     if (exitVm)
                     {