From: Patrik Lundin <patrik@sigterm.se>
Date: Thu, 4 Jul 2019 22:48:23 +0000 (+0000)
Subject: net/http: stop ExampleServer_Shutdown from hanging on error
X-Git-Tag: go1.13rc1~123
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=04e2e81ecbb6a34863cb46f22d7b8f434c8b852f;p=gostls13.git

net/http: stop ExampleServer_Shutdown from hanging on error

Running the example code when not having permissions
to bind to port 80 will cause the program to hang after
printing the error message.

Change-Id: I2433ba2629b362fc8f1731e40cab5eea72ec354f
GitHub-Last-Rev: 0bb3dc08b6f646470fc6ff208ea12bca901a2299
GitHub-Pull-Request: golang/go#32947
Reviewed-on: https://go-review.googlesource.com/c/go/+/185157
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/net/http/example_test.go b/src/net/http/example_test.go
index 2a09f5f6c6..a783b46618 100644
--- a/src/net/http/example_test.go
+++ b/src/net/http/example_test.go
@@ -132,7 +132,7 @@ func ExampleServer_Shutdown() {
 
 	if err := srv.ListenAndServe(); err != http.ErrServerClosed {
 		// Error starting or closing listener:
-		log.Printf("HTTP server ListenAndServe: %v", err)
+		log.Fatalf("HTTP server ListenAndServe: %v", err)
 	}
 
 	<-idleConnsClosed