Merge a145139746 into 7be5935c55

cmd/web.go

@@ -153,7 +153,7 @@ func runWeb(ctx *cli.Context) error {
 			log.Fatal(4, "Failed to bind %s", listenAddr, err)
 		}
 		defer listener.Close()
-		err = fcgi.Serve(listener, context2.ClearHandler(m))
+		fcgi.Serve(listener, context2.ClearHandler(m))
 	case setting.UnixSocket:
 		if err := os.Remove(listenAddr); err != nil && !os.IsNotExist(err) {
 			log.Fatal(4, "Failed to remove unix socket directory %s: %v", listenAddr, err)

modules/minwinsvc/svc_windows.go

@@ -71,6 +71,4 @@ func (runner) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<-
 			return false, 0
 		}
 	}
-
-	return false, 0
 }