diff --git a/httpbin/handlers.go b/httpbin/handlers.go
index fb307e286fb2d0ce5dd02184e055526155bcfa0a..1343a023b1454c83270fb66746d2039ab278af7b 100644
--- a/httpbin/handlers.go
+++ b/httpbin/handlers.go
@@ -172,12 +172,44 @@ func (h *HTTPBin) Status(w http.ResponseWriter, r *http.Request) {
"accept": acceptedMediaTypes,
})
+ http300body := []byte(`<!doctype html>
+<head>
+<title>Multiple Choices</title>
+</head>
+<body>
+<ul>
+<li><a href="/image/jpeg">/image/jpeg</a></li>
+<li><a href="/image/png">/image/png</a></li>
+<li><a href="/image/svg">/image/svg</a></li>
+</body>
+</html>`)
+
+ http308body := []byte(`<!doctype html>
+<head>
+<title>Permanent Redirect</title>
+</head>
+<body>Permanently redirected to <a href="/image/jpeg">/image/jpeg</a>
+</body>
+</html>`)
+
specialCases := map[int]*statusCase{
+ 300: {
+ body: http300body,
+ headers: map[string]string{
+ "Location": "/image/jpeg",
+ },
+ },
301: redirectHeaders,
302: redirectHeaders,
303: redirectHeaders,
305: redirectHeaders,
307: redirectHeaders,
+ 308: {
+ body: http308body,
+ headers: map[string]string{
+ "Location": "/image/jpeg",
+ },
+ },
401: {
headers: map[string]string{
"WWW-Authenticate": `Basic realm="Fake Realm"`,
diff --git a/httpbin/handlers_test.go b/httpbin/handlers_test.go
index 80c39a9dcbc6f29e3877c99f189fe17d72bab701..e93f4f033300e736edbed642a1589df24d84692a 100644
--- a/httpbin/handlers_test.go
+++ b/httpbin/handlers_test.go
@@ -708,8 +708,26 @@ func TestStatus(t *testing.T) {
body string
}{
{200, nil, ""},
+ {300, map[string]string{"Location": "/image/jpeg"}, `<!doctype html>
+<head>
+<title>Multiple Choices</title>
+</head>
+<body>
+<ul>
+<li><a href="/image/jpeg">/image/jpeg</a></li>
+<li><a href="/image/png">/image/png</a></li>
+<li><a href="/image/svg">/image/svg</a></li>
+</body>
+</html>`},
{301, redirectHeaders, ""},
{302, redirectHeaders, ""},
+ {308, map[string]string{"Location": "/image/jpeg"}, `<!doctype html>
+<head>
+<title>Permanent Redirect</title>
+</head>
+<body>Permanently redirected to <a href="/image/jpeg">/image/jpeg</a>
+</body>
+</html>`},
{401, unauthorizedHeaders, ""},
{418, nil, "I'm a teapot!"},
}