Correctly identify socket read/write on Windows.

proxy.go

@@ -9,13 +9,11 @@ import (
 	"io"
 	"math/rand"
 	"net"
-	// "reflect"
+	"reflect"
 	"strings"
 	"time"
 )
 
-// var _ = reflect.TypeOf
-
 // As I'm using ReadSlice to read line, it's possible to get
 // bufio.ErrBufferFull while reading line, so set it to a large value to
 // prevent such problems.
@@ -406,7 +404,7 @@ func (c *clientConn) handleServerReadError(r *Request, sv *serverConn, err error
 		sendErrorPage(c, "502 read error", err.Error(), errMsg)
 		return errPageSent
 	}
-	errl.Println("Unhandled server read error:", err, r)
+	errl.Println(msg+" unhandled server read error:", err, reflect.TypeOf(err), r)
 	return errShouldClose
 }
 
@@ -440,20 +438,6 @@ func (c *clientConn) handleClientWriteError(r *Request, err error, msg string) e
 	return err
 }
 
-func isErrOpWrite(err error) bool {
-	if ne, ok := err.(*net.OpError); ok && ne.Op == "write" {
-		return true
-	}
-	return false
-}
-
-func isErrOpRead(err error) bool {
-	if ne, ok := err.(*net.OpError); ok && ne.Op == "read" {
-		return true
-	}
-	return false
-}
-
 func (c *clientConn) readResponse(sv *serverConn, r *Request, rp *Response) (err error) {
 	sv.initBuf()
 	defer func() {
@@ -510,10 +494,12 @@ func (c *clientConn) readResponse(sv *serverConn, r *Request, rp *Response) (err
 				// Proxy can't send error page here because response header has
 				// been sent.
 				errl.Println("unexpected EOF reading body from server", r)
+			} else if isErrOpRead(err) {
+				err = c.handleServerReadError(r, sv, err, "Read response body from server.")
 			} else if isErrOpWrite(err) {
-				err = c.handleClientWriteError(r, err, "Write to client response body.")
+				err = c.handleClientWriteError(r, err, "Write response body to client.")
 			} else {
-				err = c.handleServerReadError(r, sv, err, "Read response body from server.")
+				errl.Println("sendBody unknown network op error", reflect.TypeOf(err), r)
 			}
 		}
 	}

proxy_unix.go

@@ -20,3 +20,19 @@ func isDNSError(err error) bool {
 	}
 	return false
 }
+
+func isErrOpWrite(err error) bool {
+	ne, ok := err.(*net.OpError)
+	if !ok {
+		return false
+	}
+	return ne.Op == "write"
+}
+
+func isErrOpRead(err error) bool {
+	ne, ok := err.(*net.OpError)
+	if !ok {
+		return false
+	}
+	return ne.Op == "read"
+}

proxy_windows.go

@@ -30,3 +30,19 @@ func isDNSError(err error) bool {
 	// reflect.TypeOf(err), err.Error())
 	return strings.Contains(err.Error(), "No such host")
 }
+
+func isErrOpWrite(err error) bool {
+	ne, ok := err.(*net.OpError)
+	if !ok {
+		return false
+	}
+	return ne.Op == "WSASend"
+}
+
+func isErrOpRead(err error) bool {
+	ne, ok := err.(*net.OpError)
+	if !ok {
+		return false
+	}
+	return ne.Op == "WSARecv"
+}