context.go

@@ -105,17 +105,14 @@ func (c *Context) Get(key string) interface{} {
 
 // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned
 func (c *Context) RealIP() string {
-	reqIP := c.Request.RemoteAddr
-
 	if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` {
-		reqIP = strings.Split(ip, `, `)[0]
-	} else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
-		reqIP = ip
+		return strings.Split(ip, `, `)[0]
 	}
 
-	ra, _, _ := net.SplitHostPort(reqIP)
-	if ra != `` {
-		reqIP = ra
+	if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` {
+		return ip
 	}
-	return reqIP
+
+	ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr)
+	return ra
 }

go.mod

@@ -1,5 +0,0 @@
-module git.fuyu.moe/Fuyu/router
-
-go 1.13
-
-require github.com/julienschmidt/httprouter v1.3.0

go.sum

@@ -1,2 +0,0 @@
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=

router.go

@@ -3,7 +3,6 @@ package router
 import (
 	"context"
 	"crypto/tls"
-	"net"
 	"net/http"
 	"reflect"
 	"time"
@@ -96,14 +95,6 @@ func (r *Router) OPTIONS(path string, handle Handle, middleware ...Middleware) {
 	r.routes = append(r.routes, route{`OPTIONS`, path, handle, middleware})
 }
 
-// Serve accepts incoming HTTP connections on the listener
-func (r *Router) Serve(l net.Listener) error {
-	httpr := r.getHttpr()
-
-	r.server = &http.Server{Handler: httpr}
-	return r.server.Serve(l)
-}
-
 // Start starts the web server and binds to the given address
 func (r *Router) Start(addr string) error {
 	httpr := r.getHttpr()