From ef200c3c5e34130129330d25447e4ae0f5c7d03e Mon Sep 17 00:00:00 2001
From: v2ray <admin@v2ray.com>
Date: Sat, 7 May 2016 14:08:27 +0200
Subject: [PATCH] http client

---
 proxy/http/client.go                        |  1 +
 proxy/http/http_factory.go                  | 20 --------------------
 proxy/http/{http.go => server.go}           | 14 ++++++++++++++
 proxy/http/{http_test.go => server_test.go} |  0
 4 files changed, 15 insertions(+), 20 deletions(-)
 create mode 100644 proxy/http/client.go
 delete mode 100644 proxy/http/http_factory.go
 rename proxy/http/{http.go => server.go} (93%)
 rename proxy/http/{http_test.go => server_test.go} (100%)

diff --git a/proxy/http/client.go b/proxy/http/client.go
new file mode 100644
index 00000000..d02cfda6
--- /dev/null
+++ b/proxy/http/client.go
@@ -0,0 +1 @@
+package http
diff --git a/proxy/http/http_factory.go b/proxy/http/http_factory.go
deleted file mode 100644
index cfc1f3b0..00000000
--- a/proxy/http/http_factory.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package http
-
-import (
-	"github.com/v2ray/v2ray-core/app"
-	"github.com/v2ray/v2ray-core/app/dispatcher"
-	"github.com/v2ray/v2ray-core/proxy"
-	"github.com/v2ray/v2ray-core/proxy/internal"
-)
-
-func init() {
-	internal.MustRegisterInboundHandlerCreator("http",
-		func(space app.Space, rawConfig interface{}) (proxy.InboundHandler, error) {
-			if !space.HasApp(dispatcher.APP_ID) {
-				return nil, internal.ErrorBadConfiguration
-			}
-			return NewHttpProxyServer(
-				rawConfig.(*Config),
-				space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)), nil
-		})
-}
diff --git a/proxy/http/http.go b/proxy/http/server.go
similarity index 93%
rename from proxy/http/http.go
rename to proxy/http/server.go
index 4805d2fd..76f78562 100644
--- a/proxy/http/http.go
+++ b/proxy/http/server.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/v2ray/v2ray-core/app"
 	"github.com/v2ray/v2ray-core/app/dispatcher"
 	"github.com/v2ray/v2ray-core/common/alloc"
 	v2io "github.com/v2ray/v2ray-core/common/io"
@@ -17,6 +18,7 @@ import (
 	v2net "github.com/v2ray/v2ray-core/common/net"
 	"github.com/v2ray/v2ray-core/common/serial"
 	"github.com/v2ray/v2ray-core/proxy"
+	"github.com/v2ray/v2ray-core/proxy/internal"
 	"github.com/v2ray/v2ray-core/transport/hub"
 	"github.com/v2ray/v2ray-core/transport/ray"
 )
@@ -252,3 +254,15 @@ func (this *HttpProxyServer) handlePlainHTTP(request *http.Request, dest v2net.D
 	}()
 	wg.Wait()
 }
+
+func init() {
+	internal.MustRegisterInboundHandlerCreator("http",
+		func(space app.Space, rawConfig interface{}) (proxy.InboundHandler, error) {
+			if !space.HasApp(dispatcher.APP_ID) {
+				return nil, internal.ErrorBadConfiguration
+			}
+			return NewHttpProxyServer(
+				rawConfig.(*Config),
+				space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)), nil
+		})
+}
diff --git a/proxy/http/http_test.go b/proxy/http/server_test.go
similarity index 100%
rename from proxy/http/http_test.go
rename to proxy/http/server_test.go