From 0e43271cc986bb8441bc51bad5b0e5bdb6286360 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Mon, 2 Feb 2015 23:41:35 -0700
Subject: [PATCH] Basic proxy feature works

---
 middleware/proxy/proxy.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/middleware/proxy/proxy.go b/middleware/proxy/proxy.go
index 23e6aabf7..29cb29f36 100644
--- a/middleware/proxy/proxy.go
+++ b/middleware/proxy/proxy.go
@@ -4,7 +4,8 @@ package proxy
 import (
 	"log"
 	"net/http"
-	"strings"
+	"net/http/httputil"
+	"net/url"
 
 	"github.com/mholt/caddy/middleware"
 )
@@ -28,16 +29,22 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
 
 			for _, rule := range rules {
 				if middleware.Path(r.URL.Path).Matches(rule.from) {
-					client := &http.Client{}
+					var scheme string
+					if r.TLS == nil {
+						scheme = "http"
+					} else {
+						scheme = "https"
+					}
 
-					r.RequestURI = ""
-					r.URL.Scheme = strings.ToLower(r.URL.Scheme)
-
-					resp, err := client.Do(r)
+					baseUrl, err := url.Parse(scheme + "://" + rule.to)
 					if err != nil {
 						log.Fatal(err)
 					}
-					resp.Write(w)
+					r.Host = baseUrl.Host
+
+					// TODO: Construct this before; not during every request, if possible
+					proxy := httputil.NewSingleHostReverseProxy(baseUrl)
+					proxy.ServeHTTP(w, r)
 
 				} else {
 					next(w, r)