Merge branch 'maint-1.6.4' into maint-1.6.5

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 84805c61e584f7cd01145805c43944b5ba8b8311..e9fb5aa67ab5d0ea9aa87cf3ef3cd045278c4ac4 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -73,6 +73,11 @@ resolve_full_httpd () {
 }
 
 start_httpd () {
+       if test -f "$fqgitdir/pid"; then
+               say "Instance already running. Restarting..."
+               stop_httpd
+       fi
+
        # here $httpd should have a meaningful value
        resolve_full_httpd