Merge ce03fdda7d9a13288eb16721619d4a97f7983a1b into 077a2f39c85700ba0823f85ed29cec0c8f2cbdfc

context.go

@@ -1085,9 +1085,14 @@ func (c *Context) Render(code int, r render.Render) {
 	}
 
 	if err := r.Render(c.Writer); err != nil {
-		// Pushing error to c.Errors
+		// if err is net error, pushing error to c.Errors
+		netOpErr := &net.OpError{}
+		if ok := errors.As(err, &netOpErr); ok {
 			_ = c.Error(err)
 			c.Abort()
+		} else {
+			panic(err)
+		}
 	}
 }
 

context_test.go

@@ -37,7 +37,15 @@ import (
 
 var _ context.Context = (*Context)(nil)
 
-var errTestRender = errors.New("TestRender")
+var errTestRender = errors.New("TestPanicRender")
+
+var errNetOpErr = &net.OpError{
+	Op:     "testneterr",
+	Net:    "",
+	Source: nil,
+	Addr:   nil,
+	Err:    nil,
+}
 
 // Unit tests TODO
 // func (c *Context) File(filepath string) {
@@ -1007,21 +1015,41 @@ func TestContextBodyAllowedForStatus(t *testing.T) {
 	assert.True(t, bodyAllowedForStatus(http.StatusInternalServerError))
 }
 
-type TestRender struct{}
+type TestPanicRender struct{}
 
-func (*TestRender) Render(http.ResponseWriter) error {
+func (*TestPanicRender) Render(http.ResponseWriter) error {
 	return errTestRender
 }
 
-func (*TestRender) WriteContentType(http.ResponseWriter) {}
+func (*TestPanicRender) WriteContentType(http.ResponseWriter) {}
+
+func TestContextRenderPanicIfErr(t *testing.T) {
+	defer func() {
+		r := recover()
+		assert.Equal(t, fmt.Sprint(errTestRender), fmt.Sprint(r))
+	}()
 
-func TestContextRenderIfErr(t *testing.T) {
 	w := httptest.NewRecorder()
 	c, _ := CreateTestContext(w)
 
-	c.Render(http.StatusOK, &TestRender{})
+	c.Render(http.StatusOK, &TestPanicRender{})
+}
 
-	assert.Equal(t, errorMsgs{&Error{Err: errTestRender, Type: 1}}, c.Errors)
+type TestNetErrorRender struct{}
+
+func (*TestNetErrorRender) Render(http.ResponseWriter) error {
+	return errNetOpErr
+}
+
+func (*TestNetErrorRender) WriteContentType(http.ResponseWriter) {}
+
+func TestContextRenderIfNetErr(t *testing.T) {
+	w := httptest.NewRecorder()
+	c, _ := CreateTestContext(w)
+
+	c.Render(http.StatusOK, &TestNetErrorRender{})
+
+	assert.Equal(t, errorMsgs{&Error{Err: errNetOpErr, Type: 1}}, c.Errors)
 }
 
 // Tests that the response is serialized as JSON