diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index a8e5f859ef..f3accec366 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -213,6 +213,11 @@
 			"ImportPath": "github.com/elazarl/go-bindata-assetfs",
 			"Rev": "3dcc96556217539f50599357fb481ac0dc7439b9"
 		},
+		{
+			"ImportPath": "github.com/elazarl/goproxy",
+			"Comment": "v1.0-66-g07b16b6",
+			"Rev": "07b16b6e30fcac0ad8c0435548e743bcf2ca7e92"
+		},
 		{
 			"ImportPath": "github.com/emicklei/go-restful",
 			"Comment": "v1.1.3-98-g1f9a0ee",
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/.gitignore b/Godeps/_workspace/src/github.com/elazarl/goproxy/.gitignore
new file mode 100644
index 0000000000..1005f6f1ec
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/.gitignore
@@ -0,0 +1,2 @@
+bin
+*.swp
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/LICENSE b/Godeps/_workspace/src/github.com/elazarl/goproxy/LICENSE
new file mode 100644
index 0000000000..2067e567c9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2012 Elazar Leibovich. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Elazar Leibovich. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/README.md
new file mode 100644
index 0000000000..e94fef9ac4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/README.md
@@ -0,0 +1,115 @@
+# Introduction
+
+[![Join the chat at https://gitter.im/elazarl/goproxy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/elazarl/goproxy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+Package goproxy provides a customizable HTTP proxy library for Go (golang),
+
+It supports regular HTTP proxy, HTTPS through CONNECT, and "hijacking" HTTPS
+connection using "Man in the Middle" style attack.
+
+The intent of the proxy, is to be usable with reasonable amount of traffic
+yet, customizable and programable.
+
+The proxy itself is simply a `net/http` handler.
+
+In order to use goproxy, one should set their browser to use goproxy as an HTTP
+proxy. Here is how you do that [in Chrome](https://support.google.com/chrome/answer/96815?hl=en)
+and [in Firefox](http://www.wikihow.com/Enter-Proxy-Settings-in-Firefox).
+
+For example, the URL you should use as proxy when running `./bin/basic` is
+`localhost:8080`, as this is the default binding for the basic proxy.
+
+## Mailing List
+
+New features would be discussed on the [mailing list](https://groups.google.com/forum/#!forum/goproxy-dev)
+before their development.
+
+## Latest Stable Release
+
+Get the latest goproxy from `gopkg.in/elazarl/goproxy.v1`.
+
+# Why not Fiddler2?
+
+Fiddler is an excellent software with similar intent. However, Fiddler is not
+as customable as goproxy intend to be. The main difference is, Fiddler is not
+intended to be used as a real proxy.
+
+A possible use case that suits goproxy but
+not Fiddler, is, gathering statisitics on page load times for a certain website over a week.
+With goproxy you could ask all your users to set their proxy to a dedicated machine running a
+goproxy server. Fiddler is a GUI app not designed to be ran like a server for multiple users.
+
+# A taste of goproxy
+
+To get a taste of `goproxy`, a basic HTTP/HTTPS transparent proxy
+
+
+    import (
+        "github.com/elazarl/goproxy"
+        "log"
+        "net/http"
+    )
+
+    func main() {
+        proxy := goproxy.NewProxyHttpServer()
+        proxy.Verbose = true
+        log.Fatal(http.ListenAndServe(":8080", proxy))
+    }
+
+
+This line will add `X-GoProxy: yxorPoG-X` header to all requests sent through the proxy
+
+    proxy.OnRequest().DoFunc(
+        func(r *http.Request,ctx *goproxy.ProxyCtx)(*http.Request,*http.Response) {
+            r.Header.Set("X-GoProxy","yxorPoG-X")
+            return r,nil
+        })
+
+`DoFunc` will process all incoming requests to the proxy. It will add a header to the request
+and return it. The proxy will send the modified request.
+
+Note that we returned nil value as the response. Have we returned a response, goproxy would
+have discarded the request and sent the new response to the client.
+
+In order to refuse connections to reddit at work time
+
+    proxy.OnRequest(goproxy.DstHostIs("www.reddit.com")).DoFunc(
+        func(r *http.Request,ctx *goproxy.ProxyCtx)(*http.Request,*http.Response) {
+            if h,_,_ := time.Now().Clock(); h >= 8 && h <= 17 {
+                return r,goproxy.NewResponse(r,
+                        goproxy.ContentTypeText,http.StatusForbidden,
+                        "Don't waste your time!")
+            }
+            return r,nil
+    })
+
+`DstHostIs` returns a `ReqCondition`, that is a function receiving a `Request` and returning a boolean
+we will only process requests that matches the condition. `DstHostIs("www.reddit.com")` will return
+a `ReqCondition` accepting only requests directed to "www.reddit.com".
+
+`DoFunc` will recieve a function that will preprocess the request. We can change the request, or
+return a response. If the time is between 8:00am and 17:00pm, we will neglect the request, and
+return a precanned text response saying "do not waste your time".
+
+See additional examples in the examples directory.
+
+# What's New
+
+  1. Ability to `Hijack` CONNECT requests. See
+[the eavesdropper example](https://github.com/elazarl/goproxy/blob/master/examples/goproxy-eavesdropper/main.go#L27)
+2.  Transparent proxy support for http/https including MITM certificate generation for TLS.  See the [transparent example.](https://github.com/elazarl/goproxy/tree/master/examples/goproxy-transparent)
+
+# License
+
+I put the software temporarily under the Go-compatible BSD license,
+if this prevents someone from using the software, do let mee know and I'll consider changing it.
+
+At any rate, user feedback is very important for me, so I'll be delighted to know if you're using this package.
+
+# Beta Software
+
+I've received a positive feedback from a few people who use goproxy in production settings.
+I believe it is good enough for usage.
+
+I'll try to keep reasonable backwards compatability. In case of a major API change,
+I'll change the import path.
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/actions.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/actions.go
new file mode 100644
index 0000000000..e1a3e7ff17
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/actions.go
@@ -0,0 +1,57 @@
+package goproxy
+
+import "net/http"
+
+// ReqHandler will "tamper" with the request coming to the proxy server
+// If Handle returns req,nil the proxy will send the returned request
+// to the destination server. If it returns nil,resp the proxy will
+// skip sending any requests, and will simply return the response `resp`
+// to the client.
+type ReqHandler interface {
+	Handle(req *http.Request, ctx *ProxyCtx) (*http.Request, *http.Response)
+}
+
+// A wrapper that would convert a function to a ReqHandler interface type
+type FuncReqHandler func(req *http.Request, ctx *ProxyCtx) (*http.Request, *http.Response)
+
+// FuncReqHandler.Handle(req,ctx) <=> FuncReqHandler(req,ctx)
+func (f FuncReqHandler) Handle(req *http.Request, ctx *ProxyCtx) (*http.Request, *http.Response) {
+	return f(req, ctx)
+}
+
+// after the proxy have sent the request to the destination server, it will
+// "filter" the response through the RespHandlers it has.
+// The proxy server will send to the client the response returned by the RespHandler.
+// In case of error, resp will be nil, and ctx.RoundTrip.Error will contain the error
+type RespHandler interface {
+	Handle(resp *http.Response, ctx *ProxyCtx) *http.Response
+}
+
+// A wrapper that would convert a function to a RespHandler interface type
+type FuncRespHandler func(resp *http.Response, ctx *ProxyCtx) *http.Response
+
+// FuncRespHandler.Handle(req,ctx) <=> FuncRespHandler(req,ctx)
+func (f FuncRespHandler) Handle(resp *http.Response, ctx *ProxyCtx) *http.Response {
+	return f(resp, ctx)
+}
+
+// When a client send a CONNECT request to a host, the request is filtered through
+// all the HttpsHandlers the proxy has, and if one returns true, the connection is
+// sniffed using Man in the Middle attack.
+// That is, the proxy will create a TLS connection with the client, another TLS
+// connection with the destination the client wished to connect to, and would
+// send back and forth all messages from the server to the client and vice versa.
+// The request and responses sent in this Man In the Middle channel are filtered
+// through the usual flow (request and response filtered through the ReqHandlers
+// and RespHandlers)
+type HttpsHandler interface {
+	HandleConnect(req string, ctx *ProxyCtx) (*ConnectAction, string)
+}
+
+// A wrapper that would convert a function to a HttpsHandler interface type
+type FuncHttpsHandler func(host string, ctx *ProxyCtx) (*ConnectAction, string)
+
+// FuncHttpsHandler should implement the RespHandler interface
+func (f FuncHttpsHandler) HandleConnect(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+	return f(host, ctx)
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/all.bash b/Godeps/_workspace/src/github.com/elazarl/goproxy/all.bash
new file mode 100644
index 0000000000..6503e73dc9
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/all.bash
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+go test || exit
+for action in $@; do go $action; done
+
+mkdir -p bin
+find regretable examples/* ext/* -maxdepth 0 -type d | while read d; do
+	(cd $d
+	go build -o ../../bin/$(basename $d)
+	find *_test.go -maxdepth 0 2>/dev/null|while read f;do
+		for action in $@; do go $action; done
+		go test
+		break
+	done)
+done
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ca.pem b/Godeps/_workspace/src/github.com/elazarl/goproxy/ca.pem
new file mode 100644
index 0000000000..f138424932
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ca.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICSjCCAbWgAwIBAgIBADALBgkqhkiG9w0BAQUwSjEjMCEGA1UEChMaZ2l0aHVi
+LmNvbS9lbGF6YXJsL2dvcHJveHkxIzAhBgNVBAMTGmdpdGh1Yi5jb20vZWxhemFy
+bC9nb3Byb3h5MB4XDTAwMDEwMTAwMDAwMFoXDTQ5MTIzMTIzNTk1OVowSjEjMCEG
+A1UEChMaZ2l0aHViLmNvbS9lbGF6YXJsL2dvcHJveHkxIzAhBgNVBAMTGmdpdGh1
+Yi5jb20vZWxhemFybC9nb3Byb3h5MIGdMAsGCSqGSIb3DQEBAQOBjQAwgYkCgYEA
+vz9BbCaJjxs73Tvcq3leP32hAGerQ1RgvlZ68Z4nZmoVHfl+2Nr/m0dmW+GdOfpT
+cs/KzfJjYGr/84x524fiuR8GdZ0HOtXJzyF5seoWnbBIuyr1PbEpgRhGQMqqOUuj
+YExeLbfNHPIoJ8XZ1Vzyv3YxjbmjWA+S/uOe9HWtDbMCAwEAAaNGMEQwDgYDVR0P
+AQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8w
+DAYDVR0RBAUwA4IBKjALBgkqhkiG9w0BAQUDgYEAIcL8huSmGMompNujsvePTUnM
+oEUKtX4Eh/+s+DSfV/TyI0I+3GiPpLplEgFWuoBIJGios0r1dKh5N0TGjxX/RmGm
+qo7E4jjJuo8Gs5U8/fgThZmshax2lwLtbRNwhvUVr65GdahLsZz8I+hySLuatVvR
+qHHq/FQORIiNyNpq/Hg=
+-----END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/certs.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/certs.go
new file mode 100644
index 0000000000..8da2e6240a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/certs.go
@@ -0,0 +1,56 @@
+package goproxy
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+)
+
+func init() {
+	if goproxyCaErr != nil {
+		panic("Error parsing builtin CA " + goproxyCaErr.Error())
+	}
+	var err error
+	if GoproxyCa.Leaf, err = x509.ParseCertificate(GoproxyCa.Certificate[0]); err != nil {
+		panic("Error parsing builtin CA " + err.Error())
+	}
+}
+
+var tlsClientSkipVerify = &tls.Config{InsecureSkipVerify: true}
+
+var defaultTLSConfig = &tls.Config{
+	InsecureSkipVerify: true,
+}
+
+var CA_CERT = []byte(`-----BEGIN CERTIFICATE-----
+MIICSjCCAbWgAwIBAgIBADALBgkqhkiG9w0BAQUwSjEjMCEGA1UEChMaZ2l0aHVi
+LmNvbS9lbGF6YXJsL2dvcHJveHkxIzAhBgNVBAMTGmdpdGh1Yi5jb20vZWxhemFy
+bC9nb3Byb3h5MB4XDTAwMDEwMTAwMDAwMFoXDTQ5MTIzMTIzNTk1OVowSjEjMCEG
+A1UEChMaZ2l0aHViLmNvbS9lbGF6YXJsL2dvcHJveHkxIzAhBgNVBAMTGmdpdGh1
+Yi5jb20vZWxhemFybC9nb3Byb3h5MIGdMAsGCSqGSIb3DQEBAQOBjQAwgYkCgYEA
+vz9BbCaJjxs73Tvcq3leP32hAGerQ1RgvlZ68Z4nZmoVHfl+2Nr/m0dmW+GdOfpT
+cs/KzfJjYGr/84x524fiuR8GdZ0HOtXJzyF5seoWnbBIuyr1PbEpgRhGQMqqOUuj
+YExeLbfNHPIoJ8XZ1Vzyv3YxjbmjWA+S/uOe9HWtDbMCAwEAAaNGMEQwDgYDVR0P
+AQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8w
+DAYDVR0RBAUwA4IBKjALBgkqhkiG9w0BAQUDgYEAIcL8huSmGMompNujsvePTUnM
+oEUKtX4Eh/+s+DSfV/TyI0I+3GiPpLplEgFWuoBIJGios0r1dKh5N0TGjxX/RmGm
+qo7E4jjJuo8Gs5U8/fgThZmshax2lwLtbRNwhvUVr65GdahLsZz8I+hySLuatVvR
+qHHq/FQORIiNyNpq/Hg=
+-----END CERTIFICATE-----`)
+
+var CA_KEY = []byte(`-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/P0FsJomPGzvdO9yreV4/faEAZ6tDVGC+VnrxnidmahUd+X7Y
+2v+bR2Zb4Z05+lNyz8rN8mNgav/zjHnbh+K5HwZ1nQc61cnPIXmx6hadsEi7KvU9
+sSmBGEZAyqo5S6NgTF4tt80c8ignxdnVXPK/djGNuaNYD5L+4570da0NswIDAQAB
+AoGBALzIv1b4D7ARTR3NOr6V9wArjiOtMjUrdLhO+9vIp9IEA8ZsA9gjDlCEwbkP
+VDnoLjnWfraff5Os6+3JjHy1fYpUiCdnk2XA6iJSL1XWKQZPt3wOunxP4lalDgED
+QTRReFbA/y/Z4kSfTXpVj68ytcvSRW/N7q5/qRtbN9804jpBAkEA0s6lvH2btSLA
+mcEdwhs7zAslLbdld7rvfUeP82gPPk0S6yUqTNyikqshM9AwAktHY7WvYdKl+ghZ
+HTxKVC4DoQJBAOg/IAW5RbXknP+Lf7AVtBgw3E+Yfa3mcdLySe8hjxxyZq825Zmu
+Rt5Qj4Lw6ifSFNy4kiiSpE/ZCukYvUXGENMCQFkPxSWlS6tzSzuqQxBGwTSrYMG3
+wb6b06JyIXcMd6Qym9OMmBpw/J5KfnSNeDr/4uFVWQtTG5xO+pdHaX+3EQECQQDl
+qcbY4iX1gWVfr2tNjajSYz751yoxVbkpiT9joiQLVXYFvpu+JYEfRzsjmWl0h2Lq
+AftG8/xYmaEYcMZ6wSrRAkBUwiom98/8wZVlB6qbwhU1EKDFANvICGSWMIhPx3v7
+MJqTIj4uJhte2/uyVvZ6DC6noWYgy+kLgqG0S97tUEG8
+-----END RSA PRIVATE KEY-----`)
+
+var GoproxyCa, goproxyCaErr = tls.X509KeyPair(CA_CERT, CA_KEY)
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/chunked.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/chunked.go
new file mode 100644
index 0000000000..83654f6586
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/chunked.go
@@ -0,0 +1,59 @@
+// Taken from $GOROOT/src/pkg/net/http/chunked
+// needed to write https responses to client.
+package goproxy
+
+import (
+	"io"
+	"strconv"
+)
+
+// newChunkedWriter returns a new chunkedWriter that translates writes into HTTP
+// "chunked" format before writing them to w. Closing the returned chunkedWriter
+// sends the final 0-length chunk that marks the end of the stream.
+//
+// newChunkedWriter is not needed by normal applications. The http
+// package adds chunking automatically if handlers don't set a
+// Content-Length header. Using newChunkedWriter inside a handler
+// would result in double chunking or chunking with a Content-Length
+// length, both of which are wrong.
+func newChunkedWriter(w io.Writer) io.WriteCloser {
+	return &chunkedWriter{w}
+}
+
+// Writing to chunkedWriter translates to writing in HTTP chunked Transfer
+// Encoding wire format to the underlying Wire chunkedWriter.
+type chunkedWriter struct {
+	Wire io.Writer
+}
+
+// Write the contents of data as one chunk to Wire.
+// NOTE: Note that the corresponding chunk-writing procedure in Conn.Write has
+// a bug since it does not check for success of io.WriteString
+func (cw *chunkedWriter) Write(data []byte) (n int, err error) {
+
+	// Don't send 0-length data. It looks like EOF for chunked encoding.
+	if len(data) == 0 {
+		return 0, nil
+	}
+
+	head := strconv.FormatInt(int64(len(data)), 16) + "\r\n"
+
+	if _, err = io.WriteString(cw.Wire, head); err != nil {
+		return 0, err
+	}
+	if n, err = cw.Wire.Write(data); err != nil {
+		return
+	}
+	if n != len(data) {
+		err = io.ErrShortWrite
+		return
+	}
+	_, err = io.WriteString(cw.Wire, "\r\n")
+
+	return
+}
+
+func (cw *chunkedWriter) Close() error {
+	_, err := io.WriteString(cw.Wire, "0\r\n")
+	return err
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor.go
new file mode 100644
index 0000000000..494e7a4fed
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor.go
@@ -0,0 +1,68 @@
+package goproxy
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rsa"
+	"crypto/sha256"
+	"crypto/x509"
+	"errors"
+)
+
+type CounterEncryptorRand struct {
+	cipher  cipher.Block
+	counter []byte
+	rand    []byte
+	ix      int
+}
+
+func NewCounterEncryptorRandFromKey(key interface{}, seed []byte) (r CounterEncryptorRand, err error) {
+	var keyBytes []byte
+	switch key := key.(type) {
+	case *rsa.PrivateKey:
+		keyBytes = x509.MarshalPKCS1PrivateKey(key)
+	default:
+		err = errors.New("only RSA keys supported")
+		return
+	}
+	h := sha256.New()
+	if r.cipher, err = aes.NewCipher(h.Sum(keyBytes)[:aes.BlockSize]); err != nil {
+		return
+	}
+	r.counter = make([]byte, r.cipher.BlockSize())
+	if seed != nil {
+		copy(r.counter, h.Sum(seed)[:r.cipher.BlockSize()])
+	}
+	r.rand = make([]byte, r.cipher.BlockSize())
+	r.ix = len(r.rand)
+	return
+}
+
+func (c *CounterEncryptorRand) Seed(b []byte) {
+	if len(b) != len(c.counter) {
+		panic("SetCounter: wrong counter size")
+	}
+	copy(c.counter, b)
+}
+
+func (c *CounterEncryptorRand) refill() {
+	c.cipher.Encrypt(c.rand, c.counter)
+	for i := 0; i < len(c.counter); i++ {
+		if c.counter[i]++; c.counter[i] != 0 {
+			break
+		}
+	}
+	c.ix = 0
+}
+
+func (c *CounterEncryptorRand) Read(b []byte) (n int, err error) {
+	if c.ix == len(c.rand) {
+		c.refill()
+	}
+	if n = len(c.rand) - c.ix; n > len(b) {
+		n = len(b)
+	}
+	copy(b, c.rand[c.ix:c.ix+n])
+	c.ix += n
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor_test.go
new file mode 100644
index 0000000000..12b31e16f4
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/counterecryptor_test.go
@@ -0,0 +1,99 @@
+package goproxy_test
+
+import (
+	"bytes"
+	"crypto/rsa"
+	"encoding/binary"
+	"github.com/elazarl/goproxy"
+	"io"
+	"math"
+	"math/rand"
+	"testing"
+)
+
+type RandSeedReader struct {
+	r rand.Rand
+}
+
+func (r *RandSeedReader) Read(b []byte) (n int, err error) {
+	for i := range b {
+		b[i] = byte(r.r.Int() & 0xFF)
+	}
+	return len(b), nil
+}
+
+func TestCounterEncDifferentConsecutive(t *testing.T) {
+	k, err := rsa.GenerateKey(&RandSeedReader{*rand.New(rand.NewSource(0xFF43109))}, 128)
+	fatalOnErr(err, "rsa.GenerateKey", t)
+	c, err := goproxy.NewCounterEncryptorRandFromKey(k, []byte("the quick brown fox run over the lazy dog"))
+	fatalOnErr(err, "NewCounterEncryptorRandFromKey", t)
+	for i := 0; i < 100*1000; i++ {
+		var a, b int64
+		binary.Read(&c, binary.BigEndian, &a)
+		binary.Read(&c, binary.BigEndian, &b)
+		if a == b {
+			t.Fatal("two consecutive equal int64", a, b)
+		}
+	}
+}
+
+func TestCounterEncIdenticalStreams(t *testing.T) {
+	k, err := rsa.GenerateKey(&RandSeedReader{*rand.New(rand.NewSource(0xFF43109))}, 128)
+	fatalOnErr(err, "rsa.GenerateKey", t)
+	c1, err := goproxy.NewCounterEncryptorRandFromKey(k, []byte("the quick brown fox run over the lazy dog"))
+	fatalOnErr(err, "NewCounterEncryptorRandFromKey", t)
+	c2, err := goproxy.NewCounterEncryptorRandFromKey(k, []byte("the quick brown fox run over the lazy dog"))
+	fatalOnErr(err, "NewCounterEncryptorRandFromKey", t)
+	nout := 1000
+	out1, out2 := make([]byte, nout), make([]byte, nout)
+	io.ReadFull(&c1, out1)
+	tmp := out2[:]
+	rand.Seed(0xFF43109)
+	for len(tmp) > 0 {
+		n := 1 + rand.Intn(256)
+		if n > len(tmp) {
+			n = len(tmp)
+		}
+		n, err := c2.Read(tmp[:n])
+		fatalOnErr(err, "CounterEncryptorRand.Read", t)
+		tmp = tmp[n:]
+	}
+	if !bytes.Equal(out1, out2) {
+		t.Error("identical CSPRNG does not produce the same output")
+	}
+}
+
+func stddev(data []int) float64 {
+	var sum, sum_sqr float64 = 0, 0
+	for _, h := range data {
+		sum += float64(h)
+		sum_sqr += float64(h) * float64(h)
+	}
+	n := float64(len(data))
+	variance := (sum_sqr - ((sum * sum) / n)) / (n - 1)
+	return math.Sqrt(variance)
+}
+
+func TestCounterEncStreamHistogram(t *testing.T) {
+	k, err := rsa.GenerateKey(&RandSeedReader{*rand.New(rand.NewSource(0xFF43109))}, 128)
+	fatalOnErr(err, "rsa.GenerateKey", t)
+	c, err := goproxy.NewCounterEncryptorRandFromKey(k, []byte("the quick brown fox run over the lazy dog"))
+	fatalOnErr(err, "NewCounterEncryptorRandFromKey", t)
+	nout := 100 * 1000
+	out := make([]byte, nout)
+	io.ReadFull(&c, out)
+	refhist := make([]int, 256)
+	for i := 0; i < nout; i++ {
+		refhist[rand.Intn(256)]++
+	}
+	hist := make([]int, 256)
+	for _, b := range out {
+		hist[int(b)]++
+	}
+	refstddev, stddev := stddev(refhist), stddev(hist)
+	// due to lack of time, I guestimate
+	t.Logf("ref:%v - act:%v = %v", refstddev, stddev, math.Abs(refstddev-stddev))
+	if math.Abs(refstddev-stddev) >= 1 {
+		t.Errorf("stddev of ref histogram different than regular PRNG: %v %v", refstddev, stddev)
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ctx.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ctx.go
new file mode 100644
index 0000000000..95bfd80043
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ctx.go
@@ -0,0 +1,87 @@
+package goproxy
+
+import (
+	"net/http"
+	"regexp"
+)
+
+// ProxyCtx is the Proxy context, contains useful information about every request. It is passed to
+// every user function. Also used as a logger.
+type ProxyCtx struct {
+	// Will contain the client request from the proxy
+	Req *http.Request
+	// Will contain the remote server's response (if available. nil if the request wasn't send yet)
+	Resp         *http.Response
+	RoundTripper RoundTripper
+	// will contain the recent error that occured while trying to send receive or parse traffic
+	Error error
+	// A handle for the user to keep data in the context, from the call of ReqHandler to the
+	// call of RespHandler
+	UserData interface{}
+	// Will connect a request to a response
+	Session int64
+	proxy   *ProxyHttpServer
+}
+
+type RoundTripper interface {
+	RoundTrip(req *http.Request, ctx *ProxyCtx) (*http.Response, error)
+}
+
+type RoundTripperFunc func(req *http.Request, ctx *ProxyCtx) (*http.Response, error)
+
+func (f RoundTripperFunc) RoundTrip(req *http.Request, ctx *ProxyCtx) (*http.Response, error) {
+	return f(req, ctx)
+}
+
+func (ctx *ProxyCtx) RoundTrip(req *http.Request) (*http.Response, error) {
+	if ctx.RoundTripper != nil {
+		return ctx.RoundTripper.RoundTrip(req, ctx)
+	}
+	return ctx.proxy.Tr.RoundTrip(req)
+}
+
+func (ctx *ProxyCtx) printf(msg string, argv ...interface{}) {
+	ctx.proxy.Logger.Printf("[%03d] "+msg+"\n", append([]interface{}{ctx.Session & 0xFF}, argv...)...)
+}
+
+// Logf prints a message to the proxy's log. Should be used in a ProxyHttpServer's filter
+// This message will be printed only if the Verbose field of the ProxyHttpServer is set to true
+//
+//	proxy.OnRequest().DoFunc(func(r *http.Request,ctx *goproxy.ProxyCtx) (*http.Request, *http.Response){
+//		nr := atomic.AddInt32(&counter,1)
+//		ctx.Printf("So far %d requests",nr)
+//		return r, nil
+//	})
+func (ctx *ProxyCtx) Logf(msg string, argv ...interface{}) {
+	if ctx.proxy.Verbose {
+		ctx.printf("INFO: "+msg, argv...)
+	}
+}
+
+// Warnf prints a message to the proxy's log. Should be used in a ProxyHttpServer's filter
+// This message will always be printed.
+//
+//	proxy.OnRequest().DoFunc(func(r *http.Request,ctx *goproxy.ProxyCtx) (*http.Request, *http.Response){
+//		f,err := os.OpenFile(cachedContent)
+//		if err != nil {
+//			ctx.Warnf("error open file %v: %v",cachedContent,err)
+//			return r, nil
+//		}
+//		return r, nil
+//	})
+func (ctx *ProxyCtx) Warnf(msg string, argv ...interface{}) {
+	ctx.printf("WARN: "+msg, argv...)
+}
+
+var charsetFinder = regexp.MustCompile("charset=([^ ;]*)")
+
+// Will try to infer the character set of the request from the headers.
+// Returns the empty string if we don't know which character set it used.
+// Currently it will look for charset=<charset> in the Content-Type header of the request.
+func (ctx *ProxyCtx) Charset() string {
+	charsets := charsetFinder.FindStringSubmatch(ctx.Resp.Header.Get("Content-Type"))
+	if charsets == nil {
+		return ""
+	}
+	return charsets[1]
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/dispatcher.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/dispatcher.go
new file mode 100644
index 0000000000..69219b365e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/dispatcher.go
@@ -0,0 +1,320 @@
+package goproxy
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"regexp"
+	"strings"
+)
+
+// ReqCondition.HandleReq will decide whether or not to use the ReqHandler on an HTTP request
+// before sending it to the remote server
+type ReqCondition interface {
+	RespCondition
+	HandleReq(req *http.Request, ctx *ProxyCtx) bool
+}
+
+// RespCondition.HandleReq will decide whether or not to use the RespHandler on an HTTP response
+// before sending it to the proxy client. Note that resp might be nil, in case there was an
+// error sending the request.
+type RespCondition interface {
+	HandleResp(resp *http.Response, ctx *ProxyCtx) bool
+}
+
+// ReqConditionFunc.HandleReq(req,ctx) <=> ReqConditionFunc(req,ctx)
+type ReqConditionFunc func(req *http.Request, ctx *ProxyCtx) bool
+
+// RespConditionFunc.HandleResp(resp,ctx) <=> RespConditionFunc(resp,ctx)
+type RespConditionFunc func(resp *http.Response, ctx *ProxyCtx) bool
+
+func (c ReqConditionFunc) HandleReq(req *http.Request, ctx *ProxyCtx) bool {
+	return c(req, ctx)
+}
+
+// ReqConditionFunc cannot test responses. It only satisfies RespCondition interface so that
+// to be usable as RespCondition.
+func (c ReqConditionFunc) HandleResp(resp *http.Response, ctx *ProxyCtx) bool {
+	return c(ctx.Req, ctx)
+}
+
+func (c RespConditionFunc) HandleResp(resp *http.Response, ctx *ProxyCtx) bool {
+	return c(resp, ctx)
+}
+
+// UrlHasPrefix returns a ReqCondition checking wether the destination URL the proxy client has requested
+// has the given prefix, with or without the host.
+// For example UrlHasPrefix("host/x") will match requests of the form 'GET host/x', and will match
+// requests to url 'http://host/x'
+func UrlHasPrefix(prefix string) ReqConditionFunc {
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		return strings.HasPrefix(req.URL.Path, prefix) ||
+			strings.HasPrefix(req.URL.Host+req.URL.Path, prefix) ||
+			strings.HasPrefix(req.URL.Scheme+req.URL.Host+req.URL.Path, prefix)
+	}
+}
+
+// UrlIs returns a ReqCondition, testing whether or not the request URL is one of the given strings
+// with or without the host prefix.
+// UrlIs("google.com/","foo") will match requests 'GET /' to 'google.com', requests `'GET google.com/' to
+// any host, and requests of the form 'GET foo'.
+func UrlIs(urls ...string) ReqConditionFunc {
+	urlSet := make(map[string]bool)
+	for _, u := range urls {
+		urlSet[u] = true
+	}
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		_, pathOk := urlSet[req.URL.Path]
+		_, hostAndOk := urlSet[req.URL.Host+req.URL.Path]
+		return pathOk || hostAndOk
+	}
+}
+
+// ReqHostMatches returns a ReqCondition, testing whether the host to which the request was directed to matches
+// any of the given regular expressions.
+func ReqHostMatches(regexps ...*regexp.Regexp) ReqConditionFunc {
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		for _, re := range regexps {
+			if re.MatchString(req.Host) {
+				return true
+			}
+		}
+		return false
+	}
+}
+
+// ReqHostIs returns a ReqCondition, testing whether the host to which the request is directed to equal
+// to one of the given strings
+func ReqHostIs(hosts ...string) ReqConditionFunc {
+	hostSet := make(map[string]bool)
+	for _, h := range hosts {
+		hostSet[h] = true
+	}
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		_, ok := hostSet[req.URL.Host]
+		return ok
+	}
+}
+
+var localHostIpv4 = regexp.MustCompile(`127\.0\.0\.\d+`)
+
+// IsLocalHost checks whether the destination host is explicitly local host
+// (buggy, there can be IPv6 addresses it doesn't catch)
+var IsLocalHost ReqConditionFunc = func(req *http.Request, ctx *ProxyCtx) bool {
+	return req.URL.Host == "::1" ||
+		req.URL.Host == "0:0:0:0:0:0:0:1" ||
+		localHostIpv4.MatchString(req.URL.Host) ||
+		req.URL.Host == "localhost"
+}
+
+// UrlMatches returns a ReqCondition testing whether the destination URL
+// of the request matches the given regexp, with or without prefix
+func UrlMatches(re *regexp.Regexp) ReqConditionFunc {
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		return re.MatchString(req.URL.Path) ||
+			re.MatchString(req.URL.Host+req.URL.Path)
+	}
+}
+
+// DstHostIs returns a ReqCondition testing wether the host in the request url is the given string
+func DstHostIs(host string) ReqConditionFunc {
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		return req.URL.Host == host
+	}
+}
+
+// SrcIpIs returns a ReqCondition testing wether the source IP of the request is the given string
+func SrcIpIs(ip string) ReqCondition {
+	return ReqConditionFunc(func(req *http.Request, ctx *ProxyCtx) bool {
+		return strings.HasPrefix(req.RemoteAddr, ip+":")
+	})
+}
+
+// Not returns a ReqCondition negating the given ReqCondition
+func Not(r ReqCondition) ReqConditionFunc {
+	return func(req *http.Request, ctx *ProxyCtx) bool {
+		return !r.HandleReq(req, ctx)
+	}
+}
+
+// ContentTypeIs returns a RespCondition testing whether the HTTP response has Content-Type header equal
+// to one of the given strings.
+func ContentTypeIs(typ string, types ...string) RespCondition {
+	types = append(types, typ)
+	return RespConditionFunc(func(resp *http.Response, ctx *ProxyCtx) bool {
+		if resp == nil {
+			return false
+		}
+		contentType := resp.Header.Get("Content-Type")
+		for _, typ := range types {
+			if contentType == typ || strings.HasPrefix(contentType, typ+";") {
+				return true
+			}
+		}
+		return false
+	})
+}
+
+// ProxyHttpServer.OnRequest Will return a temporary ReqProxyConds struct, aggregating the given condtions.
+// You will use the ReqProxyConds struct to register a ReqHandler, that would filter
+// the request, only if all the given ReqCondition matched.
+// Typical usage:
+//	proxy.OnRequest(UrlIs("example.com/foo"),UrlMatches(regexp.MustParse(`.*\.exampl.\com\./.*`)).Do(...)
+func (proxy *ProxyHttpServer) OnRequest(conds ...ReqCondition) *ReqProxyConds {
+	return &ReqProxyConds{proxy, conds}
+}
+
+// ReqProxyConds aggregate ReqConditions for a ProxyHttpServer. Upon calling Do, it will register a ReqHandler that would
+// handle the request if all conditions on the HTTP request are met.
+type ReqProxyConds struct {
+	proxy    *ProxyHttpServer
+	reqConds []ReqCondition
+}
+
+// DoFunc is equivalent to proxy.OnRequest().Do(FuncReqHandler(f))
+func (pcond *ReqProxyConds) DoFunc(f func(req *http.Request, ctx *ProxyCtx) (*http.Request, *http.Response)) {
+	pcond.Do(FuncReqHandler(f))
+}
+
+// ReqProxyConds.Do will register the ReqHandler on the proxy,
+// the ReqHandler will handle the HTTP request if all the conditions
+// aggregated in the ReqProxyConds are met. Typical usage:
+//	proxy.OnRequest().Do(handler) // will call handler.Handle(req,ctx) on every request to the proxy
+//	proxy.OnRequest(cond1,cond2).Do(handler)
+//	// given request to the proxy, will test if cond1.HandleReq(req,ctx) && cond2.HandleReq(req,ctx) are true
+//	// if they are, will call handler.Handle(req,ctx)
+func (pcond *ReqProxyConds) Do(h ReqHandler) {
+	pcond.proxy.reqHandlers = append(pcond.proxy.reqHandlers,
+		FuncReqHandler(func(r *http.Request, ctx *ProxyCtx) (*http.Request, *http.Response) {
+			for _, cond := range pcond.reqConds {
+				if !cond.HandleReq(r, ctx) {
+					return r, nil
+				}
+			}
+			return h.Handle(r, ctx)
+		}))
+}
+
+// HandleConnect is used when proxy receives an HTTP CONNECT request,
+// it'll then use the HttpsHandler to determine what should it
+// do with this request. The handler returns a ConnectAction struct, the Action field in the ConnectAction
+// struct returned will determine what to do with this request. ConnectAccept will simply accept the request
+// forwarding all bytes from the client to the remote host, ConnectReject will close the connection with the
+// client, and ConnectMitm, will assume the underlying connection is an HTTPS connection, and will use Man
+// in the Middle attack to eavesdrop the connection. All regular handler will be active on this eavesdropped
+// connection.
+// The ConnectAction struct contains possible tlsConfig that will be used for eavesdropping. If nil, the proxy
+// will use the default tls configuration.
+//	proxy.OnRequest().HandleConnect(goproxy.AlwaysReject) // rejects all CONNECT requests
+func (pcond *ReqProxyConds) HandleConnect(h HttpsHandler) {
+	pcond.proxy.httpsHandlers = append(pcond.proxy.httpsHandlers,
+		FuncHttpsHandler(func(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+			for _, cond := range pcond.reqConds {
+				if !cond.HandleReq(ctx.Req, ctx) {
+					return nil, ""
+				}
+			}
+			return h.HandleConnect(host, ctx)
+		}))
+}
+
+// HandleConnectFunc is equivalent to HandleConnect,
+// for example, accepting CONNECT request if they contain a password in header
+//	io.WriteString(h,password)
+//	passHash := h.Sum(nil)
+//	proxy.OnRequest().HandleConnectFunc(func(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+//		c := sha1.New()
+//		io.WriteString(c,ctx.Req.Header.Get("X-GoProxy-Auth"))
+//		if c.Sum(nil) == passHash {
+//			return OkConnect, host
+//		}
+//		return RejectConnect, host
+//	})
+func (pcond *ReqProxyConds) HandleConnectFunc(f func(host string, ctx *ProxyCtx) (*ConnectAction, string)) {
+	pcond.HandleConnect(FuncHttpsHandler(f))
+}
+
+func (pcond *ReqProxyConds) HijackConnect(f func(req *http.Request, client net.Conn, ctx *ProxyCtx)) {
+	pcond.proxy.httpsHandlers = append(pcond.proxy.httpsHandlers,
+		FuncHttpsHandler(func(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+			for _, cond := range pcond.reqConds {
+				if !cond.HandleReq(ctx.Req, ctx) {
+					return nil, ""
+				}
+			}
+			return &ConnectAction{Action: ConnectHijack, Hijack: f}, host
+		}))
+}
+
+// ProxyConds is used to aggregate RespConditions for a ProxyHttpServer.
+// Upon calling ProxyConds.Do, it will register a RespHandler that would
+// handle the HTTP response from remote server if all conditions on the HTTP response are met.
+type ProxyConds struct {
+	proxy    *ProxyHttpServer
+	reqConds []ReqCondition
+	respCond []RespCondition
+}
+
+// ProxyConds.DoFunc is equivalent to proxy.OnResponse().Do(FuncRespHandler(f))
+func (pcond *ProxyConds) DoFunc(f func(resp *http.Response, ctx *ProxyCtx) *http.Response) {
+	pcond.Do(FuncRespHandler(f))
+}
+
+// ProxyConds.Do will register the RespHandler on the proxy, h.Handle(resp,ctx) will be called on every
+// request that matches the conditions aggregated in pcond.
+func (pcond *ProxyConds) Do(h RespHandler) {
+	pcond.proxy.respHandlers = append(pcond.proxy.respHandlers,
+		FuncRespHandler(func(resp *http.Response, ctx *ProxyCtx) *http.Response {
+			for _, cond := range pcond.reqConds {
+				if !cond.HandleReq(ctx.Req, ctx) {
+					return resp
+				}
+			}
+			for _, cond := range pcond.respCond {
+				if !cond.HandleResp(resp, ctx) {
+					return resp
+				}
+			}
+			return h.Handle(resp, ctx)
+		}))
+}
+
+// OnResponse is used when adding a response-filter to the HTTP proxy, usual pattern is
+//	proxy.OnResponse(cond1,cond2).Do(handler) // handler.Handle(resp,ctx) will be used
+//				// if cond1.HandleResp(resp) && cond2.HandleResp(resp)
+func (proxy *ProxyHttpServer) OnResponse(conds ...RespCondition) *ProxyConds {
+	return &ProxyConds{proxy, make([]ReqCondition, 0), conds}
+}
+
+// AlwaysMitm is a HttpsHandler that always eavesdrop https connections, for example to
+// eavesdrop all https connections to www.google.com, we can use
+//	proxy.OnRequest(goproxy.ReqHostIs("www.google.com")).HandleConnect(goproxy.AlwaysMitm)
+var AlwaysMitm FuncHttpsHandler = func(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+	return MitmConnect, host
+}
+
+// AlwaysReject is a HttpsHandler that drops any CONNECT request, for example, this code will disallow
+// connections to hosts on any other port than 443
+//	proxy.OnRequest(goproxy.Not(goproxy.ReqHostMatches(regexp.MustCompile(":443$"))).
+//		HandleConnect(goproxy.AlwaysReject)
+var AlwaysReject FuncHttpsHandler = func(host string, ctx *ProxyCtx) (*ConnectAction, string) {
+	return RejectConnect, host
+}
+
+// HandleBytes will return a RespHandler that read the entire body of the request
+// to a byte array in memory, would run the user supplied f function on the byte arra,
+// and will replace the body of the original response with the resulting byte array.
+func HandleBytes(f func(b []byte, ctx *ProxyCtx) []byte) RespHandler {
+	return FuncRespHandler(func(resp *http.Response, ctx *ProxyCtx) *http.Response {
+		b, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			ctx.Warnf("Cannot read response %s", err)
+			return resp
+		}
+		resp.Body.Close()
+
+		resp.Body = ioutil.NopCloser(bytes.NewBuffer(f(b, ctx)))
+		return resp
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/doc.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/doc.go
new file mode 100644
index 0000000000..50aaa71f80
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/doc.go
@@ -0,0 +1,100 @@
+/*
+Package goproxy provides a customizable HTTP proxy,
+supporting hijacking HTTPS connection.
+
+The intent of the proxy, is to be usable with reasonable amount of traffic
+yet, customizable and programable.
+
+The proxy itself is simply an `net/http` handler.
+
+Typical usage is
+
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(..conditions..).Do(..requesthandler..)
+	proxy.OnRequest(..conditions..).DoFunc(..requesthandlerFunction..)
+	proxy.OnResponse(..conditions..).Do(..responesHandler..)
+	proxy.OnResponse(..conditions..).DoFunc(..responesHandlerFunction..)
+	http.ListenAndServe(":8080", proxy)
+
+Adding a header to each request
+
+	proxy.OnRequest().DoFunc(func(r *http.Request,ctx *goproxy.ProxyCtx) (*http.Request, *http.Response){
+		r.Header.Set("X-GoProxy","1")
+		return r, nil
+	})
+
+Note that the function is called before the proxy sends the request to the server
+
+For printing the content type of all incoming responses
+
+	proxy.OnResponse().DoFunc(func(r *http.Response, ctx *goproxy.ProxyCtx)*http.Response{
+		println(ctx.Req.Host,"->",r.Header.Get("Content-Type"))
+		return r
+	})
+
+note that we used the ProxyCtx context variable here. It contains the request
+and the response (Req and Resp, Resp is nil if unavailable) of this specific client
+interaction with the proxy.
+
+To print the content type of all responses from a certain url, we'll add a
+ReqCondition to the OnResponse function:
+
+	proxy.OnResponse(goproxy.UrlIs("golang.org/pkg")).DoFunc(func(r *http.Response, ctx *goproxy.ProxyCtx)*http.Response{
+		println(ctx.Req.Host,"->",r.Header.Get("Content-Type"))
+		return r
+	})
+
+We can write the condition ourselves, conditions can be set on request and on response
+
+	var random = ReqConditionFunc(func(r *http.Request) bool {
+		return rand.Intn(1) == 0
+	})
+	var hasGoProxyHeader = RespConditionFunc(func(resp *http.Response,req *http.Request)bool {
+		return resp.Header.Get("X-GoProxy") != ""
+	})
+
+Caution! If you give a RespCondition to the OnRequest function, you'll get a run time panic! It doesn't
+make sense to read the response, if you still haven't got it!
+
+Finally, we have convenience function to throw a quick response
+
+	proxy.OnResponse(hasGoProxyHeader).DoFunc(func(r*http.Response,ctx *goproxy.ProxyCtx)*http.Response {
+		r.Body.Close()
+		return goproxy.ForbiddenTextResponse(ctx.Req,"Can't see response with X-GoProxy header!")
+	})
+
+we close the body of the original repsonse, and return a new 403 response with a short message.
+
+Example use cases:
+
+1. https://github.com/elazarl/goproxy/tree/master/examples/goproxy-avgsize
+
+To measure the average size of an Html served in your site. One can ask
+all the QA team to access the website by a proxy, and the proxy will
+measure the average size of all text/html responses from your host.
+
+2. [not yet implemented]
+
+All requests to your web servers should be directed through the proxy,
+when the proxy will detect html pieces sent as a response to AJAX
+request, it'll send a warning email.
+
+3. https://github.com/elazarl/goproxy/blob/master/examples/goproxy-httpdump/
+
+Generate a real traffic to your website by real users using through
+proxy. Record the traffic, and try it again for more real load testing.
+
+4. https://github.com/elazarl/goproxy/tree/master/examples/goproxy-no-reddit-at-worktime
+
+Will allow browsing to reddit.com between 8:00am and 17:00pm
+
+5. https://github.com/elazarl/goproxy/tree/master/examples/goproxy-jquery-version
+
+Will warn if multiple versions of jquery are used in the same domain.
+
+6. https://github.com/elazarl/goproxy/blob/master/examples/goproxy-upside-down-ternet/
+
+Modifies image files in an HTTP response via goproxy's image extension found in ext/.
+
+*/
+package goproxy
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/README.md
new file mode 100644
index 0000000000..8778f2a75b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/README.md
@@ -0,0 +1,29 @@
+# Simple HTTP Proxy
+
+`goproxy-basic` starts an HTTP proxy on :8080. It only handles explicit CONNECT
+requests.
+
+Start it in one shell:
+
+```sh
+goproxy-basic -v
+```
+
+Fetch goproxy homepage in another:
+
+```sh
+http_proxy=http://127.0.0.1:8080 wget -O - \
+	http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+```
+
+The homepage HTML content should be displayed in the console. The proxy should
+have logged the request being processed:
+
+```sh
+2015/04/09 18:19:17 [001] INFO: Got request /p/introducing-goproxy-light-http-proxy/ ripper234.com GET http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+2015/04/09 18:19:17 [001] INFO: Sending request GET http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+2015/04/09 18:19:18 [001] INFO: Received response 200 OK
+2015/04/09 18:19:18 [001] INFO: Copying response to client 200 OK [200]
+2015/04/09 18:19:18 [001] INFO: Copied 44333 bytes to client error=<nil>
+```
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/main.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/main.go
new file mode 100644
index 0000000000..22dc4a9073
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-basic/main.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"log"
+	"flag"
+	"net/http"
+)
+
+func main() {
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("addr", ":8080", "proxy listen address")
+	flag.Parse()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = *verbose
+	log.Fatal(http.ListenAndServe(*addr, proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go
new file mode 100644
index 0000000000..9d80653be5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-eavesdropper/main.go
@@ -0,0 +1,56 @@
+package main
+
+import (
+	"bufio"
+	"flag"
+	"log"
+	"net"
+	"net/http"
+	"regexp"
+
+	"github.com/elazarl/goproxy"
+)
+
+func orPanic(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+func main() {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(goproxy.ReqHostMatches(regexp.MustCompile("^.*baidu.com$"))).
+		HandleConnect(goproxy.AlwaysReject)
+	proxy.OnRequest(goproxy.ReqHostMatches(regexp.MustCompile("^.*$"))).
+		HandleConnect(goproxy.AlwaysMitm)
+	// enable curl -p for all hosts on port 80
+	proxy.OnRequest(goproxy.ReqHostMatches(regexp.MustCompile("^.*:80$"))).
+		HijackConnect(func(req *http.Request, client net.Conn, ctx *goproxy.ProxyCtx) {
+		defer func() {
+			if e := recover(); e != nil {
+				ctx.Logf("error connecting to remote: %v", e)
+				client.Write([]byte("HTTP/1.1 500 Cannot reach destination\r\n\r\n"))
+			}
+			client.Close()
+		}()
+		clientBuf := bufio.NewReadWriter(bufio.NewReader(client), bufio.NewWriter(client))
+		remote, err := net.Dial("tcp", req.URL.Host)
+		orPanic(err)
+		remoteBuf := bufio.NewReadWriter(bufio.NewReader(remote), bufio.NewWriter(remote))
+		for {
+			req, err := http.ReadRequest(clientBuf.Reader)
+			orPanic(err)
+			orPanic(req.Write(remoteBuf))
+			orPanic(remoteBuf.Flush())
+			resp, err := http.ReadResponse(remoteBuf.Reader, req)
+			orPanic(err)
+			orPanic(resp.Write(clientBuf.Writer))
+			orPanic(clientBuf.Flush())
+		}
+	})
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("addr", ":8080", "proxy listen address")
+	flag.Parse()
+	proxy.Verbose = *verbose
+	log.Fatal(http.ListenAndServe(*addr, proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md
new file mode 100644
index 0000000000..7240d8eacf
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/README.md
@@ -0,0 +1,30 @@
+# Trace HTTP Requests and Responses
+
+`goproxy-httpdump` starts an HTTP proxy on :8080. It handles explicit CONNECT
+requests and traces them in a "db" directory created in the proxy working
+directory.  Each request type and headers are logged in a "log" file, while
+their bodies are dumped in files prefixed with the request session identifier.
+
+Additionally, the example demonstrates how to:
+- Log information asynchronously (see HttpLogger)
+- Allow the proxy to be stopped manually while ensuring all pending requests
+  have been processed (in this case, logged).
+
+Start it in one shell:
+
+```sh
+goproxy-httpdump
+```
+
+Fetch goproxy homepage in another:
+
+```sh
+http_proxy=http://127.0.0.1:8080 wget -O - \
+	http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+```
+
+A "db" directory should have appeared where you started the proxy, containing
+two files:
+- log: the request/response traces
+- 1\_resp: the first response body
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go
new file mode 100644
index 0000000000..62a9b88237
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-httpdump/httpdump.go
@@ -0,0 +1,285 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"net/http/httputil"
+	"os"
+	"os/signal"
+	"path"
+	"sync"
+	"time"
+
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/transport"
+)
+
+type FileStream struct {
+	path string
+	f    *os.File
+}
+
+func NewFileStream(path string) *FileStream {
+	return &FileStream{path, nil}
+}
+
+func (fs *FileStream) Write(b []byte) (nr int, err error) {
+	if fs.f == nil {
+		fs.f, err = os.Create(fs.path)
+		if err != nil {
+			return 0, err
+		}
+	}
+	return fs.f.Write(b)
+}
+
+func (fs *FileStream) Close() error {
+	fmt.Println("Close", fs.path)
+	if fs.f == nil {
+		return errors.New("FileStream was never written into")
+	}
+	return fs.f.Close()
+}
+
+type Meta struct {
+	req      *http.Request
+	resp     *http.Response
+	err      error
+	t        time.Time
+	sess     int64
+	bodyPath string
+	from     string
+}
+
+func fprintf(nr *int64, err *error, w io.Writer, pat string, a ...interface{}) {
+	if *err != nil {
+		return
+	}
+	var n int
+	n, *err = fmt.Fprintf(w, pat, a...)
+	*nr += int64(n)
+}
+
+func write(nr *int64, err *error, w io.Writer, b []byte) {
+	if *err != nil {
+		return
+	}
+	var n int
+	n, *err = w.Write(b)
+	*nr += int64(n)
+}
+
+func (m *Meta) WriteTo(w io.Writer) (nr int64, err error) {
+	if m.req != nil {
+		fprintf(&nr, &err, w, "Type: request\r\n")
+	} else if m.resp != nil {
+		fprintf(&nr, &err, w, "Type: response\r\n")
+	}
+	fprintf(&nr, &err, w, "ReceivedAt: %v\r\n", m.t)
+	fprintf(&nr, &err, w, "Session: %d\r\n", m.sess)
+	fprintf(&nr, &err, w, "From: %v\r\n", m.from)
+	if m.err != nil {
+		// note the empty response
+		fprintf(&nr, &err, w, "Error: %v\r\n\r\n\r\n\r\n", m.err)
+	} else if m.req != nil {
+		fprintf(&nr, &err, w, "\r\n")
+		buf, err2 := httputil.DumpRequest(m.req, false)
+		if err2 != nil {
+			return nr, err2
+		}
+		write(&nr, &err, w, buf)
+	} else if m.resp != nil {
+		fprintf(&nr, &err, w, "\r\n")
+		buf, err2 := httputil.DumpResponse(m.resp, false)
+		if err2 != nil {
+			return nr, err2
+		}
+		write(&nr, &err, w, buf)
+	}
+	return
+}
+
+// HttpLogger is an asynchronous HTTP request/response logger. It traces
+// requests and responses headers in a "log" file in logger directory and dumps
+// their bodies in files prefixed with the session identifiers.
+// Close it to ensure pending items are correctly logged.
+type HttpLogger struct {
+	path  string
+	c     chan *Meta
+	errch chan error
+}
+
+func NewLogger(basepath string) (*HttpLogger, error) {
+	f, err := os.Create(path.Join(basepath, "log"))
+	if err != nil {
+		return nil, err
+	}
+	logger := &HttpLogger{basepath, make(chan *Meta), make(chan error)}
+	go func() {
+		for m := range logger.c {
+			if _, err := m.WriteTo(f); err != nil {
+				log.Println("Can't write meta", err)
+			}
+		}
+		logger.errch <- f.Close()
+	}()
+	return logger, nil
+}
+
+func (logger *HttpLogger) LogResp(resp *http.Response, ctx *goproxy.ProxyCtx) {
+	body := path.Join(logger.path, fmt.Sprintf("%d_resp", ctx.Session))
+	from := ""
+	if ctx.UserData != nil {
+		from = ctx.UserData.(*transport.RoundTripDetails).TCPAddr.String()
+	}
+	if resp == nil {
+		resp = emptyResp
+	} else {
+		resp.Body = NewTeeReadCloser(resp.Body, NewFileStream(body))
+	}
+	logger.LogMeta(&Meta{
+		resp: resp,
+		err:  ctx.Error,
+		t:    time.Now(),
+		sess: ctx.Session,
+		from: from})
+}
+
+var emptyResp = &http.Response{}
+var emptyReq = &http.Request{}
+
+func (logger *HttpLogger) LogReq(req *http.Request, ctx *goproxy.ProxyCtx) {
+	body := path.Join(logger.path, fmt.Sprintf("%d_req", ctx.Session))
+	if req == nil {
+		req = emptyReq
+	} else {
+		req.Body = NewTeeReadCloser(req.Body, NewFileStream(body))
+	}
+	logger.LogMeta(&Meta{
+		req:  req,
+		err:  ctx.Error,
+		t:    time.Now(),
+		sess: ctx.Session,
+		from: req.RemoteAddr})
+}
+
+func (logger *HttpLogger) LogMeta(m *Meta) {
+	logger.c <- m
+}
+
+func (logger *HttpLogger) Close() error {
+	close(logger.c)
+	return <-logger.errch
+}
+
+// TeeReadCloser extends io.TeeReader by allowing reader and writer to be
+// closed.
+type TeeReadCloser struct {
+	r io.Reader
+	w io.WriteCloser
+	c io.Closer
+}
+
+func NewTeeReadCloser(r io.ReadCloser, w io.WriteCloser) io.ReadCloser {
+	return &TeeReadCloser{io.TeeReader(r, w), w, r}
+}
+
+func (t *TeeReadCloser) Read(b []byte) (int, error) {
+	return t.r.Read(b)
+}
+
+// Close attempts to close the reader and write. It returns an error if both
+// failed to Close.
+func (t *TeeReadCloser) Close() error {
+	err1 := t.c.Close()
+	err2 := t.w.Close()
+	if err1 != nil {
+		return err1
+	}
+	return err2
+}
+
+// stoppableListener serves stoppableConn and tracks their lifetime to notify
+// when it is safe to terminate the application.
+type stoppableListener struct {
+	net.Listener
+	sync.WaitGroup
+}
+
+type stoppableConn struct {
+	net.Conn
+	wg *sync.WaitGroup
+}
+
+func newStoppableListener(l net.Listener) *stoppableListener {
+	return &stoppableListener{l, sync.WaitGroup{}}
+}
+
+func (sl *stoppableListener) Accept() (net.Conn, error) {
+	c, err := sl.Listener.Accept()
+	if err != nil {
+		return c, err
+	}
+	sl.Add(1)
+	return &stoppableConn{c, &sl.WaitGroup}, nil
+}
+
+func (sc *stoppableConn) Close() error {
+	sc.wg.Done()
+	return sc.Conn.Close()
+}
+
+func main() {
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("l", ":8080", "on which address should the proxy listen")
+	flag.Parse()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = *verbose
+	if err := os.MkdirAll("db", 0755); err != nil {
+		log.Fatal("Can't create dir", err)
+	}
+	logger, err := NewLogger("db")
+	if err != nil {
+		log.Fatal("can't open log file", err)
+	}
+	tr := transport.Transport{Proxy: transport.ProxyFromEnvironment}
+	// For every incoming request, override the RoundTripper to extract
+	// connection information. Store it is session context log it after
+	// handling the response.
+	proxy.OnRequest().DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		ctx.RoundTripper = goproxy.RoundTripperFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (resp *http.Response, err error) {
+			ctx.UserData, resp, err = tr.DetailedRoundTrip(req)
+			return
+		})
+		logger.LogReq(req, ctx)
+		return req, nil
+	})
+	proxy.OnResponse().DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		logger.LogResp(resp, ctx)
+		return resp
+	})
+	l, err := net.Listen("tcp", *addr)
+	if err != nil {
+		log.Fatal("listen:", err)
+	}
+	sl := newStoppableListener(l)
+	ch := make(chan os.Signal)
+	signal.Notify(ch, os.Interrupt)
+	go func() {
+		<-ch
+		log.Println("Got SIGINT exiting")
+		sl.Add(1)
+		sl.Close()
+		logger.Close()
+		sl.Done()
+	}()
+	log.Println("Starting Proxy")
+	http.Serve(sl, proxy)
+	sl.Wait()
+	log.Println("All connections closed - exit")
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md
new file mode 100644
index 0000000000..6efba22adc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/README.md
@@ -0,0 +1,31 @@
+# Content Analysis
+
+`goproxy-jquery-version` starts an HTTP proxy on :8080. It checks HTML
+responses, looks for scripts referencing jQuery library and emits warnings if
+different versions of the library are being used for a given host.
+
+Start it in one shell:
+
+```sh
+goproxy-jquery-version
+```
+
+Fetch goproxy homepage in another:
+
+```sh
+http_proxy=http://127.0.0.1:8080 wget -O - \
+	http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+```
+
+Goproxy homepage uses jQuery and a mix of plugins. First the proxy reports the
+first use of jQuery it detects for the domain. Then, because the regular
+expression matching the jQuery sources is imprecise, it reports a mismatch with
+a plugin reference:
+
+```sh
+2015/04/11 11:23:02 [001] WARN: ripper234.com uses //ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js
+2015/04/11 11:23:02 [001] WARN: In http://ripper234.com/p/introducing-goproxy-light-http-proxy/, \
+  Contradicting jqueries //ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js \
+  http://ripper234.wpengine.netdna-cdn.com/wp-content/plugins/wp-ajax-edit-comments/js/jquery.colorbox.min.js?ver=5.0.36
+```
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html
new file mode 100644
index 0000000000..26771ce34d
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery1.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<html>
+<head>
+<script src="jquery.1.4.js"></script>
+</head>
+<body/>
+</html>
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html
new file mode 100644
index 0000000000..7dce036146
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery2.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<html>
+<head>
+<script src="jquery.1.3.js"></script>
+</head>
+<body/>
+</html>
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html
new file mode 100644
index 0000000000..27dd0b38a7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_homepage.html
@@ -0,0 +1,233 @@
+<!DOCTYPE html>
+	<html>
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<title>jQuery: The Write Less, Do More, JavaScript Library</title>
+		<link rel="stylesheet" href="http://static.jquery.com/files/rocker/css/reset.css" type="text/css" />
+		<link rel="stylesheet" href="http://static.jquery.com/files/rocker/css/screen.css" type="text/css" />
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+		<script>!window.jQuery && document.write('<script src="http://code.jquery.com/jquery-1.4.2.min.js"><\/script>');</script>
+		<script src="http://static.jquery.com/files/rocker/scripts/custom.js"></script>
+		<link rel="alternate" type="application/rss+xml" title="jQuery Blog" href="http://jquery.com/blog/feed/" />
+		<link rel="shortcut icon" href="http://static.jquery.com/favicon.ico" type="image/x-icon"/>
+	</head>
+	<body>
+	<div id="jq-siteContain">
+			<div id="jq-header">
+				<a id="jq-siteLogo" href="http://jquery.com" title="jQuery Home"><img src="http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif" width="215" height="53" alt="jQuery: Write Less, Do More." /></a>
+
+				<div id="jq-primaryNavigation">
+					<ul>
+						<li class="jq-jquery jq-current"><a href="http://jquery.com/" title="jQuery Home">jQuery</a></li>
+						<li class="jq-ui"><a href="http://jqueryui.com/" title="jQuery UI">UI</a></li>
+						<li class="jq-mobile"><a href="http://jquerymobile.com/" title="jQuery Mobile">Mobile</a></li>
+						<li class="jq-plugins"><a href="http://plugins.jquery.com/" title="jQuery Plugins">Plugins</a></li>
+						<li class="jq-meetup"><a href="http://meetups.jquery.com/" title="jQuery Meetups">Meetups</a></li>
+						<li class="jq-forum"><a href="http://forum.jquery.com/" title="jQuery Forum">Forum</a></li>
+						<li class="jq-blog"><a href="http://blog.jquery.com/" title="jQuery Blog">Blog</a></li>
+						<li class="jq-about"><a href="http://jquery.org/about" title="About jQuery">About</a></li>
+						<li class="jq-donate"><a href="http://jquery.org/donate" title="Donate to jQuery">Donate</a></li>
+					</ul>
+				</div><!-- /#primaryNavigation -->
+
+				<div id="jq-secondaryNavigation">
+					<ul>
+						<li class="jq-download jq-first"><a href="http://docs.jquery.com/Downloading_jQuery">Download</a></li>
+
+						<li class="jq-documentation"><a href="http://docs.jquery.com">Documentation</a></li>
+						<li class="jq-tutorials"><a href="http://docs.jquery.com/Tutorials">Tutorials</a></li>
+						<li class="jq-bugTracker"><a href="http://dev.jquery.com/">Bug Tracker</a></li>
+						<li class="jq-discussion jq-last"><a href="http://docs.jquery.com/Discussion">Discussion</a></li>
+					</ul>
+				</div><!-- /#secondaryNavigation -->
+
+
+
+			</div><!-- /#header -->
+
+			<div id="jq-content" class="jq-clearfix">
+
+				<div id="jq-intro" class="jq-clearfix">
+					<h2><span class="jq-jquery"><span>jQuery</span></span> is a new kind of JavaScript Library.</h2>
+					<p>jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. <strong>jQuery is designed to change the way that you write JavaScript.</strong></p>
+					<ul class="jq-checkpoints jq-clearfix">
+						<li><a href="http://docs.jquery.com/Tutorials" title="Lightweight Footprint" class="jq-thickbox">Lightweight Footprint</a>
+							<div class="jq-checkpointSubhead">
+
+								<p>About 31KB in size <em>(Minified and Gzipped)</em></p>
+							</div>
+						</li>
+						<li><a href="http://docs.jquery.com/Tutorials" title="CSS3 Compliant" class="jq-thickbox">CSS3 Compliant</a>
+							<div class="jq-checkpointSubhead">
+								<p>Supports CSS 1-3 selectors and more!</p>
+							</div>
+
+						</li>
+						<li><a href="http://docs.jquery.com/Tutorials" title="Cross-browser" class="jq-thickbox">Cross-browser</a>
+							<div class="jq-checkpointSubhead">
+								<p>IE 6.0+, FF 3.6+, Safari 5.0+, Opera, Chrome</p>
+							</div>
+						</li>
+					</ul>
+				</div><!-- /#intro -->
+
+				<div id="jq-download">
+					<h2>Grab the latest version!</h2>
+					<form action="" method="get">
+						<fieldset>
+							<legend>Choose your compression level:</legend>
+							<div id="jq-compression" class="jq-clearfix">
+								<input type="radio" name="name" value="http://code.jquery.com/jquery-1.7.2.min.js" id="jq-production" checked="checked" />
+								<a class="jq-radioToggle name jq-checked" href="http://code.jquery.com/jquery-1.7.2.min.js">jquery-1.7.2.min.js</a>
+								<label for="jq-production">Production <em>(<strong>32KB</strong>, Minified and Gzipped)</em></label>
+								<input type="radio" name="name" value="http://code.jquery.com/jquery-1.7.2.js" id="jq-development" />
+								<a class="jq-radioToggle name" href="http://code.jquery.com/jquery-1.7.2.js">jquery-1.7.2.js</a>
+								<label for="jq-development">Development <em>(<strong>247KB</strong>, Uncompressed Code)</em></label>
+							</div>
+							<button type="submit" name="downloadBtn" id="jq-downloadBtn"><span>Download</span></button>
+							<p class="jq-version"><strong>Current Release:</strong> v1.7.2</p>
+						</fieldset>
+					</form>
+					<script>
+					jQuery("#jq-download form").submit(function(){
+						window.location = jQuery(this).find("input:checked").val();
+						return false;
+					});
+					</script>
+				</div><!-- /#download -->
+
+				<div id="jq-whosUsing">
+					<h2 class="jq-whosUsing">Who's using jQuery?</h2>
+					<ul class="jq-whosUsing">
+						<li><a href="http://www.google.com" class="jq-google" title="Google">Google</a></li>
+						<li><a href="http://www.dell.com" class="jq-dell" title="Dell">Dell</a></li>
+						<li><a href="http://www.bankofamerica.com" class="jq-boa" title="Bank of America">Bank of America</a></li>
+						<li><a href="http://www.mlb.com" class="jq-mlb" title="Major League Baseball">Major League Baseball</a></li>
+						<li><a href="http://www.digg.com" class="jq-digg" title="Digg">Digg</a></li>
+						<li><a href="http://www.nbc.com" class="jq-nbc" title="NBC">NBC</a></li>
+						<li><a href="http://www.cbs.com" class="jq-cbs" title="CBS News">CBS News</a></li>
+						<li><a href="http://www.netflix.com" class="jq-netflix" title="Netflix">Netflix</a></li>
+						<li><a href="http://www.technorati.com" class="jq-technorati" title="Technorati">Technorati</a></li>
+						<li><a href="http://www.mozilla.org" class="jq-mozilla" title="Mozilla">Mozilla</a></li>
+						<li><a href="http://www.wordpress.org" class="jq-wordpress" title="Wordpress">Wordpress</a></li>
+						<li><a href="http://www.drupal.org" class="jq-drupal" title="Drupal">Drupal</a></li>
+					</ul>
+        </div><!-- /#jq-whosUsing -->
+
+
+				<div id="jq-learnjQuery" class="jq-clearfix">
+
+					<div id="jq-learnNow">
+						<h2>Learn <span class="jq-jquery"><span>jQuery</span></span> Now!</h2>
+						<p>What does jQuery code look like? Here's the quick and dirty:</p>
+						<div class="jq-codeDemo jq-clearfix">
+							<pre><code>$("p.neat").addClass("ohmy").show("slow");</code></pre>
+							<a href="http://docs.jquery.com/Tutorials" class="jq-runCode">Run Code</a>
+
+							<p class="neat"><strong>Congratulations!</strong> You just ran a snippet of jQuery code. Wasn't that easy? There's lots of example code throughout the <strong><a href="http://docs.jquery.com/">documentation</a></strong> on this site. Be sure to give all the code a test run to see what happens.</p>
+						</div>
+					</div><!-- /#learnNow -->
+
+
+
+						<div id="jq-resources" class="clearfix">
+					<h2>jQuery Resources</h2>
+
+					<div class="jq-gettingStarted">
+						<h3>Getting Started With jQuery</h3>
+						<ul>
+							<li><a href="http://docs.jquery.com/How_jQuery_Works">How jQuery Works</a></li>
+							<li><a href="http://docs.jquery.com/Tutorials">Tutorials</a></li>
+							<li><a href="http://docs.jquery.com/Using_jQuery_with_Other_Libraries">Using jQuery with other libraries</a></li>
+							<li><a href="http://docs.jquery.com/">jQuery Documentation</a></li>
+
+						</ul>
+					</div>
+					<div class="jq-devResources">
+						<h3>Developer Resources</h3>
+						<ul>
+							<li><a href="http://docs.jquery.com/Discussion">Mailing List</a></li>
+							<li><a href="http://docs.jquery.com/Downloading_jQuery">Source code / Git</a></li>
+
+							<li><a href="http://docs.jquery.com/Plugins/Authoring">Plugin Authoring</a></li>
+							<li><a href="http://dev.jquery.com/newticket/">Submit a New Bug Report</a></li>
+						</ul>
+					</div>
+					</div><!-- /#resources -->
+
+				</div><!-- /#learnjQuery -->
+
+				<div id="jq-books" style="width:auto; float: none">
+					<h2>Books About jQuery</h2>
+
+					<ul>
+					  <li class="jq-clearfix" style="width:270px;float:left;clear:none;">
+							<a href="http://link.packtpub.com/S3Fr9Q" class="jq-bookImg"><img src="http://learningjquery.kswedberg.netdna-cdn.com/wp-content/themes/ljq/images/ljq3rded.jpg" alt="Learning jQuery Third Edition" width="55" height="70" /></a>
+							<h3><a href="http://link.packtpub.com/S3Fr9Q">Learning jQuery Third Edition</a></h3>
+							<div class="jq-author">Karl Swedberg and <br />Jonathan Chaffer</div>
+							<a href="http://link.packtpub.com/S3Fr9Q" class="jq-buyNow">Buy Now</a>
+						</li>
+  					<li class="jq-clearfix" style="width:270px;float:left;clear:none;">
+  							<a href="http://www.packtpub.com/jquery-1-4-animation-techniques-beginners-guide/book/mid/1803111nkj15" class="jq-bookImg"><img src="http://static.jquery.com/books/jquery-animation-beginners-guide.jpg" alt="jQuery 1.4 Animation Techniques: Beginners Guide" width="55" height="70" /></a>
+  							<h3><a href="http://www.packtpub.com/jquery-1-4-animation-techniques-beginners-guide/book/mid/1803111nkj15">jQuery 1.4 Animation Techniques: Beginners Guide</a></h3>
+  							<div class="jq-author">Dan Wellman</div>
+  							<a href="http://www.packtpub.com/jquery-1-4-animation-techniques-beginners-guide/book/mid/1803111nkj15" class="jq-buyNow">Buy Now</a>
+  						</li>
+					  <li class="jq-clearfix" style="width:270px;float:left;clear:none;">
+  							<a href="http://www.packtpub.com/jquery-plugin-development-beginners-guide/book/mid/1911104odmdz" class="jq-bookImg"><img src="http://static.jquery.com/books/jquery-plugin-developers-guide_thumb.jpg" alt="jQuery Plugin Development Beginner's Guide" width="55" height="70" /></a>
+  							<h3><a href="http://www.packtpub.com/jquery-plugin-development-beginners-guide/book/mid/1911104odmdz">jQuery Plugin Development Beginner's Guide</a></h3>
+  							<div class="jq-author">Guilio Bai</div>
+  							<a href="http://www.packtpub.com/jquery-plugin-development-beginners-guide/book/mid/1911104odmdz" class="jq-buyNow">Buy Now</a>
+  						</li>
+
+						<li class="jq-clearfix" style="width:270px;float:left;clear:left;">
+							<a href="http://www.manning.com/affiliate/idevaffiliate.php?id=648_176" class="jq-bookImg"><img src="http://static.jquery.com/books/jquery-in-action-2ed_thumb.jpg" alt="jQuery in Action" width="55" height="70" /></a>
+							<h3><a href="http://www.manning.com/affiliate/idevaffiliate.php?id=648_176">jQuery in Action</a></h3>
+							<div class="jq-author">Bear Bibeault
+							  <br />and Yehuda Katz</div>
+							<a href="http://www.manning.com/affiliate/idevaffiliate.php?id=648_176" class="jq-buyNow">Buy Now</a>
+						</li>
+						<li class="jq-clearfix" style="width:270px;float:left;clear:none;">
+						  <a class="jq-bookImg" href="http://jqueryenlightenment.com/"><img src="http://static.jquery.com/books/jquery-enlightenment_thumb.jpg" alt="jQuery Enlightenment" width="55" height="70" /></a>
+							<h3><a href="http://jqueryenlightenment.com/">jQuery Enlightenment</a></h3>
+							<div class="jq-author">Cody Lindley</div>
+							<a href="http://jqueryenlightenment.com/" class="jq-buyNow">Buy Now</a>
+						</li>
+					</ul>
+
+				</div><!-- /#news -->
+
+
+
+			</div><!-- /#content -->
+
+
+			<div id="jq-footer" class="jq-clearfix">
+
+				<div id="jq-credits">
+					<p id="jq-copyright">&copy; 2010 <a href="http://jquery.org/">The jQuery Project</a></p>
+					<p id="jq-hosting">Sponsored by <a href="http://mediatemple.net" class="jq-mediaTemple">Media Temple</a> and <a href="http://jquery.org/sponsors">others</a>.</p>
+				</div>
+
+				<div id="jq-footerNavigation">
+					<ul>
+						<li class="jq-download jq-first"><a href="http://docs.jquery.com/Downloading_jQuery">Download</a></li>
+						<li class="jq-documentation"><a href="http://docs.jquery.com">Documentation</a></li>
+
+						<li class="jq-tutorials"><a href="http://docs.jquery.com/Tutorials">Tutorials</a></li>
+						<li class="jq-bugTracker"><a href="http://dev.jquery.com/">Bug Tracker</a></li>
+						<li class="jq-discussion jq-last"><a href="http://docs.jquery.com/Discussion">Discussion</a></li>
+					</ul>
+				</div><!-- /#secondaryNavigation -->
+
+			</div><!-- /#footer -->
+	</div><!-- /#siteContain -->
+	<script src="http://static.jquery.com/donate/donate.js" type="text/javascript"></script>
+	<script type="text/javascript">
+	var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-1076265-1']); _gaq.push(['_trackPageview']); _gaq.push(['_setDomainName', '.jquery.com']);
+	(function() {var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+	ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+	(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);})();
+	</script>
+	</body>
+</html>
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_test.go
new file mode 100644
index 0000000000..af300aaf31
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/jquery_test.go
@@ -0,0 +1,118 @@
+package main
+
+import (
+	"bytes"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+)
+
+func equal(u, v []string) bool {
+	if len(u) != len(v) {
+		return false
+	}
+	for i, _ := range u {
+		if u[i] != v[i] {
+			return false
+		}
+	}
+	return true
+}
+
+func readFile(fname string, t *testing.T) string {
+	b, err := ioutil.ReadFile(fname)
+	if err != nil {
+		t.Fatal("readFile", err)
+	}
+	return string(b)
+}
+
+func TestDefectiveScriptParser(t *testing.T) {
+	if l := len(findScriptSrc(`<!DOCTYPE HTML>
+    <html>
+    <body>
+
+    <video width="320" height="240" controls="controls">
+      <source src="movie.mp4" type="video/mp4" />
+	<source src="movie.ogg" type="video/ogg" />
+	  <source src="movie.webm" type="video/webm" />
+	  Your browser does not support the video tag.
+	  </video>
+
+	  </body>
+	  </html>`)); l != 0 {
+		t.Fail()
+	}
+	urls := findScriptSrc(readFile("w3schools.html", t))
+	if !equal(urls, []string{"http://partner.googleadservices.com/gampad/google_service.js",
+		"//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"}) {
+		t.Error("w3schools.html", "src scripts are not recognized", urls)
+	}
+	urls = findScriptSrc(readFile("jquery_homepage.html", t))
+	if !equal(urls, []string{"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js",
+		"http://code.jquery.com/jquery-1.4.2.min.js",
+		"http://static.jquery.com/files/rocker/scripts/custom.js",
+		"http://static.jquery.com/donate/donate.js"}) {
+		t.Error("jquery_homepage.html", "src scripts are not recognized", urls)
+	}
+}
+
+func proxyWithLog() (*http.Client, *bytes.Buffer) {
+	proxy := NewJqueryVersionProxy()
+	proxyServer := httptest.NewServer(proxy)
+	buf := new(bytes.Buffer)
+	proxy.Logger = log.New(buf, "", 0)
+	proxyUrl, _ := url.Parse(proxyServer.URL)
+	tr := &http.Transport{Proxy: http.ProxyURL(proxyUrl)}
+	client := &http.Client{Transport: tr}
+	return client, buf
+}
+
+func get(t *testing.T, server *httptest.Server, client *http.Client, url string) {
+	resp, err := client.Get(server.URL + url)
+	if err != nil {
+		t.Fatal("cannot get proxy", err)
+	}
+	ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+}
+
+func TestProxyServiceTwoVersions(t *testing.T) {
+	var fs = httptest.NewServer(http.FileServer(http.Dir(".")))
+	defer fs.Close()
+
+	client, buf := proxyWithLog()
+
+	get(t, fs, client, "/w3schools.html")
+	get(t, fs, client, "/php_man.html")
+	if buf.String() != "" &&
+		!strings.Contains(buf.String(), " uses jquery ") {
+		t.Error("shouldn't warn on a single URL", buf.String())
+	}
+	get(t, fs, client, "/jquery1.html")
+	warnings := buf.String()
+	if !strings.Contains(warnings, "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js") ||
+		!strings.Contains(warnings, "jquery.1.4.js") ||
+		!strings.Contains(warnings, "Contradicting") {
+		t.Error("contradicting jquery versions (php_man.html, w3schools.html) does not issue warning", warnings)
+	}
+}
+
+func TestProxyService(t *testing.T) {
+	var fs = httptest.NewServer(http.FileServer(http.Dir(".")))
+	defer fs.Close()
+
+	client, buf := proxyWithLog()
+
+	get(t, fs, client, "/jquery_homepage.html")
+	warnings := buf.String()
+	if !strings.Contains(warnings, "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js") ||
+		!strings.Contains(warnings, "http://code.jquery.com/jquery-1.4.2.min.js") ||
+		!strings.Contains(warnings, "Contradicting") {
+		t.Error("contradicting jquery versions does not issue warning")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go
new file mode 100644
index 0000000000..a92dddeacb
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/main.go
@@ -0,0 +1,64 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/html"
+	"log"
+	"net/http"
+	"regexp"
+)
+
+var (
+	// who said we can't parse HTML with regexp?
+	scriptMatcher  = regexp.MustCompile(`(?i:<script\s+)`)
+	srcAttrMatcher = regexp.MustCompile(`^(?i:[^>]*\ssrc=["']([^"']*)["'])`)
+)
+
+// findScripts returns all sources of HTML script tags found in input text.
+func findScriptSrc(html string) []string {
+	srcs := make([]string, 0)
+	matches := scriptMatcher.FindAllStringIndex(html, -1)
+	for _, match := range matches {
+		// -1 to capture the whitespace at the end of the script tag
+		srcMatch := srcAttrMatcher.FindStringSubmatch(html[match[1]-1:])
+		if srcMatch != nil {
+			srcs = append(srcs, srcMatch[1])
+		}
+	}
+	return srcs
+}
+
+// NewJQueryVersionProxy creates a proxy checking responses HTML content, looks
+// for scripts referencing jQuery library and emits warnings if different
+// versions of the library are being used for a given host.
+func NewJqueryVersionProxy() *goproxy.ProxyHttpServer {
+	proxy := goproxy.NewProxyHttpServer()
+	m := make(map[string]string)
+	jqueryMatcher := regexp.MustCompile(`(?i:jquery\.)`)
+	proxy.OnResponse(goproxy_html.IsHtml).Do(goproxy_html.HandleString(
+		func(s string, ctx *goproxy.ProxyCtx) string {
+			for _, src := range findScriptSrc(s) {
+				if !jqueryMatcher.MatchString(src) {
+					continue
+				}
+				prev, ok := m[ctx.Req.Host]
+				if ok {
+					if prev != src {
+						ctx.Warnf("In %v, Contradicting jqueries %v %v",
+							ctx.Req.URL, prev, src)
+						break
+					}
+				} else {
+					ctx.Warnf("%s uses jquery %s", ctx.Req.Host, src)
+					m[ctx.Req.Host] = src
+				}
+			}
+			return s
+		}))
+	return proxy
+}
+
+func main() {
+	proxy := NewJqueryVersionProxy()
+	log.Fatal(http.ListenAndServe(":8080", proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html
new file mode 100644
index 0000000000..1159d762d6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/php_man.html
@@ -0,0 +1,323 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://purl.org/NET/erdf/profile">
+ <title>PHP: PHP Manual - Manual</title>
+ <style type="text/css" media="all">
+  @import url("http://static.php.net/www.php.net/styles/site.css");
+  @import url("http://static.php.net/www.php.net/styles/phpnet.css");
+  
+ </style>
+ <!--[if IE]><![if gte IE 6]><![endif]-->
+  <style type="text/css" media="print">
+   @import url("http://static.php.net/www.php.net/styles/print.css");
+  </style>
+ <!--[if IE]><![endif]><![endif]-->
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <link rel="shortcut icon" href="http://static.php.net/www.php.net/favicon.ico" />
+ <link rel="contents" href="index.php" />
+ <link rel="index" href="" />
+ <link rel="prev" href="" />
+ <link rel="next" href="" />
+ <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
+ <link rel="schema.rdfs" href="http://www.w3.org/2000/01/rdf-schema#" />
+ <link rev="canonical" rel="self alternate shorter shorturl shortlink" href="http://php.net/index" />
+ <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" about="#content" />
+ <link rel="alternate" href="/manual/en/feeds/index.atom" type="application/atom+xml" />
+ <link rel="canonical" href="http://php.net/manual/en/index.php" />
+ <script type="text/javascript" src="http://static.php.net/www.php.net/userprefs.js"></script>
+ <base href="http://www.php.net/manual/en/index.php" />
+ <meta http-equiv="Content-language" content="en" />
+            <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+            <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    var toggleImage = function(elem) {
+        if ($(elem).hasClass("shown")) {
+            $(elem).removeClass("shown").addClass("hidden");
+            $("img", elem).attr("src", "/images/notes-add.gif");
+        }
+        else {
+            $(elem).removeClass("hidden").addClass("shown");
+            $("img", elem).attr("src", "/images/notes-reject.gif");
+        }
+    };
+
+    $(".refsect1 h3.title").each(function() {
+        url = "https://bugs.php.net/report.php?bug_type=Documentation+problem&amp;manpage=" + $(this).parent().parent().attr("id") + "%23" + $(this).parent().attr("id");
+        $(this).parent().prepend("<div class='reportbug'><a href='" + url + "'>Report a bug</a></div>");
+        $(this).prepend("<a class='toggler shown' href='#'><img src='/images/notes-reject.gif' alt='reject note' /></a> ");
+    });
+    $("#usernotes .head").each(function() {
+        $(this).prepend("<a class='toggler shown' href='#'><img src='/images/notes-reject.gif' alt='reject note' /></a> ");
+    });
+    $(".refsect1 h3.title .toggler").click(function() {
+        $(this).parent().siblings().slideToggle("slow");
+        toggleImage(this);
+        return false;
+    });
+    $("#usernotes .head .toggler").click(function() {
+        $(this).parent().next().slideToggle("slow");
+        toggleImage(this);
+        return false;
+    });
+});
+</script>
+
+</head>
+<body>
+
+<div id="headnav">
+ <a href="/" rel="home"><img src="http://static.php.net/www.php.net/images/php.gif"
+ alt="PHP" width="120" height="67" id="phplogo" /></a>
+ <div id="headmenu">
+  <a href="/downloads.php">downloads</a> |
+  <a href="/docs.php">documentation</a> |
+  <a href="/FAQ.php">faq</a> |
+  <a href="/support.php">getting help</a> |
+  <a href="/mailing-lists.php">mailing lists</a> |
+  <a href="/license">licenses</a> |
+  <a href="https://wiki.php.net/">wiki</a> |
+  <a href="https://bugs.php.net/">reporting bugs</a> |
+  <a href="/sites.php">php.net sites</a> |
+  <a href="/links.php">links</a> |
+  <a href="/conferences/">conferences</a> |
+  <a href="/my.php">my php.net</a>
+ </div>
+</div>
+
+<div id="headsearch">
+ <form method="post" action="/search.php" id="topsearch">
+  <p>
+   <span title="Keyboard shortcut: Alt+S (Win), Ctrl+S (Apple)">
+    <span class="shortkey">s</span>earch for
+   </span>
+   <input type="text" name="pattern" value="" size="30" accesskey="s" />
+   <span>in the</span>
+   <select name="show">
+    <option value="all"      >all php.net sites</option>
+    <option value="local"    >this mirror only</option>
+    <option value="quickref" selected="selected">function list</option>
+    <option value="manual"   >online documentation</option>
+    <option value="bugdb"    >bug database</option>
+    <option value="news_archive">Site News Archive</option>
+    <option value="changelogs">All Changelogs</option>
+    <option value="pear"     >just pear.php.net</option>
+    <option value="pecl"     >just pecl.php.net</option>
+    <option value="talks"    >just talks.php.net</option>
+    <option value="maillist" >general mailing list</option>
+    <option value="devlist"  >developer mailing list</option>
+    <option value="phpdoc"   >documentation mailing list</option>
+   </select>
+   <input type="image"
+          src="http://static.php.net/www.php.net/images/small_submit_white.gif"
+          class="submit" alt="search" />
+   <input type="hidden" name="lang" value="en" />
+  </p>
+ </form>
+</div>
+
+<div id="layout_2">
+ <div id="leftbar">
+<!--UdmComment-->
+<ul class="toc">
+ <li class="header home"><a href="index.php">PHP Manual</a></li>
+</ul><!--/UdmComment-->
+
+ </div>
+ <div id="content" class="manual/en">
+<!--UdmComment-->
+<div class="manualnavbar manualnavbar_top">
+ <span class="next">
+ </span>
+ <span class="prev">
+  &nbsp;
+ </span>
+ <hr />
+ <span class="lastupdated">[<a href="https://edit.php.net/?project=PHP&amp;perm=en/index.php">edit</a>] Last updated: Fri, 23 Mar 2012</span>
+ <div class="langchooser">
+  <form action="/manual/change.php" method="get">
+   <p>view this page in </p><fieldset><select name="page">
+    <option value="pt_BR/index.php">Brazilian Portuguese</option>
+    <option value="zh/index.php">Chinese (Simplified)</option>
+    <option value="fr/index.php">French</option>
+    <option value="de/index.php">German</option>
+    <option value="ja/index.php">Japanese</option>
+    <option value="pl/index.php">Polish</option>
+    <option value="ro/index.php">Romanian</option>
+    <option value="ru/index.php">Russian</option>
+    <option value="fa/index.php">Persian</option>
+    <option value="es/index.php">Spanish</option>
+    <option value="tr/index.php">Turkish</option>
+    <option value="help-translate.php">Other</option>
+   </select>
+   <input type="image" src="http://static.php.net/www.php.net/images/small_submit.gif" id="changeLangImage" alt="Change language" />
+  </fieldset></form>
+ </div>
+</div>
+<!--/UdmComment-->
+
+<div id="index" class="set">
+ <h1 class="title">PHP Manual</h1>
+ 
+
+
+ <div class="info">
+  <div class="authorgroup" id="authors">
+
+   <div class="author vcard"><strong class="by">by</strong>:<br />
+   <span class="personname fn">
+     <span class="firstname given-name">Mehdi</span>  <span class="surname family-name">Achour</span>  
+   </span>
+   </div>
+
+   
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Friedhelm</span>  <span class="surname family-name">Betz</span>  
+   </span>
+   </div>
+
+
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Antony</span>  <span class="surname family-name">Dovgal</span>  
+   </span>
+   </div>
+
+   
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Nuno</span>  <span class="surname family-name">Lopes</span>  
+   </span>
+   </div>
+
+
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Hannes</span>  <span class="surname family-name">Magnusson</span>  
+   </span>
+   </div>
+
+
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Georg</span>  <span class="surname family-name">Richter</span>  
+   </span>
+   </div>
+
+
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Damien</span>  <span class="surname family-name">Seguy</span>  
+   </span>
+   </div>
+
+
+   <div class="author vcard">
+   <span class="personname fn">
+     <span class="firstname given-name">Jakub</span>  <span class="surname family-name">Vrana</span>  
+   </span>
+   </div>
+
+
+   
+   <div class="othercredit">
+    <span class="personname fn">
+      <span class="othername">
+     <a href="preface.php#contributors" class="link">And several others</a>
+     </span> 
+    </span>
+   </div>
+
+  </div>
+  <div class="pubdate">2012-03-23</div>
+  
+  <div class="authorgroup" id="editors">
+   <div class="editor vcard"><strong class="editedby">Edited By</strong>: 
+   <span class="personname fn">
+     <span class="firstname given-name">Philip</span>  <span class="surname family-name">Olson</span>  
+   </span>
+   </div>
+
+  </div>
+
+  <div class="copyright">&copy; 
+   <span class="year">1997-2012</span>
+   <span class="holder">the PHP Documentation Group</span>
+  </div>
+
+  
+
+ </div>
+ 
+
+
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+<ul class="chunklist chunklist_set"><li><a href="copyright.php">Copyright</a></li><li><a href="manual.php">PHP Manual</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="preface.php">Preface</a></li></ul></li><li><a href="getting-started.php">Getting Started</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="introduction.php">Introduction</a></li><li><a href="tutorial.php">A simple tutorial</a></li></ul></li><li><a href="install.php">Installation and Configuration</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="install.general.php">General Installation Considerations</a></li><li><a href="install.unix.php">Installation on Unix systems</a></li><li><a href="install.macosx.php">Installation on Mac OS X</a></li><li><a href="install.windows.php">Installation on Windows systems</a></li><li><a href="install.cloud.php">Installation on Cloud Computing platforms</a></li><li><a href="install.fpm.php">FastCGI Process Manager (FPM)</a></li><li><a href="install.pecl.php">Installation of PECL extensions</a></li><li><a href="install.problems.php">Problems?</a></li><li><a href="configuration.php">Runtime Configuration</a></li></ul></li><li><a href="langref.php">Language Reference</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="language.basic-syntax.php">Basic syntax</a></li><li><a href="language.types.php">Types</a></li><li><a href="language.variables.php">Variables</a></li><li><a href="language.constants.php">Constants</a></li><li><a href="language.expressions.php">Expressions</a></li><li><a href="language.operators.php">Operators</a></li><li><a href="language.control-structures.php">Control Structures</a></li><li><a href="language.functions.php">Functions</a></li><li><a href="language.oop5.php">Classes and Objects</a></li><li><a href="language.namespaces.php">Namespaces</a></li><li><a href="language.exceptions.php">Exceptions</a></li><li><a href="language.references.php">References Explained</a></li><li><a href="reserved.variables.php">Predefined Variables</a></li><li><a href="reserved.exceptions.php">Predefined Exceptions</a></li><li><a href="reserved.interfaces.php">Predefined Interfaces</a></li><li><a href="context.php">Context options and parameters</a></li><li><a href="wrappers.php">Supported Protocols and Wrappers</a></li></ul></li><li><a href="security.php">Security</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="security.intro.php">Introduction</a></li><li><a href="security.general.php">General considerations</a></li><li><a href="security.cgi-bin.php">Installed as CGI binary</a></li><li><a href="security.apache.php">Installed as an Apache module</a></li><li><a href="security.filesystem.php">Filesystem Security</a></li><li><a href="security.database.php">Database Security</a></li><li><a href="security.errors.php">Error Reporting</a></li><li><a href="security.globals.php">Using Register Globals</a></li><li><a href="security.variables.php">User Submitted Data</a></li><li><a href="security.magicquotes.php">Magic Quotes</a></li><li><a href="security.hiding.php">Hiding PHP</a></li><li><a href="security.current.php">Keeping Current</a></li></ul></li><li><a href="features.php">Features</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="features.http-auth.php">HTTP authentication with PHP</a></li><li><a href="features.cookies.php">Cookies</a></li><li><a href="features.sessions.php">Sessions</a></li><li><a href="features.xforms.php">Dealing with XForms</a></li><li><a href="features.file-upload.php">Handling file uploads</a></li><li><a href="features.remote-files.php">Using remote files</a></li><li><a href="features.connection-handling.php">Connection handling</a></li><li><a href="features.persistent-connections.php">Persistent Database Connections</a></li><li><a href="features.safe-mode.php">Safe Mode</a></li><li><a href="features.commandline.php">Command line usage</a> — Using PHP from the command line</li><li><a href="features.gc.php">Garbage Collection</a></li></ul></li><li><a href="funcref.php">Function Reference</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="refs.basic.php.php">Affecting PHP's Behaviour</a></li><li><a href="refs.utilspec.audio.php">Audio Formats Manipulation</a></li><li><a href="refs.remote.auth.php">Authentication Services</a></li><li><a href="refs.calendar.php">Date and Time Related Extensions</a></li><li><a href="refs.utilspec.cmdline.php">Command Line Specific Extensions</a></li><li><a href="refs.compression.php">Compression and Archive Extensions</a></li><li><a href="refs.creditcard.php">Credit Card Processing</a></li><li><a href="refs.crypto.php">Cryptography Extensions</a></li><li><a href="refs.database.php">Database Extensions</a></li><li><a href="refs.fileprocess.file.php">File System Related Extensions</a></li><li><a href="refs.international.php">Human Language and Character Encoding Support</a></li><li><a href="refs.utilspec.image.php">Image Processing and Generation</a></li><li><a href="refs.remote.mail.php">Mail Related Extensions</a></li><li><a href="refs.math.php">Mathematical Extensions</a></li><li><a href="refs.utilspec.nontext.php">Non-Text MIME Output</a></li><li><a href="refs.fileprocess.process.php">Process Control Extensions</a></li><li><a href="refs.basic.other.php">Other Basic Extensions</a></li><li><a href="refs.remote.other.php">Other Services</a></li><li><a href="refs.search.php">Search Engine Extensions</a></li><li><a href="refs.utilspec.server.php">Server Specific Extensions</a></li><li><a href="refs.basic.session.php">Session Extensions</a></li><li><a href="refs.basic.text.php">Text Processing</a></li><li><a href="refs.basic.vartype.php">Variable and Type Related Extensions</a></li><li><a href="refs.webservice.php">Web Services</a></li><li><a href="refs.utilspec.windows.php">Windows Only Extensions</a></li><li><a href="refs.xml.php">XML Manipulation</a></li></ul></li><li><a href="internals2.php">PHP at the Core: A Hacker's Guide to the Zend Engine</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="internals2.preface.php">Preface</a></li><li><a href="internals2.counter.php">The &quot;counter&quot; Extension - A Continuing Example</a></li><li><a href="internals2.buildsys.php">The PHP 5 build system</a></li><li><a href="internals2.structure.php">Extension structure</a></li><li><a href="internals2.memory.php">Memory management</a></li><li><a href="internals2.variables.php">Working with variables</a></li><li><a href="internals2.funcs.php">Writing functions</a></li><li><a href="internals2.objects.php">Working with classes and objects</a></li><li><a href="internals2.resources.php">Working with resources</a></li><li><a href="internals2.ini.php">Working with INI settings</a></li><li><a href="internals2.streams.php">Working with streams</a></li><li><a href="internals2.pdo.php">PDO Driver How-To</a></li><li><a href="internals2.faq.php">Extension FAQs</a></li><li><a href="internals2.apiref.php">Zend Engine 2 API reference</a></li><li><a href="internals2.opcodes.php">Zend Engine 2 Opcodes</a></li><li><a href="internals2.ze1.php">Zend Engine 1</a></li></ul></li><li><a href="faq.php">FAQ</a> — FAQ: Frequently Asked Questions<ul class="chunklist chunklist_set chunklist_children"><li><a href="faq.general.php">General Information</a></li><li><a href="faq.mailinglist.php">Mailing lists</a></li><li><a href="faq.obtaining.php">Obtaining PHP</a></li><li><a href="faq.databases.php">Database issues</a></li><li><a href="faq.installation.php">Installation</a></li><li><a href="faq.build.php">Build Problems</a></li><li><a href="faq.using.php">Using PHP</a></li><li><a href="faq.passwords.php">Password Hashing</a> — Safe Password Hashing</li><li><a href="faq.html.php">PHP and HTML</a></li><li><a href="faq.com.php">PHP and COM</a></li><li><a href="faq.languages.php">PHP and other languages</a></li><li><a href="faq.migration5.php">Migrating from PHP 4 to PHP 5</a></li><li><a href="faq.misc.php">Miscellaneous Questions</a></li></ul></li><li><a href="appendices.php">Appendices</a><ul class="chunklist chunklist_set chunklist_children"><li><a href="history.php">History of PHP and Related Projects</a></li><li><a href="migration54.php">Migrating from PHP 5.3.x to PHP 5.4.x</a></li><li><a href="migration53.php">Migrating from PHP 5.2.x to PHP 5.3.x</a></li><li><a href="migration52.php">Migrating from PHP 5.1.x to PHP 5.2.x</a></li><li><a href="migration51.php">Migrating from PHP 5.0.x to PHP 5.1.x</a></li><li><a href="migration5.php">Migrating from PHP 4 to PHP 5.0.x</a></li><li><a href="oop4.php">Classes and Objects (PHP 4)</a></li><li><a href="debugger.php">Debugging in PHP</a></li><li><a href="configure.php">Configure options</a></li><li><a href="ini.php">php.ini directives</a></li><li><a href="extensions.php">Extension List/Categorization</a></li><li><a href="aliases.php">List of Function Aliases</a></li><li><a href="reserved.php">List of Reserved Words</a></li><li><a href="resource.php">List of Resource Types</a></li><li><a href="filters.php">List of Available Filters</a></li><li><a href="transports.php">List of Supported Socket Transports</a></li><li><a href="types.comparisons.php">PHP type comparison tables</a></li><li><a href="tokens.php">List of Parser Tokens</a></li><li><a href="userlandnaming.php">Userland Naming Guide</a></li><li><a href="about.php">About the manual</a></li><li><a href="cc.license.php">Creative Commons Attribution 3.0</a></li><li><a href="indexes.php">Index listing</a></li></ul></li></ul></div><br /><br />
+<div id="usernotes">
+ <div class="head">
+  <span class="action"><a href="/manual/add-note.php?sect=index&amp;redirect=http://www.php.net/manual/en/index.php"><img src="http://static.php.net/www.php.net/images/notes-add.gif" alt="add a note" width="13" height="13" class="middle" /></a> <small><a href="/manual/add-note.php?sect=index&amp;redirect=http://www.php.net/manual/en/index.php">add a note</a></small></span>
+  <small>User Contributed Notes</small>
+  <strong>PHP Manual</strong>
+ </div>
+ <div class="note">There are no user contributed notes for this page.</div></div><br />
+ </div>
+ <div class="cleaner">&nbsp;</div>
+</div>
+
+<div id="footnav">
+   <a href="/source.php?url=/manual/en/index.php">show source</a> |
+ <a href="/credits.php">credits</a> |
+ <a href="/stats/">stats</a> |
+ <a href="/sitemap.php">sitemap</a> |
+ <a href="/contact.php">contact</a> |
+ <a href="/contact.php#ads">advertising</a> |
+ <a href="/mirrors.php">mirror sites</a>
+</div>
+
+<div id="pagefooter">
+ <div id="copyright">
+  <a href="/copyright.php">Copyright &copy; 2001-2012 The PHP Group</a><br />
+  All rights reserved.
+ </div>
+
+ <div id="thismirror">
+  <a href="/mirror.php">This mirror</a> generously provided by:
+  <a href="http://developer.yahoo.com/">Yahoo! Inc.</a><br />
+  Last updated: Wed Mar 28 09:41:05 2012 UTC
+ </div>
+</div>
+<!--[if IE 6]>
+<script type="text/javascript">
+    /*Load jQuery if not already loaded*/ if(typeof jQuery == 'undefined'){ document.write("<script type=\"text/javascript\"   src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js\"></"+"script>"); var __noconflict = true; }
+    var IE6UPDATE_OPTIONS = {
+        icons_path: "/ie6update/images/"
+    }
+</script>
+<script type="text/javascript" src="/ie6update/ie6update.js"></script>
+<![endif]-->
+</body>
+</html>
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html
new file mode 100644
index 0000000000..ecf3a9dfec
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-jquery-version/w3schools.html
@@ -0,0 +1,1610 @@
+<!DOCTYPE html>
+
+<html lang="en-US">
+
+<head>
+
+
+
+<title>HTML5 Tutorial</title>
+
+ 
+
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+
+<meta name="Keywords" content="html,css,tutorial,html5,dhtml,css3,xsl,xslt,xhtml,javascript,jquery,asp,ado,net,vbscript,dom,sql,colors,soap,php,rss,authoring,programming,training,learning,quiz,beginner's guide,primer,lessons,school,howto,reference,examples,samples,source code,tags,demos,tips,links,FAQ,tag list,forms,frames,color table,w3c,cascading style sheets,active server pages,dynamic html,internet,database,development,Web building,Webmaster,html guide" />
+
+<meta name="Description" content="Free HTML XHTML CSS JavaScript jQuery XML DOM XSL XSLT RSS AJAX ASP .NET PHP SQL tutorials, references, examples for web building." />
+
+<script type="text/javascript">
+
+<!--
+
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+
+//-->
+
+</script>
+
+<script type="text/javascript">
+
+<!--
+
+function searchfield_focus(obj)
+
+{
+
+obj.style.color=""
+
+obj.style.fontStyle=""
+
+if (obj.value=="Search w3schools.com")
+
+	{obj.value=""}
+
+}
+
+var pageTracker = _gat._getTracker("UA-3855518-1");
+
+pageTracker._initData();
+
+pageTracker._trackPageview();
+
+var addr=document.location.href;
+
+function displayError()
+
+{
+
+document.getElementById("err_url").value=addr;
+
+document.getElementById("err_form").style.display="block";
+
+document.getElementById("err_desc").focus();
+
+hideSent();
+
+}
+
+function hideError()
+
+{
+
+document.getElementById("err_form").style.display="none";
+
+}
+
+function hideSent()
+
+{
+
+document.getElementById("err_sent").style.display="none";
+
+}
+
+function sendErr()
+
+{
+
+var xmlhttp;
+
+var err_url=document.getElementById("err_url").value;
+
+var err_email=document.getElementById("err_email").value;
+
+var err_desc=document.getElementById("err_desc").value;
+
+if (window.XMLHttpRequest)
+
+  {// code for IE7+, Firefox, Chrome, Opera, Safari
+
+  xmlhttp=new XMLHttpRequest();
+
+  }
+
+else
+
+  {// code for IE6, IE5
+
+  xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+
+  }
+
+xmlhttp.open("POST","/err_sup.asp",true);
+
+xmlhttp.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+
+xmlhttp.send("err_url=" + err_url + "&err_email=" + err_email + "&err_desc=" + escape(err_desc));
+
+hideError();
+
+document.getElementById("err_sent").style.display="block";
+
+}
+
+function click_expandingMenuHeader(obj,sectionName)
+
+{
+
+var x=document.getElementById("cssprop_" + sectionName).parentNode.className;
+
+if (x.indexOf("expandingMenuNotSelected")>-1)
+
+	{
+
+	x=x.replace("expandingMenuNotSelected","expandingMenuSelected");
+
+	document.getElementById("cssprop_" + sectionName).parentNode.className=x;
+
+	document.getElementById("cssprop_" + sectionName).style.display="block";
+
+	}
+
+else
+
+	{
+
+	x=x.replace("expandingMenuSelected","expandingMenuNotSelected");
+
+	document.getElementById("cssprop_" + sectionName).parentNode.className=x;
+
+	document.getElementById("cssprop_" + sectionName).style.display="none";
+
+	}
+
+}
+
+//-->
+
+</script>
+
+<!--[if lt IE 7]>
+
+<style>
+
+#leftcolumn{margin-left:0}
+
+</style>
+
+<![endif]-->
+
+<link rel="stylesheet" type="text/css" href="/stdtheme.css" />
+
+<style>
+
+#html5headline
+
+{
+
+font-size:24px;
+
+text-align:center;
+
+background-color:#D9D9D9;
+
+margin:0;
+
+padding:0;
+
+height:32px;
+
+}
+
+div.html5header
+
+{
+
+border:5px solid #D9D9D9;
+
+width:625px;
+
+height:379px;
+
+margin:0;
+
+padding:0;
+
+}
+
+div.html5header #header_image
+
+{
+
+width:290px;
+
+height:235px;
+
+float:left;
+
+border:10px solid #D9D9D9;
+
+}
+
+div.html5header #header_image div
+
+{
+
+width:290px;
+
+height:235px;
+
+margin:0;
+
+padding:0;
+
+}
+
+
+
+div.html5header #header_text
+
+{
+
+width:275px;
+
+height:235px;
+
+float:left;
+
+margin:0;
+
+padding:0;
+
+padding-left:10px;
+
+padding-right:10px;
+
+border:10px solid #D9D9D9;
+
+}
+
+div.html5header #header_icons
+
+{
+
+width:628px;
+
+height:84px;
+
+clear:both;
+
+}
+
+
+
+div.html5header #header_icons ul
+
+{
+
+list-style-type:none;
+
+margin:0;
+
+padding:0;
+
+overflow:hidden;
+
+}
+
+div.html5header #header_icons li
+
+{
+
+float:left;
+
+width:104px;
+
+height:92px;
+
+}
+
+div.html5header #header_icons #header_html5{background:url('img_logo_map.gif') 0 0;background-repeat:no-repeat;}
+
+div.html5header #header_icons #header_multimedia{background:url('img_logo_map.gif') -104px 0;background-repeat:no-repeat;}
+
+div.html5header #header_icons #header_3d{background:url('img_logo_map.gif') -208px 0;background-repeat:no-repeat;}
+
+div.html5header #header_icons #header_offline{background:url('img_logo_map.gif') -312px 0;background-repeat:no-repeat;}
+
+div.html5header #header_icons #header_form{background:url('img_logo_map.gif') -418px 0;background-repeat:no-repeat;}
+
+div.html5header #header_icons #header_css3{background:url('img_logo_map.gif') -521px 0;background-repeat:no-repeat;}
+
+
+
+#header_text
+
+{
+
+font-size:120%;
+
+}
+
+#header_text h2
+
+{
+
+text-align:center;
+
+}
+
+div.html5header #header_icons #header_html5
+
+{
+
+background:url('img_logo_map.gif') 0 -92px;
+
+background-repeat:no-repeat;
+
+}
+
+</style>
+
+<script>
+
+selIcon="html5";
+
+function changeHeader(logoId,imgPos)
+
+	{
+
+	x=document.getElementById("header_text").childNodes;
+
+	for (i=0;i<x.length;i++)
+
+	  {
+
+	  if(x[i].nodeType==1)
+
+	  	{
+
+	  	x[i].style.display="none";
+
+	  	}
+
+	  }
+
+	x=document.getElementById("header_image").childNodes;
+
+	for (i=0;i<x.length;i++)
+
+	  {
+
+	  if(x[i].nodeType==1)
+
+	  	{
+
+	  	x[i].style.display="none";
+
+	  	}
+
+	  }
+
+  	try
+
+  		{
+
+  		document.getElementById('html5_vid').pause();
+
+  		}
+
+  	catch(er)
+
+  		{
+
+	
+
+  		}
+
+
+
+	x=document.getElementById("header_icons_list").childNodes;
+
+	
+
+	document.getElementById("header_html5").style.backgroundPosition="0 0"
+
+	document.getElementById("header_multimedia").style.backgroundPosition="-104px 0"
+
+	document.getElementById("header_3d").style.backgroundPosition="-208px 0"
+
+	document.getElementById("header_offline").style.backgroundPosition="-312px 0"
+
+	document.getElementById("header_form").style.backgroundPosition="-418px 0"
+
+	document.getElementById("header_css3").style.backgroundPosition="-521px 0"
+
+					
+
+	bgText="header_text_"+logoId;
+
+	bgImage="header_image_"+logoId;
+
+	bgLogo="header_"+logoId;
+
+	document.getElementById(bgImage).style.display="block";
+
+	document.getElementById(bgText).style.display="inline";	
+
+	document.getElementById(bgLogo).style.backgroundPosition=imgPos+"px -92px"
+
+	}
+
+function iconHover(logoId,imgPos)
+
+	{
+
+	bgLogo="header_"+logoId;
+
+	document.getElementById(bgLogo).style.backgroundPosition=imgPos+"px -92px"
+
+	}
+
+function iconHoverOut(logoId,imgPos)
+
+	{
+
+	if (selIcon!=logoId)
+
+		{
+
+		bgLogo="header_"+logoId;
+
+		document.getElementById(bgLogo).style.backgroundPosition=imgPos+"px 0"
+
+		}
+
+	}
+
+	
+
+function playVideo()
+
+{
+
+try
+
+	{
+
+	document.getElementById('html5_vid').play()
+
+	}
+
+catch(er)
+
+	{
+
+	document.getElementById('header_image_multimedia').innerHTML="";
+
+	document.getElementById('header_image_multimedia').style.backgroundImage="url('img_html5_multimedia.jpg')";
+
+	}
+
+}
+
+</script>
+
+</head>
+
+<body>
+
+
+
+<div style="position:relative;width:100%;margin-top:0px;margin-bottom:0px;">
+
+<a id="top"></a>
+
+<div style="width:960px;margin-top:5px;margin-left:auto;margin-right:auto">
+
+<div style="width:960px;height:74px;margin:0;padding:0;">
+
+<div style="width:340px;text-align:left;float:left;">
+
+	<a href="http://www.w3schools.com"><img width="336" height="69" src="/images/w3schoolslogo.gif" alt="W3Schools.com" style="border:0;margin-top:5px;" /></a>
+
+</div>
+
+
+
+<div style="width:300px;float:right;text-align:right;margin-top:20px;margin-right:14px;margin-bottom:5px;">
+
+<div id="google_translate_element" style="display:none"></div>
+
+<div id="translate_link" style="margin-bottom:14px">
+
+<a href="#" class="topnav"
+
+onclick="document.getElementById('google_translate_element').style.display='inline';document.getElementById('translate_link').style.display='none';return false;">
+
+TRANSLATE
+
+</a>
+
+</div>
+
+	<form style="font-size:11px;" method="get" name="searchform" action="http://www.google.com/search" target="_blank">
+
+    <input type="hidden" name="sitesearch" value="www.w3schools.com" />
+
+    <input onfocus="searchfield_focus(this)" style="width:150px;color:#808080;font-style:italic;margin:0;" 
+
+    type="text" name="as_q" size="20" value="Search w3schools.com" /><input type="submit" style="margin:0;" value="Search" title="Search" />
+
+	</form>
+
+</div>
+
+</div>
+
+<div id="topnav" style="clear:both;width:960px;height:25px;">
+
+<div style="float:left;width:400px;word-spacing:12px;font-size:90%;padding-left:15px;padding-top:6px;white-space:nowrap;text-align:left;">
+
+	<a class="topnav" href="/default.asp" target="_top">HOME </a>
+
+	<a class="topnav" href="/html/default.asp" target="_top">HTML </a>
+
+	<a class="topnav" href="/css/default.asp" target="_top">CSS </a>
+
+	<a class="topnav" href="/xml/default.asp" target="_top">XML </a>
+
+	<a class="topnav" href="/js/default.asp" target="_top">JAVASCRIPT </a>
+
+	<a class="topnav" href="/asp/default.asp" target="_top">ASP </a>
+
+	<a class="topnav" href="/php/default.asp" target="_top">PHP </a>
+
+	<a class="topnav" href="/sql/default.asp" target="_top">SQL </a>	
+
+	<a class="topnav" href="/sitemap/default.asp" target="_top">MORE...</a>
+
+</div>
+
+<div style="float:right;width:280px;word-spacing:6px;font-size:80%;padding-right:13px;padding-top:7px;color:#888888;white-space:nowrap;text-align:right;">
+
+	<a class="topnav" href="/sitemap/default.asp#references" target="_top">REFERENCES</a> |
+
+	<a class="topnav" href="/sitemap/default.asp#examples" target="_top">EXAMPLES</a> |
+
+	<a class="topnav" href="/forum/default.asp" target="_top">FORUM</a> |
+
+	<a class="topnav" href="/about/default.asp" target="_top">ABOUT</a>	
+
+</div>
+
+</div>
+
+
+
+<div style="width:960px;height:94px;position:relative;margin-left:auto;margin-right:auto;margin:0px;padding:0px;overflow:hidden">
+
+<script type='text/javascript' src='http://partner.googleadservices.com/gampad/google_service.js'>
+
+</script>
+
+<script type='text/javascript'>
+
+GS_googleAddAdSenseService("ca-pub-3440800076797949");
+
+GS_googleEnableAllServices();
+
+</script>
+
+<script type='text/javascript'>
+
+
+
+GA_googleAddSlot("ca-pub-3440800076797949", "MainLeaderboard");
+
+GA_googleAddSlot("ca-pub-3440800076797949", "SmallPS");
+
+GA_googleAddSlot("ca-pub-3440800076797949", "LargePS");
+
+GA_googleAddSlot("ca-pub-3440800076797949", "BottomRectangle");
+
+GA_googleAddSlot("ca-pub-3440800076797949", "SkyScraper");
+
+
+
+GA_googleAddSlot("ca-pub-3440800076797949", "TopRectangle");
+
+</script>
+
+<script type='text/javascript'>
+
+GA_googleFetchAds();
+
+</script>
+
+<!-- TopRectangle -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("TopRectangle");
+
+</script>
+
+<div style="width:728px;height:90px;position:absolute;right:0px;top:0px;margin:0;padding:0;overflow:hidden;">
+
+
+
+<!-- MainLeaderboard -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("MainLeaderboard");
+
+</script>
+
+
+
+</div></div>
+
+<div style="width:960px;padding:0px;margin:0px;">
+
+<div id="leftcolumn" style="width:170px;margin:0;padding:0;margin-top:5px;float:left;"><h2 class="left"><span class="left_h2">HTML5</span> Tutorial</h2>
+
+<a target="_top" href="default.asp" style='font-weight:bold;'>HTML5 Home</a><br />
+
+<a target="_top" href="html5_intro.asp" >HTML5 Introduction</a><br />
+
+<a target="_top" href="html5_new_elements.asp" >HTML5 New Elements</a><br />
+
+<a target="_top" href="html5_video.asp" >HTML5 Video</a><br />
+
+<a target="_top" href="html5_video_dom.asp" >HTML5 Video/DOM</a><br />
+
+<a target="_top" href="html5_audio.asp" >HTML5 Audio</a><br />
+
+<a target="_top" href="html5_draganddrop.asp" >HTML5 Drag and Drop</a><br />
+
+<a target="_top" href="html5_canvas.asp" >HTML5 Canvas</a><br />
+
+<a target="_top" href="html5_svg.asp" >HTML5 SVG</a><br />
+
+<a target="_top" href="html5_canvas_vs_svg.asp" >HTML5 Canvas vs. SVG</a><br />
+
+<a target="_top" href="html5_geolocation.asp" >HTML5 Geolocation</a><br />
+
+<a target="_top" href="html5_webstorage.asp" >HTML5 Web Storage</a><br />
+
+<a target="_top" href="html5_app_cache.asp" >HTML5 App Cache</a><br />
+
+<a target="_top" href="html5_webworkers.asp" >HTML5 Web Workers</a><br />
+
+<a target="_top" href="html5_serversentevents.asp" >HTML5 SSE</a><br />
+
+<br />
+
+<h2 class="left"><span class="left_h2">HTML5</span> Forms</h2>
+
+<a target="_top" href="html5_form_input_types.asp" >HTML5 Input Types</a><br />
+
+<a target="_top" href="html5_form_elements.asp" >HTML5 Form Elements</a><br />
+
+<a target="_top" href="html5_form_attributes.asp" >HTML5 Form Attributes</a><br />
+
+<br />
+
+<h2 class="left"><span class="left_h2">HTML5</span> Reference</h2>
+
+<a target="_top" href="html5_reference.asp" >HTML5 Tags</a><br />
+
+<a target="_top" href="html5_ref_globalattributes.asp" >HTML5 Attributes</a><br />
+
+<a target="_top" href="html5_ref_eventattributes.asp" >HTML5 Events</a><br />
+
+<a target="_top" href="html5_ref_av_dom.asp" >HTML5 Audio/Video</a><br />
+
+<a target="_top" href="html5_ref_canvas.asp" >HTML5 Canvas 2d</a><br />
+
+<a target="_top" href="html5_ref_dtd.asp" >HTML Valid DTDs</a><br />
+
+<br />
+
+<h2 class="left"><span class="left_h2">HTML5</span> Tags</h2>
+
+<a target="_top" href="tag_comment.asp" >&lt;!--&gt;</a><br />
+
+<a target="_top" href="tag_doctype.asp" >&lt;!DOCTYPE&gt;</a><br />
+
+<a target="_top" href="tag_a.asp" >&lt;a&gt;</a><br />
+
+<a target="_top" href="tag_abbr.asp" >&lt;abbr&gt;</a><br />
+
+<a target="_top" href="tag_acronym.asp" >&lt;acronym&gt;</a><br />
+
+<a target="_top" href="tag_address.asp" >&lt;address&gt;</a><br />
+
+<a target="_top" href="tag_applet.asp" >&lt;applet&gt;</a><br />
+
+<a target="_top" href="tag_area.asp" >&lt;area&gt;</a><br />
+
+<a target="_top" href="tag_article.asp" >&lt;article&gt;</a><br />
+
+<a target="_top" href="tag_aside.asp" >&lt;aside&gt;</a><br />
+
+<a target="_top" href="tag_audio.asp" >&lt;audio&gt;</a><br />
+
+<a target="_top" href="tag_b.asp" >&lt;b&gt;</a><br />
+
+<a target="_top" href="tag_base.asp" >&lt;base&gt;</a><br />
+
+<a target="_top" href="tag_basefont.asp" >&lt;basefont&gt;</a><br />
+
+<a target="_top" href="tag_bdi.asp" >&lt;bdi&gt;</a><br />
+
+<a target="_top" href="tag_bdo.asp" >&lt;bdo&gt;</a><br />
+
+<a target="_top" href="tag_big.asp" >&lt;big&gt;</a><br />
+
+<a target="_top" href="tag_blockquote.asp" >&lt;blockquote&gt;</a><br />
+
+<a target="_top" href="tag_body.asp" >&lt;body&gt;</a><br />
+
+<a target="_top" href="tag_br.asp" >&lt;br&gt;</a><br />
+
+<a target="_top" href="tag_button.asp" >&lt;button&gt;</a><br />
+
+<a target="_top" href="tag_canvas.asp" >&lt;canvas&gt;</a><br />
+
+<a target="_top" href="tag_caption.asp" >&lt;caption&gt;</a><br />
+
+<a target="_top" href="tag_center.asp" >&lt;center&gt;</a><br />
+
+<a target="_top" href="tag_cite.asp" >&lt;cite&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;code&gt;</a><br />
+
+<a target="_top" href="tag_col.asp" >&lt;col&gt;</a><br />
+
+<a target="_top" href="tag_colgroup.asp" >&lt;colgroup&gt;</a><br />
+
+<a target="_top" href="tag_command.asp" >&lt;command&gt;</a><br />
+
+<a target="_top" href="tag_datalist.asp" >&lt;datalist&gt;</a><br />
+
+<a target="_top" href="tag_dd.asp" >&lt;dd&gt;</a><br />
+
+<a target="_top" href="tag_del.asp" >&lt;del&gt;</a><br />
+
+<a target="_top" href="tag_details.asp" >&lt;details&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;dfn&gt;</a><br />
+
+<a target="_top" href="tag_dir.asp" >&lt;dir&gt;</a><br />
+
+<a target="_top" href="tag_div.asp" >&lt;div&gt;</a><br />
+
+<a target="_top" href="tag_dl.asp" >&lt;dl&gt;</a><br />
+
+<a target="_top" href="tag_dt.asp" >&lt;dt&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;em&gt;</a><br />
+
+<a target="_top" href="tag_embed.asp" >&lt;embed&gt;</a><br />
+
+<a target="_top" href="tag_fieldset.asp" >&lt;fieldset&gt;</a><br />
+
+<a target="_top" href="tag_figcaption.asp" >&lt;figcaption&gt;</a><br />
+
+<a target="_top" href="tag_figure.asp" >&lt;figure&gt;</a><br />
+
+<a target="_top" href="tag_font.asp" >&lt;font&gt;</a><br />
+
+<a target="_top" href="tag_footer.asp" >&lt;footer&gt;</a><br />
+
+<a target="_top" href="tag_form.asp" >&lt;form&gt;</a><br />
+
+<a target="_top" href="tag_frame.asp" >&lt;frame&gt;</a><br />
+
+<a target="_top" href="tag_frameset.asp" >&lt;frameset&gt;</a><br />
+
+<a target="_top" href="tag_hn.asp" >&lt;h1&gt; - &lt;h6&gt;</a><br />
+
+<a target="_top" href="tag_head.asp" >&lt;head&gt;</a><br />
+
+<a target="_top" href="tag_header.asp" >&lt;header&gt;</a><br />
+
+<a target="_top" href="tag_hgroup.asp" >&lt;hgroup&gt;</a><br />
+
+<a target="_top" href="tag_hr.asp" >&lt;hr&gt;</a><br />
+
+<a target="_top" href="tag_html.asp" >&lt;html&gt;</a><br />
+
+<a target="_top" href="tag_i.asp" >&lt;i&gt;</a><br />
+
+<a target="_top" href="tag_iframe.asp" >&lt;iframe&gt;</a><br />
+
+<a target="_top" href="tag_img.asp" >&lt;img&gt;</a><br />
+
+<a target="_top" href="tag_input.asp" >&lt;input&gt;</a><br />
+
+<a target="_top" href="tag_ins.asp" >&lt;ins&gt;</a><br />
+
+<a target="_top" href="tag_keygen.asp" >&lt;keygen&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;kbd&gt;</a><br />
+
+<a target="_top" href="tag_label.asp" >&lt;label&gt;</a><br />
+
+<a target="_top" href="tag_legend.asp" >&lt;legend&gt;</a><br />
+
+<a target="_top" href="tag_li.asp" >&lt;li&gt;</a><br />
+
+<a target="_top" href="tag_link.asp" >&lt;link&gt;</a><br />
+
+<a target="_top" href="tag_map.asp" >&lt;map&gt;</a><br />
+
+<a target="_top" href="tag_mark.asp" >&lt;mark&gt;</a><br />
+
+<a target="_top" href="tag_menu.asp" >&lt;menu&gt;</a><br />
+
+<a target="_top" href="tag_meta.asp" >&lt;meta&gt;</a><br />
+
+<a target="_top" href="tag_meter.asp" >&lt;meter&gt;</a><br />
+
+<a target="_top" href="tag_nav.asp" >&lt;nav&gt;</a><br />
+
+<a target="_top" href="tag_noframes.asp" >&lt;noframes&gt;</a><br />
+
+<a target="_top" href="tag_noscript.asp" >&lt;noscript&gt;</a><br />
+
+<a target="_top" href="tag_object.asp" >&lt;object&gt;</a><br />
+
+<a target="_top" href="tag_ol.asp" >&lt;ol&gt;</a><br />
+
+<a target="_top" href="tag_optgroup.asp" >&lt;optgroup&gt;</a><br />
+
+<a target="_top" href="tag_option.asp" >&lt;option&gt;</a><br />
+
+<a target="_top" href="tag_output.asp" >&lt;output&gt;</a><br />
+
+<a target="_top" href="tag_p.asp" >&lt;p&gt;</a><br />
+
+<a target="_top" href="tag_param.asp" >&lt;param&gt;</a><br />
+
+<a target="_top" href="tag_pre.asp" >&lt;pre&gt;</a><br />
+
+<a target="_top" href="tag_progress.asp" >&lt;progress&gt;</a><br />
+
+<a target="_top" href="tag_q.asp" >&lt;q&gt;</a><br />
+
+<a target="_top" href="tag_rp.asp" >&lt;rp&gt;</a><br />
+
+<a target="_top" href="tag_rt.asp" >&lt;rt&gt;</a><br />
+
+<a target="_top" href="tag_ruby.asp" >&lt;ruby&gt;</a><br />
+
+<a target="_top" href="tag_s.asp" >&lt;s&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;samp&gt;</a><br />
+
+<a target="_top" href="tag_script.asp" >&lt;script&gt;</a><br />
+
+<a target="_top" href="tag_section.asp" >&lt;section&gt;</a><br />
+
+<a target="_top" href="tag_select.asp" >&lt;select&gt;</a><br />
+
+<a target="_top" href="tag_small.asp" >&lt;small&gt;</a><br />
+
+<a target="_top" href="tag_source.asp" >&lt;source&gt;</a><br />
+
+<a target="_top" href="tag_span.asp" >&lt;span&gt;</a><br />
+
+<a target="_top" href="tag_strike.asp" >&lt;strike&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;strong&gt;</a><br />
+
+<a target="_top" href="tag_style.asp" >&lt;style&gt;</a><br />
+
+<a target="_top" href="tag_sup.asp" >&lt;sub&gt;</a><br />
+
+<a target="_top" href="tag_summary.asp" >&lt;summary&gt;</a><br />
+
+<a target="_top" href="tag_sup.asp" >&lt;sup&gt;</a><br />
+
+<a target="_top" href="tag_table.asp" >&lt;table&gt;</a><br />
+
+<a target="_top" href="tag_tbody.asp" >&lt;tbody&gt;</a><br />
+
+<a target="_top" href="tag_td.asp" >&lt;td&gt;</a><br />
+
+<a target="_top" href="tag_textarea.asp" >&lt;textarea&gt;</a><br />
+
+<a target="_top" href="tag_tfoot.asp" >&lt;tfoot&gt;</a><br />
+
+<a target="_top" href="tag_th.asp" >&lt;th&gt;</a><br />
+
+<a target="_top" href="tag_thead.asp" >&lt;thead&gt;</a><br />
+
+<a target="_top" href="tag_time.asp" >&lt;time&gt;</a><br />
+
+<a target="_top" href="tag_title.asp" >&lt;title&gt;</a><br />
+
+<a target="_top" href="tag_tr.asp" >&lt;tr&gt;</a><br />
+
+<a target="_top" href="tag_track.asp" >&lt;track&gt;</a><br />
+
+<a target="_top" href="tag_tt.asp" >&lt;tt&gt;</a><br />
+
+<a target="_top" href="tag_u.asp" >&lt;u&gt;</a><br />
+
+<a target="_top" href="tag_ul.asp" >&lt;ul&gt;</a><br />
+
+<a target="_top" href="tag_phrase_elements.asp" >&lt;var&gt;</a><br />
+
+<a target="_top" href="tag_video.asp" >&lt;video&gt;</a><br />
+
+<a target="_top" href="tag_wbr.asp" >&lt;wbr&gt;</a><br />
+
+<br /></div>
+
+<div style="width:634px;margin:0px;padding:0px;background-color:#ffffff;color:#000000;padding-bottom:8px;padding-right:5px;padding-top:4px;float:left;">
+
+
+
+<h1>HTML5 <span class="color_h1">Tutorial</span></h1>
+
+<div class="chapter">
+
+<div class="prev"><a class="chapter" href="/default.asp">&laquo; W3Schools Home</a></div>
+
+<div class="next"><a class="chapter" href="html5_intro.asp">Next Chapter &raquo;</a></div>
+
+</div>
+
+<br />
+
+<div class="html5header">
+
+<div id="html5headline">HTML5 is The New HTML Standard</div>
+
+<div id="header_image">
+
+
+
+
+
+<div id="header_image_html5" style="background:url('img_html5_html5.gif');"></div>
+
+<div id="header_image_multimedia" style="display:none;margin:0;padding:0;padding-top:20px;height:215px;text-align:center">
+
+<video width="270" controls="controls" id="html5_vid">
+
+  <source src="mov_bbb.mp4" type="video/mp4" />
+
+  <source src="mov_bbb.ogg" type="video/ogg" />
+
+  <source src="mov_bbb.webm" type="video/webm" />
+
+Your browser does not support the video tag.
+
+</video>
+
+<p style="text-align:center;margin:0;padding:0">Video courtesy of <a href="http://www.bigbuckbunny.org/" target="_blank">Big Buck Bunny</a></p>
+
+</div>
+
+<div id="header_image_3d" style="display:none;background:url('img_html5_3d.jpg')"></div>
+
+<div id="header_image_offline" style="display:none;background:url('img_html5_offline.jpg')"></div>
+
+<div id="header_image_form" style="display:none;background:url('img_html5_form.jpg')"></div>
+
+<div id="header_image_css3" style="display:none;background:url('img_html5_css3.jpg')"></div>
+
+</div>
+
+<div id="header_text">
+
+<div id="header_text_html5">
+
+<h2>HTML5</h2>
+
+<ul>
+
+<li>New Elements</li>
+
+<li>New Attributes</li>
+
+<li>Full CSS3 Support</li>
+
+<li>Video and Audio</li>
+
+<li>2D/3D Graphics</li>
+
+<li>Local Storage</li>
+
+<li>Local SQL Database</li>
+
+<li>Web Applications</li>
+
+</ul>
+
+</div>
+
+
+
+<div id="header_text_multimedia" style="display:none;">
+
+<h2>HTML5 Multimedia</h2>
+
+<p>With HTML5, playing video and audio is easier than ever.</p>
+
+<ul>
+
+<li>HTML5 <a href="html5_video.asp">&lt;video&gt;</a></li>
+
+<li>HTML5 <a href="html5_audio.asp">&lt;audio&gt;</a></li>
+
+</ul>
+
+</div>
+
+
+
+<div id="header_text_offline" style="display:none">
+
+<h2>HTML5 Applications</h2>
+
+<p>With HTML5, web application development is easier than ever.</p>
+
+<ul>
+
+<li>Local data storage</li>
+
+<li>Local file access</li>
+
+<li>Local SQL database</li>
+
+<li>Application cache</li>
+
+<li>Javascript workers</li>
+
+<li>XHTMLHttpRequest 2</li>
+
+</ul>
+
+</div>
+
+
+
+<div id="header_text_3d" style="display:none">
+
+<h2>HTML5 Graphics</h2>
+
+<p>With HTML5, drawing graphics is easier than ever:</p>
+
+<ul>
+
+<li>Using the <a href="html5_canvas.asp">&lt;canvas&gt;</a> element</li>
+
+<li>Using inline <a href="/svg/default.asp">SVG</a></li>
+
+<li>Using <a href="/css3/default.asp">CSS3 2D/3D</a></li>
+
+</ul>
+
+</div>
+
+
+
+<div id="header_text_css3" style="display:none">
+
+<h2>HTML5 uses CSS3</h2>
+
+<ul>
+
+<li>New Selectors</li>
+
+<li>New Properties</li>
+
+<li>Animations</li>
+
+<li>2D/3D Transformations</li>
+
+<li>Rounded Corners</li>
+
+<li>Shadow Effects</li>
+
+<li>Downloadable Fonts</li>
+
+</ul>
+
+<p>Read more in our <a href="/css3/default.asp">CSS3 tutorial.</a></p>
+
+</div>
+
+<div id="header_text_form" style="display:none">
+
+<h2>Semantic Elements</h2>
+
+<p>New elements for headers, footers, menues, sections and articles.</p>
+
+<h2>HTML5 Forms</h2>
+
+<p>New form elements, new attributes, new input types, automatic validation.</p>
+
+</div>
+
+</div>
+
+<div id="header_icons">
+
+<ul id="header_icons_list">
+
+<li id="header_html5" onclick="changeHeader('html5','0');selIcon='html5'" onmouseover="iconHover('html5','0')" onmouseout="iconHoverOut('html5','0')" title="HTML5"></li>
+
+<li id="header_multimedia" onclick="changeHeader('multimedia','-104');selIcon='multimedia';playVideo()" onmouseover="iconHover('multimedia','-104')" onmouseout="iconHoverOut('multimedia','-104')" title="HTML5 Multimedia"></li>
+
+<li id="header_3d" onclick="changeHeader('3d','-208');selIcon='3d'" onmouseover="iconHover('3d','-208')" onmouseout="iconHoverOut('3d','-208')" title="HTML5 Graphics"></li>
+
+<li id="header_offline" onclick="changeHeader('offline','-312');selIcon='offline'" onmouseover="iconHover('offline','-312')" onmouseout="iconHoverOut('offline','-312')" title="HTML5 Local Storage"></li>
+
+<li style="width:105px;" id="header_form" onclick="changeHeader('form','-418');selIcon='form'" onmouseover="iconHover('form','-418')" onmouseout="iconHoverOut('form','-418')" title="HTML5 Semantics and Forms"></li>
+
+<li id="header_css3" onclick="changeHeader('css3','-521');selIcon='css3'" onmouseover="iconHover('css3','-521')" onmouseout="iconHoverOut('css3','-521')" title="HTML5 CSS3"></li>
+
+</ul>
+
+</div>
+
+</div>
+
+<br />
+
+<h2 class="tutheader">Examples in Each Chapter</h2>
+
+<p>With our HTML editor, you can edit the HTML, and click on a button to view the result.</p>
+
+<div class="example">
+
+<h2 class="example">Example</h2>
+
+<div class="example_code notranslate">
+
+	&lt;!DOCTYPE HTML&gt;<br />
+
+	&lt;html&gt;<br />
+
+	&lt;body&gt;<br />
+
+	<br />
+
+	&lt;video width=&quot;320&quot; height=&quot;240&quot; controls=&quot;controls&quot;&gt;<br />
+
+&nbsp; &lt;source src=&quot;movie.mp4&quot; type=&quot;video/mp4&quot; /&gt;<br />
+
+&nbsp; &lt;source src=&quot;movie.ogg&quot; type=&quot;video/ogg&quot; /&gt;<br />
+
+&nbsp; &lt;source src=&quot;movie.webm&quot; type=&quot;video/webm&quot; /&gt;<br />
+
+	Your browser does not support the video tag.<br />
+
+	&lt;/video&gt;<br />
+
+	<br />
+
+	&lt;/body&gt;<br />
+
+	&lt;/html&gt;
+
+</div>
+
+<br />
+
+	<a class="tryitbtn" target="_blank" href="tryit.asp?filename=tryhtml5_video_bear">Try it yourself &raquo;</a></div>
+
+<p><b>Click on the &quot;Try it yourself&quot; button to see how it works</b></p>
+
+<p><b><a href="html5_intro.asp">Start learning HTML5 now!</a></b></p>
+
+
+
+<h2 class="tutheader">HTML5 References</h2>
+
+<p>At W3Schools you will find complete references about tags, global attributes,
+
+standard events, and more.</p>
+
+<p>
+
+<a href="html5_reference.asp">HTML5 Tag Reference</a>
+
+</p>
+
+
+
+<br />
+
+<div class="chapter">
+
+<div class="prev"><a class="chapter" href="/default.asp">&laquo; W3Schools Home</a></div>
+
+<div class="next"><a class="chapter" href="html5_intro.asp">Next Chapter &raquo;</a></div>
+
+</div>
+
+
+
+<!-- **** SPOTLIGHTS 1 **** -->
+
+<!-- SmallPS -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("SmallPS");
+
+</script>
+
+<!-- **** SPOTLIGHTS 2 **** -->
+
+<!-- LargePS -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("LargePS");
+
+</script>
+
+<!-- **** SPOTLIGHTS 3 **** -->
+
+<!-- BottomRectangle -->
+
+<div style="width:340px;margin:auto">
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("BottomRectangle");
+
+</script>
+
+</div>
+
+
+
+<!-- BottomBanner -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("BottomBanner");
+
+</script>
+
+
+
+<div id="err_form" style="display:none">
+
+<h2>Your suggestion:</h2>
+
+<p><label for="err_email">Your E-mail (optional):</label> <input type="text" id="err_email" name="err_email" /></p>
+
+<p><label for="err_url">Page address:</label> <input type="text" disabled="disabled" id="err_url" name="err_url" /></p>
+
+<p><label for="err_desc">Description:</label> <textarea name="err_desc" id="err_desc" cols="92" rows="20"></textarea></p>
+
+<p class="submit"><input type="button" value="Submit" onclick="sendErr()" /></p>
+
+<div class="err_close" onclick="hideError()">Close [X]</div>
+
+</div>
+
+<div id="err_sent" style="display:none">
+
+<h2>Thank you for your support.</h2>
+
+<div class="err_close" onclick="hideSent()">Close [X]</div>
+
+</div>
+
+</div>
+
+
+
+<div id="rightcolumn" style="width:150px;margin:0px;padding:0px;float:left">
+
+<table>
+
+<tr><th>WEB HOSTING</th></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.lunarpages.com/id/w3schools/goto/w3schools">Best Web Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.eukhost.com">PHP MySQL Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.web-hosting-top.com/coupons">Best Hosting Coupons</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.heartinternet.co.uk/index.shtml">UK Reseller Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.webhosting.uk.com/cloud-hosting.php">Cloud Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.justhost.com/track/w3schools/textlink">Top Web Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.doteasy.com/index.cfm?A=w3text">$3.98 Unlimited Hosting</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.website.com/">Premium Website Design</a>
+
+</td></tr>
+
+</table>
+
+<table>
+
+<tr><th>WEB BUILDING</th></tr>
+
+<tr><td>
+
+
+
+<a target="_blank" rel="nofollow" href="http://www.altova.com/ref/?s=w3s_text&amp;q=xmlspy">Download XML Editor</a>
+
+
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.wix.com/html5/now-on-wix?utm_campaign=ma_w3schools.com&amp;experiment_id=ma_html_w3schools.comlink1">FREE Website BUILDER</a>
+
+</td></tr>
+
+<tr><td>
+
+<a target="_blank" rel="nofollow" href="http://www.dreamtemplate.com/?ref=w3txtfree">Free Website Templates</a>
+
+<a target="_blank" rel="nofollow" href="http://www.dreamtemplate.com/?ref=w3txtfree">Free CSS Templates</a>
+
+</td></tr>
+
+<tr><td>
+
+<a href="http://www.wix.com/html5/now-on-wix?utm_campaign=ma_w3schools.com&amp;experiment_id=ma_html_w3schools.comlink2" rel="nofollow" target="_blank">CREATE HTML Websites</a>
+
+</td></tr>
+
+</table>
+
+<table>
+
+<tr><th>W3SCHOOLS EXAMS</th></tr>
+
+<tr><td>
+
+<a target="_blank" href="/cert/default.asp">Get Certified in:<br />HTML, CSS, JavaScript, XML, PHP, and ASP</a>
+
+</td></tr>
+
+</table>
+
+<table>
+
+<tr><th>W3SCHOOLS BOOKS</th></tr>
+
+<tr><td>
+
+<a target="_blank" href="/books/default.asp">
+
+New Books:<br />HTML, CSS<br />
+
+JavaScript, and Ajax</a>
+
+</td></tr>
+
+</table>
+
+<table>
+
+<tr><th>STATISTICS</th></tr>
+
+<tr><td>
+
+<a target="_top" href="/browsers/browsers_stats.asp">Browser Statistics</a><br />
+
+<a target="_top" href="/browsers/browsers_os.asp">Browser OS</a><br />
+
+<a target="_top" href="/browsers/browsers_display.asp">Browser Display</a>
+
+</td></tr></table>
+
+<script type="text/javascript">
+
+<!--
+
+function sharethis()
+
+{
+
+txt='<a href="http://www.facebook.com/sharer.php?u='+document.URL+'" target="_blank" title="Facebook">'
+
+txt=txt+'<img src="/images/share_facebook.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="http://twitter.com/home?status=Currently reading '+document.URL+'" target="_blank" title="Twitter">';
+
+txt=txt+'<img src="/images/share_twitter.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="mailto:?&amp;subject='+document.title+'&amp;body=Take%20a%20look%20at%20this%20page%20at%20W3Schools.com:%20'+document.URL+'" target="_blank" title="E-mail">';
+
+txt=txt+'<img src="/images/share_email.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="http://delicious.com/save?v=5&noui&jump=close&url='+document.URL+'&title='+document.title+'" target="_blank" title="Delicious">';
+
+txt=txt+'<img src="/images/share_delicious.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="http://www.reddit.com/submit?url='+document.URL+'" target="_blank" title="Reddit">';
+
+txt=txt+'<img src="/images/share_reddit.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="http://digg.com/submit?url='+document.URL+'&amp;title='+document.title+'" target="_blank" title="Digg">';
+
+txt=txt+'<img src="/images/share_digg.gif" width="16px" height="16px" style="margin-right:4px" /></a>';
+
+txt=txt+'<a href="http://www.stumbleupon.com/submit?url='+document.URL+'%26title%3D'+document.title+'" target="_blank" title="Stumbleupon">';
+
+txt=txt+'<img src="/images/share_stumbleupon.gif" width="16px" height="16px" /></a>';
+
+document.getElementById("sharethis").innerHTML=txt;
+
+}
+
+//--></script>
+
+<table>
+
+<tr><th>SHARE THIS PAGE</th></tr>
+
+<tr>
+
+<td id="sharethis">
+
+<div style="height:16px">
+
+<a href="#" onclick="sharethis();return false;">Share with &raquo;</a>
+
+</div>
+
+</td>
+
+</tr>
+
+</table>
+
+<table>
+
+<tr><td><br />
+
+<div style="width:124px;margin:auto">
+
+<!-- SkyScraper -->
+
+<script type='text/javascript'>
+
+GA_googleFillSlot("SkyScraper");
+
+</script>
+
+</div>
+
+</td>
+
+</tr>
+
+</table>
+
+
+
+</div>
+
+</div>
+
+<br />
+
+</div>
+
+<div style="width:100%;clear:both;margin:0;padding:0;background-color:transparent;background-image:url('/images/gradientbottom.jpg');background-repeat:repeat-x;position:relative;">
+
+<div id="footer" style="width:960px;margin-left:auto;margin-right:auto;height:110px;">
+
+<div style="float:left;width:200px;text-align:left;padding-left:3px;padding-top:11px;"><a href="http://www.w3schools.com">
+
+<img style="border:0" src="/images/w3schoolscom_gray.gif" alt="W3Schools.com" /></a>
+
+</div>
+
+<div style="word-spacing:6px;font-size:80%;padding-right:12px;padding-top:19px;float:right;width:600px;text-align:right;">
+
+<a href="" onclick="displayError();return false">REPORT ERROR</a> |
+
+<a href="/default.asp" target="_top">HOME</a> |
+
+<a href="#top" target="_top">TOP</a> |
+
+<a href='/html5/default.asp?output=print' target="_blank">PRINT</a> |
+
+<a href="/forum/default.asp" target="_blank">FORUM</a> |
+
+<a href="/about/default.asp" target="_top">ABOUT</a>
+
+</div>
+
+<div style="padding-top:13px;color:#404040;clear:both;">
+
+W3Schools is optimized for learning, testing, and training. Examples might be simplified to improve reading and basic understanding.<br />
+
+Tutorials, references, and examples are constantly reviewed to avoid errors, but we cannot warrant full correctness of all content.<br />
+
+While using this site, you agree to have read and accepted our
+
+<a href="/about/about_copyright.asp">terms of use</a> and
+
+<a href="/about/about_privacy.asp">privacy policy</a>.<br />
+
+<a href="/about/about_copyright.asp">Copyright 1999-2012</a> by Refsnes Data. All Rights Reserved.
+
+</div>
+
+</div>
+
+</div>
+
+</div>
+
+<script type="text/javascript">
+
+function googleTranslateElementInit() {
+
+  new google.translate.TranslateElement({
+
+    pageLanguage: 'en',
+
+    autoDisplay: false,    
+
+    gaTrack: true,
+
+    layout: google.translate.TranslateElement.InlineLayout.SIMPLE
+
+  }, 'google_translate_element');
+
+}
+
+</script><script src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit" type="text/javascript"></script>
+
+
+
+</body>
+
+</html>
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md
new file mode 100644
index 0000000000..23b5224053
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/README.md
@@ -0,0 +1,21 @@
+# Request Filtering
+
+`goproxy-no-reddit-at-work` starts an HTTP proxy on :8080. It denies requests
+to "www.reddit.com" made between 8am to 5pm inclusive, local time.
+
+Start it in one shell:
+
+```sh
+$ goproxy-no-reddit-at-work
+```
+
+Fetch reddit in another:
+
+```sh
+$ http_proxy=http://127.0.0.1:8080 wget -O - http://www.reddit.com
+--2015-04-11 16:59:01--  http://www.reddit.com/
+Connecting to 127.0.0.1:8080... connected.
+Proxy request sent, awaiting response... 403 Forbidden
+2015-04-11 16:59:01 ERROR 403: Forbidden.
+```
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go
new file mode 100644
index 0000000000..b174845929
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-no-reddit-at-worktime/noreddit.go
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"log"
+	"net/http"
+	"time"
+)
+
+func main() {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(goproxy.DstHostIs("www.reddit.com")).DoFunc(
+		func(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+			h, _, _ := time.Now().Clock()
+			if h >= 8 && h <= 17 {
+				return r, goproxy.NewResponse(r,
+					goproxy.ContentTypeText, http.StatusForbidden,
+					"Don't waste your time!")
+			} else {
+				ctx.Warnf("clock: %d, you can waste your time...", h)
+			}
+			return r, nil
+		})
+	log.Fatalln(http.ListenAndServe(":8080", proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go
new file mode 100644
index 0000000000..86d8bcfcb5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sokeepalive/sokeepalive.go
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"log"
+	"flag"
+	"net"
+	"net/http"
+)
+
+func main() {
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("addr", ":8080", "proxy listen address")
+	flag.Parse()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Tr.Dial = func(network, addr string) (c net.Conn, err error) {
+		c, err = net.Dial(network, addr)
+		if c, ok := c.(*net.TCPConn); err != nil && ok {
+			c.SetKeepAlive(true)
+		}
+		return
+	}
+	proxy.Verbose = *verbose
+	log.Fatal(http.ListenAndServe(*addr, proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go
new file mode 100644
index 0000000000..b7e2dc9e5e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-sslstrip/sslstrip.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"log"
+	"flag"
+	"net/http"
+)
+
+func main() {
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("addr", ":8080", "proxy listen address")
+	flag.Parse()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().HandleConnect(goproxy.AlwaysMitm)
+	proxy.OnRequest().DoFunc(func (req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		if req.URL.Scheme == "https" {
+			req.URL.Scheme = "http"
+		}
+		return req, nil
+	})
+	proxy.Verbose = *verbose
+	log.Fatal(http.ListenAndServe(*addr, proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/README.md
new file mode 100644
index 0000000000..a51d4c8ebc
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/README.md
@@ -0,0 +1,43 @@
+# Gather Browsing Statistics
+
+`goproxy-stats` starts an HTTP proxy on :8080, counts the bytes received for
+web resources and prints the cumulative sum per URL every 20 seconds.
+
+Start it in one shell:
+
+```sh
+goproxy-stats
+```
+
+Fetch goproxy homepage in another:
+
+```sh
+mkdir tmp
+cd tmp
+http_proxy=http://127.0.0.1:8080 wget -r -l 1 -H \
+	http://ripper234.com/p/introducing-goproxy-light-http-proxy/
+```
+
+Stop it after a moment. `goproxy-stats` should eventually print:
+```sh
+listening on :8080
+statistics
+http://www.telerik.com/fiddler -> 84335
+http://msmvps.com/robots.txt -> 157
+http://eli.thegreenplace.net/robots.txt -> 294
+http://www.phdcomics.com/robots.txt -> 211
+http://resharper.blogspot.com/robots.txt -> 221
+http://idanz.blogli.co.il/robots.txt -> 271
+http://ripper234.com/p/introducing-goproxy-light-http-proxy/ -> 44407
+http://live.gnome.org/robots.txt -> 298
+http://ponetium.wordpress.com/robots.txt -> 178
+http://pilaheleg.blogli.co.il/robots.txt -> 321
+http://pilaheleg.wordpress.com/robots.txt -> 178
+http://blogli.co.il/ -> 9165
+http://nimrod-code.org/robots.txt -> 289
+http://www.joelonsoftware.com/robots.txt -> 1245
+http://top-performance.blogspot.com/robots.txt -> 227
+http://ooc-lang.org/robots.txt -> 345
+http://blogs.jetbrains.com/robots.txt -> 293
+```
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/main.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/main.go
new file mode 100644
index 0000000000..e4cde8d939
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-stats/main.go
@@ -0,0 +1,66 @@
+package main
+
+import (
+	"fmt"
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/html"
+	"io"
+	"log"
+	. "net/http"
+	"time"
+)
+
+type Count struct {
+	Id    string
+	Count int64
+}
+type CountReadCloser struct {
+	Id string
+	R  io.ReadCloser
+	ch chan<- Count
+	nr int64
+}
+
+func (c *CountReadCloser) Read(b []byte) (n int, err error) {
+	n, err = c.R.Read(b)
+	c.nr += int64(n)
+	return
+}
+func (c CountReadCloser) Close() error {
+	c.ch <- Count{c.Id, c.nr}
+	return c.R.Close()
+}
+
+func main() {
+	proxy := goproxy.NewProxyHttpServer()
+	timer := make(chan bool)
+	ch := make(chan Count, 10)
+	go func() {
+		for {
+			time.Sleep(20 * time.Second)
+			timer <- true
+		}
+	}()
+	go func() {
+		m := make(map[string]int64)
+		for {
+			select {
+			case c := <-ch:
+				m[c.Id] = m[c.Id] + c.Count
+			case <-timer:
+				fmt.Printf("statistics\n")
+				for k, v := range m {
+					fmt.Printf("%s -> %d\n", k, v)
+				}
+			}
+		}
+	}()
+
+	// IsWebRelatedText filters on html/javascript/css resources
+	proxy.OnResponse(goproxy_html.IsWebRelatedText).DoFunc(func(resp *Response, ctx *goproxy.ProxyCtx) *Response {
+		resp.Body = &CountReadCloser{ctx.Req.URL.String(), resp.Body, ch, 0}
+		return resp
+	})
+	fmt.Printf("listening on :8080\n")
+	log.Fatal(ListenAndServe(":8080", proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md
new file mode 100644
index 0000000000..7edb0989bf
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/README.md
@@ -0,0 +1,17 @@
+# Transparent Proxy
+
+This transparent example in goproxy is meant to show how to transparenty proxy and hijack all http and https connections while doing a man-in-the-middle to the TLS session.  It requires that goproxy sees all the packets traversing out to the internet.  Linux iptables rules deal with changing the source/destination IPs to act transparently, but you do need to setup your network configuration so that goproxy is a mandatory stop on the outgoing route.  Primarily you can do this by placing the proxy inline.  goproxy does not have any WCCP support itself; patches welcome.
+
+## Why not explicit?
+
+Transparent proxies are more difficult to maintain and setup from a server side, but they require no configuration on the client(s) which could be in unmanaged systems or systems that don't support a proxy configuration.  See the [eavesdropper example](https://github.com/elazarl/goproxy/blob/master/examples/goproxy-eavesdropper/main.go) if you want to see an explicit proxy example.
+
+## Potential Issues
+
+Support for very old clients using HTTPS will fail.  Clients need to send the SNI value in the TLS ClientHello which most modern clients do these days, but old clients will break.
+
+If you're routing table allows for it, an explicit http request to goproxy will cause it to fail in an endless loop since it will try to request resources from itself repeatedly.  This could be solved in the goproxy code by looking up the hostnames, but it adds a delay that is much easier/faster to handle on the routing side.
+
+## Routing Rules
+
+Example routing rules are included in [proxy.sh](https://github.com/elazarl/goproxy/blob/master/examples/goproxy-transparent/proxy.sh) but are best when setup using your distribution's configuration.
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh
new file mode 100644
index 0000000000..c63111432e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/proxy.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# goproxy IP
+GOPROXY_SERVER="10.10.10.1"
+# goproxy port
+GOPROXY_PORT="3129"
+GOPROXY_PORT_TLS="3128"
+# DO NOT MODIFY BELOW
+# Load IPTABLES modules for NAT and IP conntrack support
+modprobe ip_conntrack
+modprobe ip_conntrack_ftp
+echo 1 > /proc/sys/net/ipv4/ip_forward
+echo 2 > /proc/sys/net/ipv4/conf/all/rp_filter
+
+# Clean old firewall
+iptables -t nat -F
+iptables -t nat -X
+iptables -t mangle -F
+iptables -t mangle -X
+
+# Write new rules
+iptables -t nat -A PREROUTING -s $GOPROXY_SERVER -p tcp --dport $GOPROXY_PORT -j ACCEPT
+iptables -t nat -A PREROUTING -s $GOPROXY_SERVER -p tcp --dport $GOPROXY_PORT_TLS -j ACCEPT
+iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to-destination $GOPROXY_SERVER:$GOPROXY_PORT
+iptables -t nat -A PREROUTING -p tcp --dport 443 -j DNAT --to-destination $GOPROXY_SERVER:$GOPROXY_PORT_TLS
+# The following line supports using goproxy as an explicit proxy in addition
+iptables -t nat -A PREROUTING -p tcp --dport 8080 -j DNAT --to-destination $GOPROXY_SERVER:$GOPROXY_PORT
+iptables -t nat -A POSTROUTING -j MASQUERADE
+iptables -t mangle -A PREROUTING -p tcp --dport $GOPROXY_PORT -j DROP
+iptables -t mangle -A PREROUTING -p tcp --dport $GOPROXY_PORT_TLS -j DROP
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go
new file mode 100644
index 0000000000..b4134e23b7
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-transparent/transparent.go
@@ -0,0 +1,148 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"flag"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"net/url"
+	"regexp"
+
+	"github.com/elazarl/goproxy"
+	"github.com/inconshreveable/go-vhost"
+)
+
+func orPanic(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+func main() {
+	verbose := flag.Bool("v", true, "should every proxy request be logged to stdout")
+	http_addr := flag.String("httpaddr", ":3129", "proxy http listen address")
+	https_addr := flag.String("httpsaddr", ":3128", "proxy https listen address")
+	flag.Parse()
+
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = *verbose
+	if proxy.Verbose {
+		log.Printf("Server starting up! - configured to listen on http interface %s and https interface %s", *http_addr, *https_addr)
+	}
+
+	proxy.NonproxyHandler = http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		if req.Host == "" {
+			fmt.Fprintln(w, "Cannot handle requests without Host header, e.g., HTTP 1.0")
+			return
+		}
+		req.URL.Scheme = "http"
+		req.URL.Host = req.Host
+		proxy.ServeHTTP(w, req)
+	})
+	proxy.OnRequest(goproxy.ReqHostMatches(regexp.MustCompile("^.*$"))).
+		HandleConnect(goproxy.AlwaysMitm)
+	proxy.OnRequest(goproxy.ReqHostMatches(regexp.MustCompile("^.*:80$"))).
+		HijackConnect(func(req *http.Request, client net.Conn, ctx *goproxy.ProxyCtx) {
+		defer func() {
+			if e := recover(); e != nil {
+				ctx.Logf("error connecting to remote: %v", e)
+				client.Write([]byte("HTTP/1.1 500 Cannot reach destination\r\n\r\n"))
+			}
+			client.Close()
+		}()
+		clientBuf := bufio.NewReadWriter(bufio.NewReader(client), bufio.NewWriter(client))
+		remote, err := connectDial(proxy, "tcp", req.URL.Host)
+		orPanic(err)
+		remoteBuf := bufio.NewReadWriter(bufio.NewReader(remote), bufio.NewWriter(remote))
+		for {
+			req, err := http.ReadRequest(clientBuf.Reader)
+			orPanic(err)
+			orPanic(req.Write(remoteBuf))
+			orPanic(remoteBuf.Flush())
+			resp, err := http.ReadResponse(remoteBuf.Reader, req)
+			orPanic(err)
+			orPanic(resp.Write(clientBuf.Writer))
+			orPanic(clientBuf.Flush())
+		}
+	})
+
+	go func() {
+		log.Fatalln(http.ListenAndServe(*http_addr, proxy))
+	}()
+
+	// listen to the TLS ClientHello but make it a CONNECT request instead
+	ln, err := net.Listen("tcp", *https_addr)
+	if err != nil {
+		log.Fatalf("Error listening for https connections - %v", err)
+	}
+	for {
+		c, err := ln.Accept()
+		if err != nil {
+			log.Printf("Error accepting new connection - %v", err)
+			continue
+		}
+		go func(c net.Conn) {
+			tlsConn, err := vhost.TLS(c)
+			if err != nil {
+				log.Printf("Error accepting new connection - %v", err)
+			}
+			if tlsConn.Host() == "" {
+				log.Printf("Cannot support non-SNI enabled clients")
+				return
+			}
+			connectReq := &http.Request{
+				Method: "CONNECT",
+				URL: &url.URL{
+					Opaque: tlsConn.Host(),
+					Host:   net.JoinHostPort(tlsConn.Host(), "443"),
+				},
+				Host:   tlsConn.Host(),
+				Header: make(http.Header),
+			}
+			resp := dumbResponseWriter{tlsConn}
+			proxy.ServeHTTP(resp, connectReq)
+		}(c)
+	}
+}
+
+// copied/converted from https.go
+func dial(proxy *goproxy.ProxyHttpServer, network, addr string) (c net.Conn, err error) {
+	if proxy.Tr.Dial != nil {
+		return proxy.Tr.Dial(network, addr)
+	}
+	return net.Dial(network, addr)
+}
+
+// copied/converted from https.go
+func connectDial(proxy *goproxy.ProxyHttpServer, network, addr string) (c net.Conn, err error) {
+	if proxy.ConnectDial == nil {
+		return dial(proxy, network, addr)
+	}
+	return proxy.ConnectDial(network, addr)
+}
+
+type dumbResponseWriter struct {
+	net.Conn
+}
+
+func (dumb dumbResponseWriter) Header() http.Header {
+	panic("Header() should not be called on this ResponseWriter")
+}
+
+func (dumb dumbResponseWriter) Write(buf []byte) (int, error) {
+	if bytes.Equal(buf, []byte("HTTP/1.0 200 OK\r\n\r\n")) {
+		return len(buf), nil // throw away the HTTP OK response from the faux CONNECT request
+	}
+	return dumb.Conn.Write(buf)
+}
+
+func (dumb dumbResponseWriter) WriteHeader(code int) {
+	panic("WriteHeader() should not be called on this ResponseWriter")
+}
+
+func (dumb dumbResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	return dumb, bufio.NewReadWriter(bufio.NewReader(dumb), bufio.NewWriter(dumb)), nil
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go
new file mode 100644
index 0000000000..4b683fd329
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-upside-down-ternet/main.go
@@ -0,0 +1,26 @@
+package main
+
+import (
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/image"
+	"image"
+	"log"
+	"net/http"
+)
+
+func main() {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse().Do(goproxy_image.HandleImage(func(img image.Image, ctx *goproxy.ProxyCtx) image.Image {
+		dx, dy := img.Bounds().Dx(), img.Bounds().Dy()
+
+		nimg := image.NewRGBA(img.Bounds())
+		for i := 0; i < dx; i++ {
+			for j := 0; j <= dy; j++ {
+				nimg.Set(i, j, img.At(i, dy-j-1))
+			}
+		}
+		return nimg
+	}))
+	proxy.Verbose = true
+	log.Fatal(http.ListenAndServe(":8080", proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go
new file mode 100644
index 0000000000..0e7eadbb15
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/examples/goproxy-yui-minify/yui.go
@@ -0,0 +1,91 @@
+// This example would minify standalone Javascript files (identified by their content type)
+// using the command line utility YUI compressor http://yui.github.io/yuicompressor/
+// Example usage:
+//
+//    ./yui -java /usr/local/bin/java -yuicompressor ~/Downloads/yuicompressor-2.4.8.jar
+//    $ curl -vx localhost:8080  http://golang.org/lib/godoc/godocs.js
+//    (function(){function g(){var u=$("#search");if(u.length===0){return}function t(){if(....
+//    $ curl http://golang.org/lib/godoc/godocs.js | head -n 3
+//    // Copyright 2012 The Go Authors. All rights reserved.
+//    // Use of this source code is governed by a BSD-style
+//    // license that can be found in the LICENSE file.
+package main
+
+import (
+	"flag"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+
+	"github.com/elazarl/goproxy"
+)
+
+func main() {
+	verbose := flag.Bool("v", false, "should every proxy request be logged to stdout")
+	addr := flag.String("addr", ":8080", "proxy listen address")
+	java := flag.String("javapath", "java", "where the Java executable is located")
+	yuicompressor := flag.String("yuicompressor", "", "where the yuicompressor is located, assumed to be in CWD")
+	yuicompressordir := flag.String("yuicompressordir", ".", "a folder to search yuicompressor in, will be ignored if yuicompressor is set")
+	flag.Parse()
+	if *yuicompressor == "" {
+		files, err := ioutil.ReadDir(*yuicompressordir)
+		if err != nil {
+			log.Fatal("Cannot find yuicompressor jar")
+		}
+		for _, file := range files {
+			if strings.HasPrefix(file.Name(), "yuicompressor") && strings.HasSuffix(file.Name(), ".jar") {
+				c := path.Join(*yuicompressordir, file.Name())
+				yuicompressor = &c
+				break
+			}
+		}
+	}
+	if *yuicompressor == "" {
+		log.Fatal("Can't find yuicompressor jar, searched yuicompressor*.jar in dir ", *yuicompressordir)
+	}
+	if _, err := os.Stat(*yuicompressor); os.IsNotExist(err) {
+		log.Fatal("Can't find yuicompressor jar specified ", *yuicompressor)
+	}
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = *verbose
+	proxy.OnResponse().DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		contentType := resp.Header.Get("Content-Type")
+		if contentType == "application/javascript" || contentType == "application/x-javascript" {
+			// in real code, response should be streamed as well
+			var err error
+			cmd := exec.Command(*java, "-jar", *yuicompressor, "--type", "js")
+			cmd.Stdin = resp.Body
+			resp.Body, err = cmd.StdoutPipe()
+			if err != nil {
+				ctx.Warnf("Cannot minify content in %v: %v", ctx.Req.URL, err)
+				return goproxy.TextResponse(ctx.Req, "Error getting stdout pipe")
+			}
+			stderr, err := cmd.StderrPipe()
+			if err != nil {
+				ctx.Logf("Error obtaining stderr from yuicompress: %s", err)
+				return goproxy.TextResponse(ctx.Req, "Error getting stderr pipe")
+			}
+			if err := cmd.Start(); err != nil {
+				ctx.Warnf("Cannot minify content in %v: %v", ctx.Req.URL, err)
+			}
+			go func() {
+				defer stderr.Close()
+				const kb = 1024
+				msg, err := ioutil.ReadAll(&io.LimitedReader{stderr, 50 * kb})
+				if len(msg) != 0 {
+					ctx.Logf("Error executing yuicompress: %s", string(msg))
+				}
+				if err != nil {
+					ctx.Logf("Error reading stderr from yuicompress: %s", string(msg))
+				}
+			}()
+		}
+		return resp
+	})
+	log.Fatal(http.ListenAndServe(*addr, proxy))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic.go
new file mode 100644
index 0000000000..4833763e2a
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic.go
@@ -0,0 +1,76 @@
+package auth
+
+import (
+	"bytes"
+	"encoding/base64"
+	"io/ioutil"
+	"net/http"
+	"strings"
+
+	"github.com/elazarl/goproxy"
+)
+
+var unauthorizedMsg = []byte("407 Proxy Authentication Required")
+
+func BasicUnauthorized(req *http.Request, realm string) *http.Response {
+	// TODO(elazar): verify realm is well formed
+	return &http.Response{
+		StatusCode:    407,
+		ProtoMajor:    1,
+		ProtoMinor:    1,
+		Request:       req,
+		Header:        http.Header{"Proxy-Authenticate": []string{"Basic realm=" + realm}},
+		Body:          ioutil.NopCloser(bytes.NewBuffer(unauthorizedMsg)),
+		ContentLength: int64(len(unauthorizedMsg)),
+	}
+}
+
+var proxyAuthorizatonHeader = "Proxy-Authorization"
+
+func auth(req *http.Request, f func(user, passwd string) bool) bool {
+	authheader := strings.SplitN(req.Header.Get(proxyAuthorizatonHeader), " ", 2)
+	req.Header.Del(proxyAuthorizatonHeader)
+	if len(authheader) != 2 || authheader[0] != "Basic" {
+		return false
+	}
+	userpassraw, err := base64.StdEncoding.DecodeString(authheader[1])
+	if err != nil {
+		return false
+	}
+	userpass := strings.SplitN(string(userpassraw), ":", 2)
+	if len(userpass) != 2 {
+		return false
+	}
+	return f(userpass[0], userpass[1])
+}
+
+// Basic returns a basic HTTP authentication handler for requests
+//
+// You probably want to use auth.ProxyBasic(proxy) to enable authentication for all proxy activities
+func Basic(realm string, f func(user, passwd string) bool) goproxy.ReqHandler {
+	return goproxy.FuncReqHandler(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		if !auth(req, f) {
+			return nil, BasicUnauthorized(req, realm)
+		}
+		return req, nil
+	})
+}
+
+// BasicConnect returns a basic HTTP authentication handler for CONNECT requests
+//
+// You probably want to use auth.ProxyBasic(proxy) to enable authentication for all proxy activities
+func BasicConnect(realm string, f func(user, passwd string) bool) goproxy.HttpsHandler {
+	return goproxy.FuncHttpsHandler(func(host string, ctx *goproxy.ProxyCtx) (*goproxy.ConnectAction, string) {
+		if !auth(ctx.Req, f) {
+			ctx.Resp = BasicUnauthorized(ctx.Req, realm)
+			return goproxy.RejectConnect, host
+		}
+		return goproxy.OkConnect, host
+	})
+}
+
+// ProxyBasic will force HTTP authentication before any request to the proxy is processed
+func ProxyBasic(proxy *goproxy.ProxyHttpServer, realm string, f func(user, passwd string) bool) {
+	proxy.OnRequest().Do(Basic(realm, f))
+	proxy.OnRequest().HandleConnect(BasicConnect(realm, f))
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic_test.go
new file mode 100644
index 0000000000..792d789bcd
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/auth/basic_test.go
@@ -0,0 +1,175 @@
+package auth_test
+
+import (
+	"encoding/base64"
+	"io"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"os/exec"
+	"os/signal"
+	"sync/atomic"
+	"testing"
+
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/auth"
+)
+
+type ConstantHanlder string
+
+func (h ConstantHanlder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	io.WriteString(w, string(h))
+}
+
+func oneShotProxy(proxy *goproxy.ProxyHttpServer) (client *http.Client, s *httptest.Server) {
+	s = httptest.NewServer(proxy)
+
+	proxyUrl, _ := url.Parse(s.URL)
+	tr := &http.Transport{Proxy: http.ProxyURL(proxyUrl)}
+	client = &http.Client{Transport: tr}
+	return
+}
+
+func times(n int, s string) string {
+	r := make([]byte, 0, n*len(s))
+	for i := 0; i < n; i++ {
+		r = append(r, s...)
+	}
+	return string(r)
+}
+
+func TestBasicConnectAuthWithCurl(t *testing.T) {
+	expected := ":c>"
+	background := httptest.NewTLSServer(ConstantHanlder(expected))
+	defer background.Close()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().HandleConnect(auth.BasicConnect("my_realm", func(user, passwd string) bool {
+		return user == "user" && passwd == "open sesame"
+	}))
+	_, proxyserver := oneShotProxy(proxy)
+	defer proxyserver.Close()
+
+	cmd := exec.Command("curl",
+		"--silent", "--show-error", "--insecure",
+		"-x", proxyserver.URL,
+		"-U", "user:open sesame",
+		"-p",
+		"--url", background.URL+"/[1-3]",
+	)
+	out, err := cmd.CombinedOutput() // if curl got error, it'll show up in stderr
+	if err != nil {
+		t.Fatal(err, string(out))
+	}
+	finalexpected := times(3, expected)
+	if string(out) != finalexpected {
+		t.Error("Expected", finalexpected, "got", string(out))
+	}
+}
+
+func TestBasicAuthWithCurl(t *testing.T) {
+	expected := ":c>"
+	background := httptest.NewServer(ConstantHanlder(expected))
+	defer background.Close()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().Do(auth.Basic("my_realm", func(user, passwd string) bool {
+		return user == "user" && passwd == "open sesame"
+	}))
+	_, proxyserver := oneShotProxy(proxy)
+	defer proxyserver.Close()
+
+	cmd := exec.Command("curl",
+		"--silent", "--show-error",
+		"-x", proxyserver.URL,
+		"-U", "user:open sesame",
+		"--url", background.URL+"/[1-3]",
+	)
+	out, err := cmd.CombinedOutput() // if curl got error, it'll show up in stderr
+	if err != nil {
+		t.Fatal(err, string(out))
+	}
+	finalexpected := times(3, expected)
+	if string(out) != finalexpected {
+		t.Error("Expected", finalexpected, "got", string(out))
+	}
+}
+
+func TestBasicAuth(t *testing.T) {
+	expected := "hello"
+	background := httptest.NewServer(ConstantHanlder(expected))
+	defer background.Close()
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().Do(auth.Basic("my_realm", func(user, passwd string) bool {
+		return user == "user" && passwd == "open sesame"
+	}))
+	client, proxyserver := oneShotProxy(proxy)
+	defer proxyserver.Close()
+
+	// without auth
+	resp, err := client.Get(background.URL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if resp.Header.Get("Proxy-Authenticate") != "Basic realm=my_realm" {
+		t.Error("Expected Proxy-Authenticate header got", resp.Header.Get("Proxy-Authenticate"))
+	}
+	if resp.StatusCode != 407 {
+		t.Error("Expected status 407 Proxy Authentication Required, got", resp.Status)
+	}
+
+	// with auth
+	req, err := http.NewRequest("GET", background.URL, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req.Header.Set("Proxy-Authorization",
+		"Basic "+base64.StdEncoding.EncodeToString([]byte("user:open sesame")))
+	resp, err = client.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if resp.StatusCode != 200 {
+		t.Error("Expected status 200 OK, got", resp.Status)
+	}
+	msg, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(msg) != "hello" {
+		t.Errorf("Expected '%s', actual '%s'", expected, string(msg))
+	}
+}
+
+func TestWithBrowser(t *testing.T) {
+	// an easy way to check if auth works with webserver
+	// to test, run with
+	// $ go test -run TestWithBrowser -- server
+	// configure a browser to use the printed proxy address, use the proxy
+	// and exit with Ctrl-C. It will throw error if your haven't acutally used the proxy
+	if os.Args[len(os.Args)-1] != "server" {
+		return
+	}
+	proxy := goproxy.NewProxyHttpServer()
+	println("proxy localhost port 8082")
+	access := int32(0)
+	proxy.OnRequest().Do(auth.Basic("my_realm", func(user, passwd string) bool {
+		atomic.AddInt32(&access, 1)
+		return user == "user" && passwd == "1234"
+	}))
+	l, err := net.Listen("tcp", "localhost:8082")
+	if err != nil {
+		t.Fatal(err)
+	}
+	ch := make(chan os.Signal)
+	signal.Notify(ch, os.Interrupt)
+	go func() {
+		<-ch
+		l.Close()
+	}()
+	http.Serve(l, proxy)
+	if access <= 0 {
+		t.Error("No one accessed the proxy")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.html b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.html
new file mode 100644
index 0000000000..6bf33e81b5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.html
@@ -0,0 +1,585 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+  
+<html lang="he">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1255">
+<meta http-equiv="Content-Language" content="he"/>
+<!--meta http-equiv="Content-Type" content="text/html; charset=utf-8" /-->
+<META NAME="Keywords" CONTENT="àåðéáøñéèä, äåøàä îøçå÷, ÷åøñéí, Distance Learning, E-Learning, University, Education, Open, Courseware, Israel, Higher Education, Satellite, Telecourses, Courses,  educational technology, computer-mediated,  studies">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<title>ãó äáéú ùì ùä&quot;í</title>
+<link rel="alternate" href="rss/rss.xml" type="application/rss+xml" title="çãùåú åòãëåðéí îùä&quot;í, äîøëæ ìùéìåá èëðåìåâéåú áäåøàä îøçå÷ áàåðéáøñéèä äôúåçä"/>	
+<link rel="stylesheet" type="text/css" href="design/common.css">
+<link rel="stylesheet" type="text/css" href="design/news.css">
+
+<script language="javascript" type="text/javascript" src="js_scripts/shoham_common.js"></script>
+<script language="JavaScript" src="include/email_unobfuscator.js" type="text/javascript"></script>
+<script type="text/javascript" src="/js_scripts/toolbox.js"></script> 
+
+<script type="text/javascript">
+var semester='2012b';	// current semester
+var hebrewSemester;
+
+//js for the flash movie:
+function getSemester(){ 
+	return semester;
+	//return '2009a';
+}
+
+setSemester(semester);
+switchLinkSemester(semester);
+createSuggestionScript();
+switchCoursesSuggestionSource(semester);
+
+addLoadEvent(function() {
+
+	// ADD JAVASCRIPT EVENTS/FUNCTIONS ETC. YOU WANT TO BE CALLED ONLOAD HERE AND ONLY HERE
+	
+	showHideMessage();
+	//addIt();
+	//setAddThis();
+	
+}  )
+
+
+
+var tBox = new QQtoolBox();
+
+</script>
+
+<!--script language="javascript" src="js_scripts/flash2.js"></script-->
+
+<link rel="stylesheet" href="suggestion/suggestion.css" media="screen" type="text/css">	
+
+</head>
+
+<body>
+<div id="container">
+<div id="header">
+<div id="header_right">
+<a href="/" target="_self" title="ùä&quot;í"><img src="graphics_nhp/shoam_logo_s.jpg" border="0" alt="ùä&quot;í" target="_self"></a>
+</div>
+
+<div id="header_left">
+
+<div id="header_left_op">
+<a href="http://www.openu.ac.il/" target="_self" title="àåôð'è"><img src="graphics_nhp/openu.gif" border="0" alt="àåôð'è"></a>
+</div>
+<!--div id="search"-->
+<!-- search_hp.html (START) -->
+
+<!--script language="javascript" src="opusSearch.js" type="text/javascript"></script-->
+
+<div id="search">
+
+
+<form name="form" action="http://www.google.co.il/search" id="simpleSearch" target="" method="get">
+<input type="text" id="as_q" name="as_q" onFocus="this.select()" value="çôùå áàúø æä åáàúøé ä÷åøñéí">
+<input type="hidden" id="hl" name="hl" value="iw">
+<input type="hidden" id="as_sitesearch" name="as_sitesearch" value="telem.openu.ac.il">
+<!--a id="button" title="çéôåù áâåâì" href="javascript:simpleSearch();"><span>&nbsp;çôù</span></a-->
+<a id="button" title="çéôåù áâåâì" onclick="form.submit()"><span>&nbsp;çôù</span></a>
+</form>
+
+<div id="header_eng"><span class="eng"><a href="http://www-e.openu.ac.il/geninfor/shoham.html" target="_self" title="shoham english site">English</a></span></div>
+
+</div>
+<!-- search_hp.html (END) -->
+<!--/div-->
+
+</div>
+<!--end of header-->
+</div>
+
+<div id="content">
+
+<div id="text">
+
+<div id="right">
+<div id="top_right">
+<div id="top_right_text">
+
+<h1>ëðéñä ìàúøé ä÷åøñéí</h1>
+<!-- suggestion.htm (START) -->
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1255">
+<meta http-equiv="Content-Language" content="he"/>
+
+<link rel="stylesheet" href="suggestion/suggestion.css" media="screen" type="text/css">
+
+<style type="text/css">
+/* script suggestion CSS START */
+/* uri: don't touch this section unless your name is "Uri Shefi" */
+#suggestion_box{
+	/*dawidth: 245px; */   	/* causes some courses to disapear */
+	border:solid 0px;
+	font-size: 15px;
+}
+
+#course_suggestion{ /* input */
+	direction: rtl;
+	font-family: Arial, Verdana, Tahoma;
+	font-size: 12px;
+	border: 1px solid #CCCCCC;
+	width: 170px;
+	height:15px;
+	
+}
+.autocomplete{
+	/* right: 178px; */
+	width: 280px;
+}
+/* script suggestion CSS END */
+
+.suggestion_button{
+	border: 0px solid #CCCCCC;
+	vertical-align:middle;
+	cursor: pointer;
+
+	/*
+	width:23px;
+    height:19px;
+	*/
+	padding-bottom:2px;
+
+		/*cursor: hand;*/
+}
+#current_semester{
+
+	font-family: Arial, Verdana, Tahoma;
+	font-size: 15px;
+	text-transform: uppercase;
+	width: 122px;
+
+}
+#autoComplteMessageLayer{
+
+}
+
+#summerLink, #summerLink a{
+	color: red;
+	display: none;
+	font-weight: bold;
+	font-size: 15px;
+	text-decoration: underline;
+	cursor: hand;
+}
+</style>
+
+<div id="switch_semester_box">
+<span id="koteret">ñîñèø</span>
+<select id="current_semester" onChange="refreshSemester(this.options[this.selectedIndex].value);">
+ <option value="2012b">2012 á (àáéá)</option>
+ <option value="2012a">2012 à (ñúéå)</option>
+ <option value="2011c">2011 â (÷éõ)</option>
+ <option value="2011b">2011 á (àáéá)</option>
+ <option value="2011a">2011 à (ñúéå)</option>
+ <option value="2010c">2010 â (÷éõ)</option>
+ <option value="2010b">2010 á (àáéá)</option>
+ <option value="2010a">2010 à (ñúéå)</option>
+ <option value="2009c">2009 â (÷éõ)</option>
+ <option value="2009b">2009 á (àáéá)</option>
+ <option value="2009a">2009 à (ñúéå)</option>
+ <option value="2008c">2008 â (÷éõ)</option>
+ <option value="2008b">2008 á (àáéá)</option>
+ <option value="2008a">2008 à (ñúéå)</option>
+ <option value="2007c">2007 â (÷éõ)</option>
+ <option value="2007b">2007 á (àáéá)</option> 
+ <option value="2007a">2007 à (ñúéå)</option>
+ <option value="2006c">2006 â (÷éõ)</option>
+ <option value="2006b">2006 á (àáéá)</option> 
+ <option value="2006a">2006 à (ñúéå)</option>
+ <option value="2005c">2005 â (÷éõ)</option>
+ <option value="2005b">2005 á (àáéá)</option> 
+ <option value="2005a">2005 à (ñúéå)</option>
+</select>
+</div>
+
+<!-- SEGGUESTION BOX (START) -->
+<div style="text-align: right; color:#404040" id="suggestion_box">
+ùí ÷åøñ àå îñôø ÷åøñ <div id="suggestion_course_display"></div><br/>
+<input type="text" id="course_suggestion" value="øùéîú ä÷åøñéí äîåöòéí áñîñèø äðáçø" maxlength="60" title="øùéîú ä÷åøñéí äîåöòéí áñîñèø æä"><img src="graphics_nhp/mgIcon2.jpg" onclick="evalChoice();" class="suggestion_button" alt="ìàúø ä÷åøñ" />
+<!--div id="autoComplteMessageLayer"></div-->
+<!--<span id='summerLink' onClick="refreshSemester('2011c');">ìñîñèø ÷éõ 2011â ìçõ ëàï</span>-->
+<span id='summerLink'><a href="courses_lists/courses_2011c.html">ìñîñèø ÷éõ 2011â ìçõ ëàï</a></span>
+</div>
+<!-- SEGGUESTION BOX (END) -->
+
+
+<div id="fulllist">
+<a href="courses_lists/courses_2009a.html" id="courses_full_link" target="_self"> ìøùéîú àúøé ä÷åøñéí åäîçì÷åú</a>  <div id="courses_full_link_display"></div>
+</div>
+<!-- suggestion.htm (END) -->
+</div>
+<!--end of top_right-->
+</div>
+
+<div id="bottom_right">
+<div id="bottom_right_text">
+<h1>öååúé äåøàä</h1>
+<div class="linklist_a">
+<a href="content/help_staff.html" target="_self" class="linklist_item_a" title="úîéëä åòæøä">úîéëä åòæøä</a><br>
+<a href="content/training.html" target="_self" class="linklist_item_a" title="äãøëåú ìñâì ääåøàä">äãøëåú ìñâì ääåøàä </a>&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span><br>
+<a href="http://telem.openu.ac.il/segel/" target="_self" class="linklist_item_a" title="àúø öååúé äåøàä">àúø öååúé äåøàä</a><br>
+<a href="http://telem.openu.ac.il/content/virtual_shoham.html" target="_self" class="linklist_item_a" title="ëéúä åéøèåàìéú">ëéúä åéøèåàìéú</a><br>
+<a href="http://telem.openu.ac.il/content/matalot_staff.html" target="_self" class="linklist_item_a" title="îòøëú äîèìåú">îòøëú äîèìåú</a><br>
+<a href="http://telem.openu.ac.il/tikshuv_prize/" target="_blank" class="linklist_item_a" title="úçøåú îú÷ùá îöèééï">úçøåú îú÷ùá îöèééï</a><br>
+<a href="http://telem.openu.ac.il/content/hp_search.html" target="_blank" class="linklist_item_a" title="çéôåù áàúøé ä÷åøñéí">çéôåù áàúøé ä÷åøñéí</a><br>
+<!--a href="http://telem.openu.ac.il/courses/resources/private/oracle_Brochure.pdf" target="_blank" class="linklist_item_a" title="äòìàú çåáøú ä÷åøñ ìàúø ">äòìàú çåáøú ä÷åøñ</a>&nbsp;&nbsp;(<a href="https://sheilta.apps.openu.ac.il/pls/myopr/BOOKLET.FIRST" target="_blank" title="ëðéñä ìîåøùéí">ëðéñä ìîåøùéí</a>)<!--&nbsp;&nbsp;&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br-->
+<a href="http://www.openu.ac.il/surveys/teaching_reports.html" target="_blank" class="linklist_item_a" title="ãåçåú ñ÷ø äåøàä">ãåçåú ñ÷ø äåøàä</a>&nbsp;&nbsp;(<img border="0"  src="graphics_nhp/content_img/lockg.gif" title="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" alt="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" />) 
+<!--&nbsp;&nbsp;&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+
+
+<a href="https://sso.apps.openu.ac.il/login?T_PLACE=https://sheilta.apps.openu.ac.il/pls/myopr/PELE.FIRST" target="_blank" class="linklist_item_a" title="ôåøèì îðçéí">ôåøèì îðçéí </a>&nbsp;
+(<img border="0"   src="graphics_nhp/content_img/lockg.gif" title="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" alt="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" />) 
+
+<!--&nbsp;&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+
+
+<a href="http://opal.openu.ac.il" title="ëðéñä ìñáéáú äìîéãä äçãùä"    target="_blank" class="new">îòøëú àåÉôÌÈì</a><!--&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+
+
+
+<a href="http://opal.openu.ac.il/course/view.php?id=107" title=" "    target="_blank">ðéäåì àúøé ÷åøñéí - îãøéê ìîøëæéí</a>&nbsp;(<img border="0"   src="graphics_nhp/content_img/lockg.gif" title="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" alt="ëðéñä ìáòìé äøùàåú áìáã îúåê äàå&quot;ô" />) 
+<img src="graphics_nhp/star_bg_gray.gif" border="0" alt=""><span class="new">çãù</span><br>
+
+
+
+<br>
+</div>
+
+<h1>ñèåãðèéí</h1>
+<div class="linklist_a">
+<a href="/content/help_students.html" target="_self" class="linklist_item_a" title="úîéëä åòæøä">úîéëä åòæøä</a><br>
+<a href="https://sheilta.apps.openu.ac.il/pls/dmyopt2/user_form.first?p_from=http://telem.openu.ac.il/hp_files/html_files/user_info.html" target="_blank" class="linklist_item_a" title="òãëåï ôøèéí àéùééí">òãëåï ôøèéí àéùééí</a><br>
+
+<a href="http://www.openu.ac.il/sheilta/" target="_blank" class="linklist_item_a" title="ùàéìú'à">ùàéìú&quot;à</a><br>
+
+<a href="https://sheilta.apps.openu.ac.il/pls/dmyopt2/LUACH_SHANA.first?p_time=" target="_blank" class="linklist_item_a" title="ìåç æîðéí îô'ä">ìåç æîðéí - îô&quot;ä</a><br>
+
+<a href="/content/matalot_stud.html" target="_self" class="linklist_item_a" title="îòøëú äîèìåú">îòøëú äîèìåú</a><br>
+
+<a href="/content/ofek.html" target="_self" class="linklist_item_a" title="àåô÷">àåô÷ - ùéòåøéí áåéãéàå</a>&nbsp;&nbsp;&nbsp;&nbsp;<!--img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span--><br>
+
+
+
+<a href="http://telem.openu.ac.il/content/elluminate_support.html" target="_self" class="linklist_item_a" title=" ëéúä åéøèåàìéú (Elluminate)"> ëéúä åéøèåàìéú (Elluminate) </a><br>
+
+
+<!--<a href="http://telem.openu.ac.il/content/GoToMeeting.html" target="_self" class="linklist_item_a" title=" ëéúä åéøèåàìéú (GoToMeeting)"> ëéúä åéøèåàìéú (GoToMeeting) </a><br>-->
+
+
+<a href="/content/courseware.html" target="_self" class="linklist_item_a" title="îàâø äìåîãåú åäú÷ìéèåøéí">îàâø äìåîãåú åäú÷ìéèåøéí</a><br>
+
+<a href="http://telem.openu.ac.il/academic-paper/index.htm" target="_blank" class="linklist_item_a" title="ëúéáú òáåãä ñîéðøéåðéú">ëúéáú òáåãä ñîéðøéåðéú (ìåîãä)</a><br>
+
+<a href="http://estudy.openu.ac.il/opus/bin/en.jsp?enPage=AnnotationsPage&enDispWho=Annotations&enZone=Annotations" target="_blank" class="linklist_item_a" title="ëðéñä ìôð÷ñ äàéùé">ôð÷ñ àéùé</a><br>
+ 
+
+<a href="http://www.openu.ac.il/new-student/" target="_blank" class="linklist_item_a" title="àúø äñèåãðè">äîãøéê ìñèåãðè äçãù</a> 
+<br>
+
+
+ 
+
+
+</div>
+ 
+<!--<div id="mashov_gen">
+<div class="mashov"><a href="http://forum.openu.ac.il/opus/bin/en.jsp?enZone=Forum117583" target="_blank" title="îùåá ìùä&quot;í">ôåøåí îùåá - çåå ãòúëí òì àúøé ä÷åøñéí, äìåîãåú, åé÷é... </a></div>
+</div>-->
+</div>
+
+<!--end of bootom_right-->
+</div>
+<!--end of right-->
+</div>
+
+<div id="left">
+<div id="flash_zone" title="Falsh Movie" astyle="background:url(graphics_nhp/flash.jpg) 100 0 no-repeat;">
+<!--  <script type="text/javascript" src="js_scripts/flash.js"></script> 
+--><!--must be after the last </boject> -->
+
+<img src="graphics_nhp/flash.jpg" border="0" alt="rss" valign="left" align="abstop">
+</div>
+
+<div id="message" class="messageHidden">
+
+
+<!--ôúéçú ñîñèø-->
+<!--spring-->
+<div class="tm">
+<div class="img">
+<IMG alt="" src="graphics_nhp/message_gifs/icon_spring.gif" border=0></div>
+<strong>&nbsp;&nbsp;àúøé 2012á ðôúçå ìñèåãðèéí. öååú ùä"í îàçì ìëí ñîñèø îåöìç.</strong>
+<span class="date">(4.3.12)</span>
+</div>
+</div>
+
+<!--center><img src="content/happy_holiday.gif" style="padding: 3px; margin: 3px;"></center-->
+
+<div id="links_zone">
+
+
+<div id="links_right">
+<h1>
+<span class="news">çãùåú åòãëåðéí</span>
+<span class="rss">
+<span class="rss_text"><a href="content/rss_help.html" target="_blank" title="òæøä"><span id="rss_gif">?</span>rss&nbsp;</a><img src="graphics_nhp/rss.jpg" border="0" alt="rss" valign="left" align="abstop"></span></span>
+
+
+</h1>
+
+<div id="rss_list">
+<ul class='newsBriefList'>
+
+	<li class='newsBriefItem'><a href='http://shohamnews.blogspot.com/2012/03/html5.html' target='_blank'>HTML5</a>
+<div class='newsBriefDate'>2012-03-21 12:45:00</div>
+	</li>
+	<li class='newsBriefItem'><a href='http://shohamnews.blogspot.com/2012/03/2012.html' target='_blank'>÷åì ÷åøà ìäâùú äöòåú ìëðñ îéè&quot;ì äòùéøé 2012</a>
+<div class='newsBriefDate'>2012-03-07 12:52:00</div>
+	</li>
+	<li class='newsBriefItem'><a href='http://shohamnews.blogspot.com/2012/03/19312.html' target='_blank'>äæîðä ìäøöàä áñîéðø äîç÷ø ùì äîç÷ø ìç÷ø çãùðåú åùä&quot;í - 19.3.12</a>
+<div class='newsBriefDate'>2012-03-07 09:03:00</div>
+	</li>
+	<li class='newsBriefItem'><a href='http://peer-news.blogspot.com/2012/01/blog-post_18.html' target='_blank'>ñôø ÷åìé ðåñó á÷åøñ â&#39;ðåñééã: &quot;äùîãú äòîéí äàéðãéàðéí ùì àîøé÷ä äñôøãéú</a>
+<div class='newsBriefDate'>2012-01-18 14:41:00</div>
+	</li>
+	<li class='newsBriefItem'><a href='http://peer-news.blogspot.com/2012/01/blog-post.html' target='_blank'>ñôø ÷åìé çãù á÷åøñ â&#39;ðåñééã: &quot;áéï âæòðåú ìâ&#39;ðåñééã áòú äîåãøðéú</a>
+<div class='newsBriefDate'>2012-01-18 14:31:00</div>
+	</li>
+	<li class='newsBriefItem'><a href='http://peer-news.blogspot.com/2012/01/10934.html' target='_blank'>ëøê ðåñó á÷åøñ &quot;áèäåáï - îåøã åøåîðèé÷ï&quot; (10934)</a>
+<div class='newsBriefDate'>2012-01-15 14:21:00</div>
+	</li>
+
+</ul>
+
+</div>
+
+<div id="allnews">
+<div id="allnews_link">
+<a href="content/news.html"> ìøùéîä äîìàä</a>
+<!--a href="/content/news.html" target="_blank" title="ìøùéîú äòéãëåðéí äîìàä"-->
+</div>
+</div>
+</div>
+
+
+
+<div id="links_mid">
+<h1>ôòéìåéåú äîøëæ</h1>
+<div class="linklist">
+<a href="/content/about_shoham.html" target="_self" class="linklist_item" title="àåãåú ùä&quot;í">àåãåú ùä&quot;í</a><br>
+
+
+<a href="http://telem.openu.ac.il/content/about_shoham.html#organizational_structure" target="_self" class="linklist_item" title="îáðä àøâåðé">îáðä àøâåðé</a><!--&nbsp;<img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--> <br>
+
+
+<a href="/content/distance_edu.html" target="_self" class="linklist_item" title="äåøàä åìîéãä îøçå÷">äåøàä åìîéãä îøçå÷</a><br>
+<a href="/content/courses_sites.html" target="_self" class="linklist_item" title="àúøé ä÷åøñéí">àúøé ä÷åøñéí</a><br>
+
+
+<a href="http://telem.openu.ac.il/content/moodle_move.html" target="_self" class="linklist_item" title="ñáéáú ìîéãä çãùä áàå&quot;ô Moodle">ñáéáú ìîéãä çãùä áàå&quot;ô Moodle</a>&nbsp;<img src="graphics_nhp/star.gif" border="0" alt=""><br>
+
+<a href="/content/vid_learning.html" target="_self" class="linklist_item" title=" åéãàå áäåøàä ñéðëøåðéú ">åéãàå åäåøàä ñéðëøåðéú</a> <img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span><br>
+
+
+<a href="/content/virtual_class.html" target="_self" class="linklist_item" title=" ëéúä åéøèåàìéú - ìîéãä îäáéú ">ëéúä åéøèåàìéú - ìîéãä îäáéú</a> <!--<img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+
+<!--<a href="http://telem.openu.ac.il/content/elluminate.html" target="_self" class="linklist_item" title="ëéúä åéøèåàìéú - ðéñåé Elluminate">ëéúä åéøèåàìéú - ðéñåé Elluminate</a> --> 
+
+
+<a href="http://telem.openu.ac.il/content/video_classes.html" target="_self" class="linklist_item" title=" öéìåí îôâùé äðçéä áëéúåú">öéìåí îôâùé äðçéä áëéúåú</a><!-- <img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+
+
+<a href="/content/digital.html" target="_self" class="linklist_item" title="çåîøé ìîéãä àéðèøà÷èéáééí">çåîøé ìîéãä àéðèøà÷èéáééí</a> <!--<img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+<a href="/content/pedagogical_dev.html" target="_self" class="linklist_item" title="ôéúåç ôãâåâé, äèîòä åäãøëä">ôéúåç ôãâåâé, äèîòä åäãøëä</a><br>
+<a href="/content/tools.html" target="_self" class="linklist_item" title="ëìéí ìàéøâåï åðéäåì äìîéãä">ëìéí ìàéøâåï åðéäåì äìîéãä</a><br>
+<!--<a href="/content/future_project.html" target="_self" class="linklist_item" title="ðéñåééí åôøåé÷èéí îéåçãéí">  ðéñåééí åôøåé÷èéí îéåçãéí</a> &nbsp;--><!--<img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--> 
+
+<a href="http://telem.openu.ac.il/content/sadan.html" target="_self" class="linklist_item" title="ñã&quot;ï - ñôøéí ãéâéèàìééí ðééãéí">ñôøéí ãéâéèàìééí ðééãéí</a>&nbsp;<img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span><br>
+
+ 
+<a href="http://telem.openu.ac.il/content/audio_books.html" target="_self" class="linklist_item" title="ñôøéí ÷åìééí &ndash; òøåõ ìîéãä ðåñó">ñôøéí ÷åìééí – òøåõ ìîéãä ðåñó</a> <!--&nbsp;<img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new"> çãù --><br>
+
+ 
+
+<a href="/content/cooperative_learning.html" target="_self" class="linklist_item" title="ìîéãä ùéúåôéú">ìîéãä ùéúåôéú</a><br>
+<a href="http://wiki-openu.openu.ac.il/courses/wikiop" target="_blank" class="linklist_item" title="åé÷éàåô"><img src="graphics_nhp/wiki.gif" border="0" alt="åé÷éàåô">&nbsp;åé÷éàåô</a><br>
+</div>
+
+<br>
+<div class="linklist_em">
+<a href="http://telem.openu.ac.il/hp_files/paper/archive/index.html" target="_self" class="linklist_item" title="öìéì î÷ååï">öìéì î÷ååï - òìåï ùä&quot;í</a><!-- <img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br> 
+<a href="http://www.shoham-at-ou.blogspot.com/" target="_blank" class="linklist_item" title="áìåâ ùä&quot;í">áìåâ ùä&quot;í</a><br>
+<img src="graphics_nhp/twitter_icon_small.gif" border="0" alt="èååéèø" align="absbottom">&nbsp; <a href="http://twitter.com/shoham1" target="_blank" class="linklist_item" title="twitter">ò÷áå àçøéðå á-twitter </a><!--img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span--><br>
+<a href="content/articles.html" target="_self" class="linklist_item" title="îàîøéí åîöâåú îëðñéí">îç÷øé äòøëä, îàîøéí åîöâåú</a><!-- <img src="graphics_nhp/star_bg_gray.gif" border="0" alt="">&nbsp;<span class="new">çãù</span>--><br>
+<a href="content/lectures.html" target="_self" class="linklist_item" title="éîé òéåï">éîé òéåï áèëðåìåâéåú ìîéãä</a><!-- <img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span><br>-->
+</div>
+</div>
+
+
+
+
+<div id="links_left">
+
+<!--div class="linklist" id="linklist"-->
+<!--a href="http://telem.openu.ac.il/content/contact_us.html" class="linklist_item" title="öåø ÷ùø">öåø ÷ùø</a><br-->
+<!--a href="http://www-e.openu.ac.il/geninfor/136.html" target="_self" class="linklist_item" title="english">English</a><br><br-->
+<!--a href="http://ocw.openu.ac.il/" target="_blank" class="linklist_item_gif" title="ôà'ø"><img src="graphics_nhp/ocw.gif" border="0" alt="ôà'ø"></a><br-->
+<!--/div-->
+
+
+<h1>çåîøé ìéîåã ôúåçéí</h1>
+ <img src="graphics_nhp/logos8.jpg" width="170" border="1" usemap="#Map">
+ <map name="Map">
+  <area shape="rect" coords="2,68,81,106" href="http://goo.gl/4BPH" target="_blank" title="ñôøé äàå&quot;ô áâøñä àì÷èøåðéú">
+  <area shape="rect" coords="89,68,167,108" href="http://www.youtube.com/user/openofek" target="_blank" title="òøåõ YouTub  ùì äàå&quot;ô">
+  <area shape="rect" coords="90,112,168,154" href="http://www.kotar.co.il/" target="_blank" title="ñôøé äàå&quot;ô áñôøéä äî÷ååðú ùì îè&quot;ç">
+  <area shape="rect" coords="13,2,155,61" href="http://ocw.openu.ac.il/" target="_blank" alt="ñôøéí åçåîøé ìéîåã ôúåçéí ìëì"  title="ñôøéí åçåîøé ìéîåã ôúåçéí ìëì">
+  <area shape="rect" coords="2,113,81,154" onclick="tBox.objVisibility('iconmenu');" target="_blank" title="ñôøé äàå&quot;ô áâøñä ÷åìéú">
+
+</map>
+
+<div id="iconmenu" style="display: none; border: 1px solid gray; background-color: white; padding-right:2px; font-size:1.3em;    color:#336699;	padding-right:2px; ">
+<a href="http://goo.gl/kBQ1F" title="äøöàåú" target="_blank" class="linklist_item">äøöàåú</a><br>
+<a href="http://goo.gl/dywt" title="ñôøéí ÷åìééí" target="_blank"class="linklist_item">ñôøéí ÷åìééí</a>
+
+
+<div style="color: blue; cursor: pointer; text-align: center;" onclick="tBox.objVisibility('iconmenu', 0);">[x] ñâåø</div> 
+
+</div> 
+ 
+ 
+<br><br>
+<div class="linklist_em">
+ <a href="/content/opensources.html" target="_self" class="linklist_item" title="ìôéøåè àåãåú äòøåöéí äôúåçéí"> ìôéøåè àåãåú äòøåöéí äôúåçéí </a><!--img src="graphics_nhp/star.gif" border="0" alt="">&nbsp;<span class="new">çãù</span--><br>
+
+</div>
+<!--<div class="linklist_em">
+<a href="http://ocw.openu.ac.il/" target="_blank" class="linklist_item_gif" title="ôà'ø"><img src="graphics_nhp/ocw_s1_gray.gif" border="0" alt='ôà"ø - ôúéçú àåöøåú øåç'></a><br>
+<a href="http://www.kotar.co.il/" target="_blank" class="linklist_item" title='ñôøé äàå"ô áëåúø – îè"ç'> ñôøé äàå"ô áëåúø – îè"ç</a><br>
+<a href="http://goo.gl/4BPH" target="_blank" class="linklist_item" title='ñôøé äàå"ô google books'>   ñôøé äàå"ô   google books  </a> <br> 
+<a href="http://www.youtube.com/user/openofek" target="_blank" class="linklist_item" title=' YouTube  òøåõ äàå"ô'><img src="graphics_nhp/youtube_small.gif" alt="youtube" width="40" height="17" border="0" align="absbottom">&nbsp; òøåõ äàå"ô</a>
+<a href="http://www.icast.co.il/default.aspx?p=default&c_list=1&c=82" target="_blank" class="linklist_item" title='òøåõ äàå"ô á- iCast'>òøåõ äàå"ô á- iCast &nbsp;<!--img src="graphics_nhp/icast_logo.png" border="0" alt="youtube" align="absbottom"></a><br>-->
+
+<!--<a href="http://ocw.openu.ac.il/newsletter/01.html" target="_blank" class="linklist_item" title='àåöøåú - òìåï ôà"ø'>   àåöøåú - òìåï ôà"ø      </a> <br> -->
+
+<!--a href="content/presentations.html" target="_self" class="linklist_item" title="îöâåú áëðñéí">îöâåú áëðñéí</a><br>
+
+</div>-->
+<br>
+<h1>÷éùåøéí</h1>
+<div class="linklist" id="links">
+<a href="http://www.openu.ac.il/Library/" target="_blank" class="linklist_item" title="ñôøéä åîàâøé îéãò">ñôøéä åîàâøé îéãò</a><br>
+<a href="http://www.openu.ac.il/innovation/" target="_blank" class="linklist_item" title="äîøëæ ìç÷ø çãùðåú áèëðåìåâéåú ìîéãä">äîøëæ ìç÷ø çãùðåú áèëðåìåâéåú ìîéãä</a><br>
+<a href="http://meital.iucc.ac.il/" target="_blank" class="linklist_item" title="îøëæ éãò èëðåìåâéåú ìîéãä ">îéè&quot;ì</a><br>
+
+<!--<a href="http://wiki-openu.openu.ac.il/courses/wikiop" target="_blank" class="linklist_item" title=""><img src="graphics_nhp/oui_books_icon.jpg" alt="ñôøéí ãéâéèìéí" width="23" height="13" border="0">&nbsp;äñôøéí äãéâéèìéí áôééñáå÷</a><br>-->
+</div>
+
+
+<!-- share this button (start) 
+<span  class='st_sharethis' displayText='ShareThis' style="width: 100px; height: 100px;"></span>
+<script type="text/javascript">var switchTo5x=false;</script><script type="text/javascript" src="http://w.sharethis.com/button/buttons.js"></script><script type="text/javascript">stLight.options({publisher:'c009e98c-ad2e-4156-afda-95a59aca520c'});</script>
+ share this button (end) -->
+
+ 
+<!-- AddToAny BEGIN -->
+<a class="a2a_dd" href="http://www.addtoany.com/share_save"><img src="http://static.addtoany.com/buttons/share_save_171_16.png" width="171" height="16" border="0" alt="Share"/></a>
+<script type="text/javascript">
+var a2a_config = a2a_config || {};
+a2a_config.onclick = 1;
+a2a_config.locale = "he";
+a2a_config.num_services = 4;
+</script>
+<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
+<!-- AddToAny END -->
+
+<!-- google +1 (START) -->
+<script type="text/javascript" src="http://apis.google.com/js/plusone.js">
+  {lang: 'iw'}
+</script>
+<g:plusone size="small"></g:plusone>
+<!-- google +1 (START) -->
+
+
+</div>
+
+<!--end of links_zone-->
+</div>
+
+<!--end of left-->
+</div>
+
+<!--end of text-->
+</div>
+<div id="close">
+
+</div>
+
+<!--end of content-->
+</div>
+<div id="footer">
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1255" />
+<meta http-equiv="Content-Language" content="he" />
+
+<div id="footer1">
+
+<a href="http://telem.openu.ac.il/content/about_shoham.html" id="abouts" title="àåãåú" target="_blank">àåãåú</a><!--&nbsp;|-->
+<a href="http://telem.openu.ac.il/content/contact_us.html" id="conts" title="öåø ÷ùø" target="_blank">öåø ÷ùø</a><!--&nbsp;|-->
+<a href="/" id="hps" title="ãó äáéú" target="_self">ãó äáéú</a><!--&nbsp;|-->
+<a href="http://www.openu.ac.il/" id="opnets" title="àåôð'è" target="_self"><img src="http://telem.openu.ac.il/graphics_nhp/openu_icon.gif" border="0" alt="àåôðè" /></a><!--&nbsp;|--> 
+</div>
+
+<div id="footer2">
+<table id="copyRight" style="display: none;" align="center" width="180" cellspacing="0" cellpadding="1" border="0"  bgcolor="#000000">
+ <tr>
+  <td>
+   <table cellspacing="0" cellpadding="3" border="0" width="100%">
+	<tr>
+	 <td bgcolor="#FFFFFF">
+	<span id="open" style="cursor: pointer;" onclick="showHideLayer('copyRight', '', '');">[ñâåø]</span>
+	 </td>
+	</tr>
+    <tr>
+	 <td bgcolor="#FFFFFF">
+   <center><b>ùéîåù îñçøé áçåîø äëìåì áàúøéí àìä àñåø áäçìè, àìà áøùåú îôåøùú åáëúá îîãåø æëåéåú éåöøéí ùì äàå'ô <BR /></b>
+   </center>
+     </td>
+	</tr>
+   </table>
+  </td>
+ </tr>
+</table>
+
+Copyright &copy;,The Open University of Israel 1997-2012 <b style="cursor: pointer;" onclick="showHideLayer('copyRight', '', '');">all rights reserved<br />
+ëì äæëåéåú ùîåøåú	</b>&copy; ìàåðéáøñéèä äôúåçä. úùò"á - 2012
+</div>
+
+<!--include virtual="/include/general/footer_source_popup_shoham_logical.htm"  -->   
+<!--include virtual="/include/general/footer_code_popup_shoham_logical.html"  -->
+
+
+<!-- GOOGLE ANALYTICS (TELEM ONLY) START -->
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-4646503-5");
+//pageTracker._initData();
+pageTracker._trackPageview();
+</script>
+<!-- GOOGLE ANALYTICS (TELEM ONLY) END -->
+
+
+</div>
+<!--end of container-->
+</div>
+
+
+
+</body>
+</html>
+
+
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.txt b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.txt
new file mode 100644
index 0000000000..ef904ced9e
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/cp1255.txt
@@ -0,0 +1 @@
+ãó
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html.go
new file mode 100644
index 0000000000..b438d37341
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html.go
@@ -0,0 +1,104 @@
+// extension to goproxy that will allow you to easily filter web browser related content.
+package goproxy_html
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"strings"
+
+	"code.google.com/p/go-charset/charset"
+	_ "code.google.com/p/go-charset/data"
+	"github.com/elazarl/goproxy"
+)
+
+var IsHtml goproxy.RespCondition = goproxy.ContentTypeIs("text/html")
+
+var IsCss goproxy.RespCondition = goproxy.ContentTypeIs("text/css")
+
+var IsJavaScript goproxy.RespCondition = goproxy.ContentTypeIs("text/javascript",
+	"application/javascript")
+
+var IsJson goproxy.RespCondition = goproxy.ContentTypeIs("text/json")
+
+var IsXml goproxy.RespCondition = goproxy.ContentTypeIs("text/xml")
+
+var IsWebRelatedText goproxy.RespCondition = goproxy.ContentTypeIs("text/html",
+	"text/css",
+	"text/javascript", "application/javascript",
+	"text/xml",
+	"text/json")
+
+// HandleString will receive a function that filters a string, and will convert the
+// request body to a utf8 string, according to the charset specified in the Content-Type
+// header.
+// guessing Html charset encoding from the <META> tags is not yet implemented.
+func HandleString(f func(s string, ctx *goproxy.ProxyCtx) string) goproxy.RespHandler {
+	return HandleStringReader(func(r io.Reader, ctx *goproxy.ProxyCtx) io.Reader {
+		b, err := ioutil.ReadAll(r)
+		if err != nil {
+			ctx.Warnf("Cannot read string from resp body: %v", err)
+			return r
+		}
+		return bytes.NewBufferString(f(string(b), ctx))
+	})
+}
+
+// Will receive an input stream which would convert the response to utf-8
+// The given function must close the reader r, in order to close the response body.
+func HandleStringReader(f func(r io.Reader, ctx *goproxy.ProxyCtx) io.Reader) goproxy.RespHandler {
+	return goproxy.FuncRespHandler(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		if ctx.Error != nil {
+			return nil
+		}
+		charsetName := ctx.Charset()
+		if charsetName == "" {
+			charsetName = "utf-8"
+		}
+
+		if strings.ToLower(charsetName) != "utf-8" {
+			r, err := charset.NewReader(charsetName, resp.Body)
+			if err != nil {
+				ctx.Warnf("Cannot convert from %v to utf-8: %v", charsetName, err)
+				return resp
+			}
+			tr, err := charset.TranslatorTo(charsetName)
+			if err != nil {
+				ctx.Warnf("Can't translate to %v from utf-8: %v", charsetName, err)
+				return resp
+			}
+			if err != nil {
+				ctx.Warnf("Cannot translate to %v: %v", charsetName, err)
+				return resp
+			}
+			newr := charset.NewTranslatingReader(f(r, ctx), tr)
+			resp.Body = &readFirstCloseBoth{ioutil.NopCloser(newr), resp.Body}
+		} else {
+			//no translation is needed, already at utf-8
+			resp.Body = &readFirstCloseBoth{ioutil.NopCloser(f(resp.Body, ctx)), resp.Body}
+		}
+		return resp
+	})
+}
+
+type readFirstCloseBoth struct {
+	r io.ReadCloser
+	c io.Closer
+}
+
+func (rfcb *readFirstCloseBoth) Read(b []byte) (nr int, err error) {
+	return rfcb.r.Read(b)
+}
+func (rfcb *readFirstCloseBoth) Close() error {
+	err1 := rfcb.r.Close()
+	err2 := rfcb.c.Close()
+	if err1 != nil && err2 != nil {
+		return errors.New(err1.Error() + ", " + err2.Error())
+	}
+	if err1 != nil {
+		return err1
+	}
+	return err2
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html_test.go
new file mode 100644
index 0000000000..9c876f7522
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/html/html_test.go
@@ -0,0 +1,60 @@
+package goproxy_html_test
+
+import (
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/html"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+)
+
+type ConstantServer int
+
+func (s ConstantServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "text/plain; charset=iso-8859-8")
+	//w.Header().Set("Content-Type","text/plain; charset=cp-1255")
+	w.Write([]byte{0xe3, 0xf3})
+}
+
+func TestCharset(t *testing.T) {
+	s := httptest.NewServer(ConstantServer(1))
+	defer s.Close()
+
+	ch := make(chan string, 2)
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse().Do(goproxy_html.HandleString(
+		func(s string, ctx *goproxy.ProxyCtx) string {
+			ch <- s
+			return s
+		}))
+	proxyServer := httptest.NewServer(proxy)
+	defer proxyServer.Close()
+
+	proxyUrl, _ := url.Parse(proxyServer.URL)
+	client := &http.Client{Transport: &http.Transport{Proxy: http.ProxyURL(proxyUrl)}}
+
+	resp, err := client.Get(s.URL + "/cp1255.txt")
+	if err != nil {
+		t.Fatal("GET:", err)
+	}
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatal("readAll:", err)
+	}
+	resp.Body.Close()
+
+	inHandleString := ""
+	select {
+	case inHandleString = <-ch:
+	default:
+	}
+
+	if len(b) != 2 || b[0] != 0xe3 || b[1] != 0xf3 {
+		t.Error("Did not translate back to 0xe3,0xf3, instead", b)
+	}
+	if inHandleString != "דף" {
+		t.Error("HandleString did not convert DALET & PEH SOFIT (דף) from ISO-8859-8 to utf-8, got", []byte(inHandleString))
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/image/image.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/image/image.go
new file mode 100644
index 0000000000..3dc26ff374
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/ext/image/image.go
@@ -0,0 +1,78 @@
+package goproxy_image
+
+import (
+	"bytes"
+	"image"
+	_ "image/gif"
+	"image/jpeg"
+	"image/png"
+	"io/ioutil"
+	"net/http"
+	. "github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/regretable"
+)
+
+var RespIsImage = ContentTypeIs("image/gif",
+	"image/jpeg",
+	"image/pjpeg",
+	"application/octet-stream",
+	"image/png")
+
+// "image/tiff" tiff support is in external package, and rarely used, so we omitted it
+
+func HandleImage(f func(img image.Image, ctx *ProxyCtx) image.Image) RespHandler {
+	return FuncRespHandler(func(resp *http.Response, ctx *ProxyCtx) *http.Response {
+		if !RespIsImage.HandleResp(resp, ctx) {
+			return resp
+		}
+		if resp.StatusCode != 200 {
+			// we might get 304 - not modified response without data
+			return resp
+		}
+		contentType := resp.Header.Get("Content-Type")
+
+		const kb = 1024
+		regret := regretable.NewRegretableReaderCloserSize(resp.Body, 16*kb)
+		resp.Body = regret
+		img, imgType, err := image.Decode(resp.Body)
+		if err != nil {
+			regret.Regret()
+			ctx.Warnf("%s: %s", ctx.Req.Method+" "+ctx.Req.URL.String()+" Image from "+ctx.Req.RequestURI+"content type"+
+				contentType+"cannot be decoded returning original image", err)
+			return resp
+		}
+		result := f(img, ctx)
+		buf := bytes.NewBuffer([]byte{})
+		switch contentType {
+		// No gif image encoder in go - convert to png
+		case "image/gif", "image/png":
+			if err := png.Encode(buf, result); err != nil {
+				ctx.Warnf("Cannot encode image, returning orig %v %v", ctx.Req.URL.String(), err)
+				return resp
+			}
+			resp.Header.Set("Content-Type", "image/png")
+		case "image/jpeg", "image/pjpeg":
+			if err := jpeg.Encode(buf, result, nil); err != nil {
+				ctx.Warnf("Cannot encode image, returning orig %v %v", ctx.Req.URL.String(), err)
+				return resp
+			}
+		case "application/octet-stream":
+			switch imgType {
+			case "jpeg":
+				if err := jpeg.Encode(buf, result, nil); err != nil {
+					ctx.Warnf("Cannot encode image as jpeg, returning orig %v %v", ctx.Req.URL.String(), err)
+					return resp
+				}
+			case "png", "gif":
+				if err := png.Encode(buf, result); err != nil {
+					ctx.Warnf("Cannot encode image as png, returning orig %v %v", ctx.Req.URL.String(), err)
+					return resp
+				}
+			}
+		default:
+			panic("unhandlable type" + contentType)
+		}
+		resp.Body = ioutil.NopCloser(buf)
+		return resp
+	})
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/https.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/https.go
new file mode 100644
index 0000000000..2ff4d6a7b8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/https.go
@@ -0,0 +1,366 @@
+package goproxy
+
+import (
+	"bufio"
+	"crypto/tls"
+	"errors"
+	"io"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"sync/atomic"
+)
+
+type ConnectActionLiteral int
+
+const (
+	ConnectAccept = iota
+	ConnectReject
+	ConnectMitm
+	ConnectHijack
+	ConnectHTTPMitm
+)
+
+var (
+	OkConnect       = &ConnectAction{Action: ConnectAccept, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
+	MitmConnect     = &ConnectAction{Action: ConnectMitm, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
+	HTTPMitmConnect = &ConnectAction{Action: ConnectHTTPMitm, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
+	RejectConnect   = &ConnectAction{Action: ConnectReject, TLSConfig: TLSConfigFromCA(&GoproxyCa)}
+)
+
+type ConnectAction struct {
+	Action    ConnectActionLiteral
+	Hijack    func(req *http.Request, client net.Conn, ctx *ProxyCtx)
+	TLSConfig func(host string, ctx *ProxyCtx) (*tls.Config, error)
+}
+
+func stripPort(s string) string {
+	ix := strings.IndexRune(s, ':')
+	if ix == -1 {
+		return s
+	}
+	return s[:ix]
+}
+
+func (proxy *ProxyHttpServer) dial(network, addr string) (c net.Conn, err error) {
+	if proxy.Tr.Dial != nil {
+		return proxy.Tr.Dial(network, addr)
+	}
+	return net.Dial(network, addr)
+}
+
+func (proxy *ProxyHttpServer) connectDial(network, addr string) (c net.Conn, err error) {
+	if proxy.ConnectDial == nil {
+		return proxy.dial(network, addr)
+	}
+	return proxy.ConnectDial(network, addr)
+}
+
+func (proxy *ProxyHttpServer) handleHttps(w http.ResponseWriter, r *http.Request) {
+	ctx := &ProxyCtx{Req: r, Session: atomic.AddInt64(&proxy.sess, 1), proxy: proxy}
+
+	hij, ok := w.(http.Hijacker)
+	if !ok {
+		panic("httpserver does not support hijacking")
+	}
+
+	proxyClient, _, e := hij.Hijack()
+	if e != nil {
+		panic("Cannot hijack connection " + e.Error())
+	}
+
+	ctx.Logf("Running %d CONNECT handlers", len(proxy.httpsHandlers))
+	todo, host := OkConnect, r.URL.Host
+	for i, h := range proxy.httpsHandlers {
+		newtodo, newhost := h.HandleConnect(host, ctx)
+
+		// If found a result, break the loop immediately
+		if newtodo != nil {
+			todo, host = newtodo, newhost
+			ctx.Logf("on %dth handler: %v %s", i, todo, host)
+			break
+		}
+	}
+	switch todo.Action {
+	case ConnectAccept:
+		if !hasPort.MatchString(host) {
+			host += ":80"
+		}
+		targetSiteCon, err := proxy.connectDial("tcp", host)
+		if err != nil {
+			httpError(proxyClient, ctx, err)
+			return
+		}
+		ctx.Logf("Accepting CONNECT to %s", host)
+		proxyClient.Write([]byte("HTTP/1.0 200 OK\r\n\r\n"))
+		go copyAndClose(ctx, targetSiteCon, proxyClient)
+		go copyAndClose(ctx, proxyClient, targetSiteCon)
+	case ConnectHijack:
+		ctx.Logf("Hijacking CONNECT to %s", host)
+		proxyClient.Write([]byte("HTTP/1.0 200 OK\r\n\r\n"))
+		todo.Hijack(r, proxyClient, ctx)
+	case ConnectHTTPMitm:
+		proxyClient.Write([]byte("HTTP/1.0 200 OK\r\n\r\n"))
+		ctx.Logf("Assuming CONNECT is plain HTTP tunneling, mitm proxying it")
+		targetSiteCon, err := proxy.connectDial("tcp", host)
+		if err != nil {
+			ctx.Warnf("Error dialing to %s: %s", host, err.Error())
+			return
+		}
+		for {
+			client := bufio.NewReader(proxyClient)
+			remote := bufio.NewReader(targetSiteCon)
+			req, err := http.ReadRequest(client)
+			if err != nil && err != io.EOF {
+				ctx.Warnf("cannot read request of MITM HTTP client: %+#v", err)
+			}
+			if err != nil {
+				return
+			}
+			req, resp := proxy.filterRequest(req, ctx)
+			if resp == nil {
+				if err := req.Write(targetSiteCon); err != nil {
+					httpError(proxyClient, ctx, err)
+					return
+				}
+				resp, err = http.ReadResponse(remote, req)
+				if err != nil {
+					httpError(proxyClient, ctx, err)
+					return
+				}
+			}
+			resp = proxy.filterResponse(resp, ctx)
+			if err := resp.Write(proxyClient); err != nil {
+				httpError(proxyClient, ctx, err)
+				return
+			}
+		}
+	case ConnectMitm:
+		proxyClient.Write([]byte("HTTP/1.0 200 OK\r\n\r\n"))
+		ctx.Logf("Assuming CONNECT is TLS, mitm proxying it")
+		// this goes in a separate goroutine, so that the net/http server won't think we're
+		// still handling the request even after hijacking the connection. Those HTTP CONNECT
+		// request can take forever, and the server will be stuck when "closed".
+		// TODO: Allow Server.Close() mechanism to shut down this connection as nicely as possible
+		tlsConfig := defaultTLSConfig
+		if todo.TLSConfig != nil {
+			var err error
+			tlsConfig, err = todo.TLSConfig(host, ctx)
+			if err != nil {
+				httpError(proxyClient, ctx, err)
+				return
+			}
+		}
+		go func() {
+			//TODO: cache connections to the remote website
+			rawClientTls := tls.Server(proxyClient, tlsConfig)
+			if err := rawClientTls.Handshake(); err != nil {
+				ctx.Warnf("Cannot handshake client %v %v", r.Host, err)
+				return
+			}
+			defer rawClientTls.Close()
+			clientTlsReader := bufio.NewReader(rawClientTls)
+			for !isEof(clientTlsReader) {
+				req, err := http.ReadRequest(clientTlsReader)
+				if err != nil && err != io.EOF {
+					return
+				}
+				if err != nil {
+					ctx.Warnf("Cannot read TLS request from mitm'd client %v %v", r.Host, err)
+					return
+				}
+				req.RemoteAddr = r.RemoteAddr // since we're converting the request, need to carry over the original connecting IP as well
+				ctx.Logf("req %v", r.Host)
+				req.URL, err = url.Parse("https://" + r.Host + req.URL.String())
+
+				// Bug fix which goproxy fails to provide request
+				// information URL in the context when does HTTPS MITM
+				ctx.Req = req
+
+				req, resp := proxy.filterRequest(req, ctx)
+				if resp == nil {
+					if err != nil {
+						ctx.Warnf("Illegal URL %s", "https://"+r.Host+req.URL.Path)
+						return
+					}
+					removeProxyHeaders(ctx, req)
+					resp, err = ctx.RoundTrip(req)
+					if err != nil {
+						ctx.Warnf("Cannot read TLS response from mitm'd server %v", err)
+						return
+					}
+					ctx.Logf("resp %v", resp.Status)
+				}
+				resp = proxy.filterResponse(resp, ctx)
+				text := resp.Status
+				statusCode := strconv.Itoa(resp.StatusCode) + " "
+				if strings.HasPrefix(text, statusCode) {
+					text = text[len(statusCode):]
+				}
+				// always use 1.1 to support chunked encoding
+				if _, err := io.WriteString(rawClientTls, "HTTP/1.1"+" "+statusCode+text+"\r\n"); err != nil {
+					ctx.Warnf("Cannot write TLS response HTTP status from mitm'd client: %v", err)
+					return
+				}
+				// Since we don't know the length of resp, return chunked encoded response
+				// TODO: use a more reasonable scheme
+				resp.Header.Del("Content-Length")
+				resp.Header.Set("Transfer-Encoding", "chunked")
+				if err := resp.Header.Write(rawClientTls); err != nil {
+					ctx.Warnf("Cannot write TLS response header from mitm'd client: %v", err)
+					return
+				}
+				if _, err = io.WriteString(rawClientTls, "\r\n"); err != nil {
+					ctx.Warnf("Cannot write TLS response header end from mitm'd client: %v", err)
+					return
+				}
+				chunked := newChunkedWriter(rawClientTls)
+				if _, err := io.Copy(chunked, resp.Body); err != nil {
+					ctx.Warnf("Cannot write TLS response body from mitm'd client: %v", err)
+					return
+				}
+				if err := chunked.Close(); err != nil {
+					ctx.Warnf("Cannot write TLS chunked EOF from mitm'd client: %v", err)
+					return
+				}
+				if _, err = io.WriteString(rawClientTls, "\r\n"); err != nil {
+					ctx.Warnf("Cannot write TLS response chunked trailer from mitm'd client: %v", err)
+					return
+				}
+			}
+			ctx.Logf("Exiting on EOF")
+		}()
+	case ConnectReject:
+		if ctx.Resp != nil {
+			if err := ctx.Resp.Write(proxyClient); err != nil {
+				ctx.Warnf("Cannot write response that reject http CONNECT: %v", err)
+			}
+		}
+		proxyClient.Close()
+	}
+}
+
+func httpError(w io.WriteCloser, ctx *ProxyCtx, err error) {
+	if _, err := io.WriteString(w, "HTTP/1.1 502 Bad Gateway\r\n\r\n"); err != nil {
+		ctx.Warnf("Error responding to client: %s", err)
+	}
+	if err := w.Close(); err != nil {
+		ctx.Warnf("Error closing client connection: %s", err)
+	}
+}
+
+func copyAndClose(ctx *ProxyCtx, w, r net.Conn) {
+	connOk := true
+	if _, err := io.Copy(w, r); err != nil {
+		connOk = false
+		ctx.Warnf("Error copying to client: %s", err)
+	}
+	if err := r.Close(); err != nil && connOk {
+		ctx.Warnf("Error closing: %s", err)
+	}
+}
+
+func dialerFromEnv(proxy *ProxyHttpServer) func(network, addr string) (net.Conn, error) {
+	https_proxy := os.Getenv("HTTPS_PROXY")
+	if https_proxy == "" {
+		https_proxy = os.Getenv("https_proxy")
+	}
+	if https_proxy == "" {
+		return nil
+	}
+	return proxy.NewConnectDialToProxy(https_proxy)
+}
+
+func (proxy *ProxyHttpServer) NewConnectDialToProxy(https_proxy string) func(network, addr string) (net.Conn, error) {
+	u, err := url.Parse(https_proxy)
+	if err != nil {
+		return nil
+	}
+	if u.Scheme == "" || u.Scheme == "http" {
+		if strings.IndexRune(u.Host, ':') == -1 {
+			u.Host += ":80"
+		}
+		return func(network, addr string) (net.Conn, error) {
+			connectReq := &http.Request{
+				Method: "CONNECT",
+				URL:    &url.URL{Opaque: addr},
+				Host:   addr,
+				Header: make(http.Header),
+			}
+			c, err := proxy.dial(network, u.Host)
+			if err != nil {
+				return nil, err
+			}
+			connectReq.Write(c)
+			// Read response.
+			// Okay to use and discard buffered reader here, because
+			// TLS server will not speak until spoken to.
+			br := bufio.NewReader(c)
+			resp, err := http.ReadResponse(br, connectReq)
+			if err != nil {
+				c.Close()
+				return nil, err
+			}
+			if resp.StatusCode != 200 {
+				resp, _ := ioutil.ReadAll(resp.Body)
+				c.Close()
+				return nil, errors.New("proxy refused connection" + string(resp))
+			}
+			return c, nil
+		}
+	}
+	if u.Scheme == "https" {
+		if strings.IndexRune(u.Host, ':') == -1 {
+			u.Host += ":443"
+		}
+		return func(network, addr string) (net.Conn, error) {
+			c, err := proxy.dial(network, u.Host)
+			if err != nil {
+				return nil, err
+			}
+			c = tls.Client(c, proxy.Tr.TLSClientConfig)
+			connectReq := &http.Request{
+				Method: "CONNECT",
+				URL:    &url.URL{Opaque: addr},
+				Host:   addr,
+				Header: make(http.Header),
+			}
+			connectReq.Write(c)
+			// Read response.
+			// Okay to use and discard buffered reader here, because
+			// TLS server will not speak until spoken to.
+			br := bufio.NewReader(c)
+			resp, err := http.ReadResponse(br, connectReq)
+			if err != nil {
+				c.Close()
+				return nil, err
+			}
+			if resp.StatusCode != 200 {
+				body, _ := ioutil.ReadAll(io.LimitReader(resp.Body, 500))
+				resp.Body.Close()
+				c.Close()
+				return nil, errors.New("proxy refused connection" + string(body))
+			}
+			return c, nil
+		}
+	}
+	return nil
+}
+
+func TLSConfigFromCA(ca *tls.Certificate) func(host string, ctx *ProxyCtx) (*tls.Config, error) {
+	return func(host string, ctx *ProxyCtx) (*tls.Config, error) {
+		config := *defaultTLSConfig
+		ctx.Logf("signing for %s", stripPort(host))
+		cert, err := signHost(*ca, []string{stripPort(host)})
+		if err != nil {
+			ctx.Warnf("Cannot sign host certificate with provided CA: %s", err)
+			return nil, err
+		}
+		config.Certificates = append(config.Certificates, cert)
+		return &config, nil
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/key.pem b/Godeps/_workspace/src/github.com/elazarl/goproxy/key.pem
new file mode 100644
index 0000000000..2438b37603
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/P0FsJomPGzvdO9yreV4/faEAZ6tDVGC+VnrxnidmahUd+X7Y
+2v+bR2Zb4Z05+lNyz8rN8mNgav/zjHnbh+K5HwZ1nQc61cnPIXmx6hadsEi7KvU9
+sSmBGEZAyqo5S6NgTF4tt80c8ignxdnVXPK/djGNuaNYD5L+4570da0NswIDAQAB
+AoGBALzIv1b4D7ARTR3NOr6V9wArjiOtMjUrdLhO+9vIp9IEA8ZsA9gjDlCEwbkP
+VDnoLjnWfraff5Os6+3JjHy1fYpUiCdnk2XA6iJSL1XWKQZPt3wOunxP4lalDgED
+QTRReFbA/y/Z4kSfTXpVj68ytcvSRW/N7q5/qRtbN9804jpBAkEA0s6lvH2btSLA
+mcEdwhs7zAslLbdld7rvfUeP82gPPk0S6yUqTNyikqshM9AwAktHY7WvYdKl+ghZ
+HTxKVC4DoQJBAOg/IAW5RbXknP+Lf7AVtBgw3E+Yfa3mcdLySe8hjxxyZq825Zmu
+Rt5Qj4Lw6ifSFNy4kiiSpE/ZCukYvUXGENMCQFkPxSWlS6tzSzuqQxBGwTSrYMG3
+wb6b06JyIXcMd6Qym9OMmBpw/J5KfnSNeDr/4uFVWQtTG5xO+pdHaX+3EQECQQDl
+qcbY4iX1gWVfr2tNjajSYz751yoxVbkpiT9joiQLVXYFvpu+JYEfRzsjmWl0h2Lq
+AftG8/xYmaEYcMZ6wSrRAkBUwiom98/8wZVlB6qbwhU1EKDFANvICGSWMIhPx3v7
+MJqTIj4uJhte2/uyVvZ6DC6noWYgy+kLgqG0S97tUEG8
+-----END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy.go
new file mode 100644
index 0000000000..e4ed0600ce
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy.go
@@ -0,0 +1,162 @@
+package goproxy
+
+import (
+	"bufio"
+	"io"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"regexp"
+	"sync/atomic"
+)
+
+// The basic proxy type. Implements http.Handler.
+type ProxyHttpServer struct {
+	// session variable must be aligned in i386
+	// see http://golang.org/src/pkg/sync/atomic/doc.go#L41
+	sess int64
+	// setting Verbose to true will log information on each request sent to the proxy
+	Verbose         bool
+	Logger          *log.Logger
+	NonproxyHandler http.Handler
+	reqHandlers     []ReqHandler
+	respHandlers    []RespHandler
+	httpsHandlers   []HttpsHandler
+	Tr              *http.Transport
+	// ConnectDial will be used to create TCP connections for CONNECT requests
+	// if nil Tr.Dial will be used
+	ConnectDial func(network string, addr string) (net.Conn, error)
+}
+
+var hasPort = regexp.MustCompile(`:\d+$`)
+
+func copyHeaders(dst, src http.Header) {
+	for k, _ := range dst {
+		dst.Del(k)
+	}
+	for k, vs := range src {
+		for _, v := range vs {
+			dst.Add(k, v)
+		}
+	}
+}
+
+func isEof(r *bufio.Reader) bool {
+	_, err := r.Peek(1)
+	if err == io.EOF {
+		return true
+	}
+	return false
+}
+
+func (proxy *ProxyHttpServer) filterRequest(r *http.Request, ctx *ProxyCtx) (req *http.Request, resp *http.Response) {
+	req = r
+	for _, h := range proxy.reqHandlers {
+		req, resp = h.Handle(r, ctx)
+		// non-nil resp means the handler decided to skip sending the request
+		// and return canned response instead.
+		if resp != nil {
+			break
+		}
+	}
+	return
+}
+func (proxy *ProxyHttpServer) filterResponse(respOrig *http.Response, ctx *ProxyCtx) (resp *http.Response) {
+	resp = respOrig
+	for _, h := range proxy.respHandlers {
+		ctx.Resp = resp
+		resp = h.Handle(resp, ctx)
+	}
+	return
+}
+
+func removeProxyHeaders(ctx *ProxyCtx, r *http.Request) {
+	r.RequestURI = "" // this must be reset when serving a request with the client
+	ctx.Logf("Sending request %v %v", r.Method, r.URL.String())
+	// If no Accept-Encoding header exists, Transport will add the headers it can accept
+	// and would wrap the response body with the relevant reader.
+	r.Header.Del("Accept-Encoding")
+	// curl can add that, see
+	// http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/web-proxy-connection-header.html
+	r.Header.Del("Proxy-Connection")
+	r.Header.Del("Proxy-Authenticate")
+	r.Header.Del("Proxy-Authorization")
+	// Connection, Authenticate and Authorization are single hop Header:
+	// http://www.w3.org/Protocols/rfc2616/rfc2616.txt
+	// 14.10 Connection
+	//   The Connection general-header field allows the sender to specify
+	//   options that are desired for that particular connection and MUST NOT
+	//   be communicated by proxies over further connections.
+	r.Header.Del("Connection")
+}
+
+// Standard net/http function. Shouldn't be used directly, http.Serve will use it.
+func (proxy *ProxyHttpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	//r.Header["X-Forwarded-For"] = w.RemoteAddr()
+	if r.Method == "CONNECT" {
+		proxy.handleHttps(w, r)
+	} else {
+		ctx := &ProxyCtx{Req: r, Session: atomic.AddInt64(&proxy.sess, 1), proxy: proxy}
+
+		var err error
+		ctx.Logf("Got request %v %v %v %v", r.URL.Path, r.Host, r.Method, r.URL.String())
+		if !r.URL.IsAbs() {
+			proxy.NonproxyHandler.ServeHTTP(w, r)
+			return
+		}
+		r, resp := proxy.filterRequest(r, ctx)
+
+		if resp == nil {
+			removeProxyHeaders(ctx, r)
+			resp, err = ctx.RoundTrip(r)
+			if err != nil {
+				ctx.Error = err
+				resp = proxy.filterResponse(nil, ctx)
+				if resp == nil {
+					ctx.Logf("error read response %v %v:", r.URL.Host, err.Error())
+					http.Error(w, err.Error(), 500)
+					return
+				}
+			}
+			ctx.Logf("Received response %v", resp.Status)
+		}
+		origBody := resp.Body
+		resp = proxy.filterResponse(resp, ctx)
+
+		ctx.Logf("Copying response to client %v [%d]", resp.Status, resp.StatusCode)
+		// http.ResponseWriter will take care of filling the correct response length
+		// Setting it now, might impose wrong value, contradicting the actual new
+		// body the user returned.
+		// We keep the original body to remove the header only if things changed.
+		// This will prevent problems with HEAD requests where there's no body, yet,
+		// the Content-Length header should be set.
+		if origBody != resp.Body {
+			resp.Header.Del("Content-Length")
+		}
+		copyHeaders(w.Header(), resp.Header)
+		w.WriteHeader(resp.StatusCode)
+		nr, err := io.Copy(w, resp.Body)
+		if err := resp.Body.Close(); err != nil {
+			ctx.Warnf("Can't close response body %v", err)
+		}
+		ctx.Logf("Copied %v bytes to client error=%v", nr, err)
+	}
+}
+
+// New proxy server, logs to StdErr by default
+func NewProxyHttpServer() *ProxyHttpServer {
+	proxy := ProxyHttpServer{
+		Logger:        log.New(os.Stderr, "", log.LstdFlags),
+		reqHandlers:   []ReqHandler{},
+		respHandlers:  []RespHandler{},
+		httpsHandlers: []HttpsHandler{},
+		NonproxyHandler: http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			http.Error(w, "This is a proxy server. Does not respond to non-proxy requests.", 500)
+		}),
+		Tr: &http.Transport{TLSClientConfig: tlsClientSkipVerify,
+			Proxy: http.ProxyFromEnvironment},
+	}
+	proxy.ConnectDial = dialerFromEnv(&proxy)
+	return &proxy
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy_test.go
new file mode 100644
index 0000000000..8b147cfd04
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/proxy_test.go
@@ -0,0 +1,767 @@
+package goproxy_test
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/base64"
+	"image"
+	"io"
+	"io/ioutil"
+	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/image"
+)
+
+var acceptAllCerts = &tls.Config{InsecureSkipVerify: true}
+
+var noProxyClient = &http.Client{Transport: &http.Transport{TLSClientConfig: acceptAllCerts}}
+
+var https = httptest.NewTLSServer(nil)
+var srv = httptest.NewServer(nil)
+var fs = httptest.NewServer(http.FileServer(http.Dir(".")))
+
+type QueryHandler struct{}
+
+func (QueryHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	if err := req.ParseForm(); err != nil {
+		panic(err)
+	}
+	io.WriteString(w, req.Form.Get("result"))
+}
+
+func init() {
+	http.DefaultServeMux.Handle("/bobo", ConstantHanlder("bobo"))
+	http.DefaultServeMux.Handle("/query", QueryHandler{})
+}
+
+type ConstantHanlder string
+
+func (h ConstantHanlder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	io.WriteString(w, string(h))
+}
+
+func get(url string, client *http.Client) ([]byte, error) {
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	txt, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+	if err != nil {
+		return nil, err
+	}
+	return txt, nil
+}
+
+func getOrFail(url string, client *http.Client, t *testing.T) []byte {
+	txt, err := get(url, client)
+	if err != nil {
+		t.Fatal("Can't fetch url", url, err)
+	}
+	return txt
+}
+
+func localFile(url string) string { return fs.URL + "/" + url }
+func localTls(url string) string  { return https.URL + url }
+
+func TestSimpleHttpReqWithProxy(t *testing.T) {
+	client, s := oneShotProxy(goproxy.NewProxyHttpServer(), t)
+	defer s.Close()
+
+	if r := string(getOrFail(srv.URL+"/bobo", client, t)); r != "bobo" {
+		t.Error("proxy server does not serve constant handlers", r)
+	}
+	if r := string(getOrFail(srv.URL+"/bobo", client, t)); r != "bobo" {
+		t.Error("proxy server does not serve constant handlers", r)
+	}
+
+	if string(getOrFail(https.URL+"/bobo", client, t)) != "bobo" {
+		t.Error("TLS server does not serve constant handlers, when proxy is used")
+	}
+}
+
+func oneShotProxy(proxy *goproxy.ProxyHttpServer, t *testing.T) (client *http.Client, s *httptest.Server) {
+	s = httptest.NewServer(proxy)
+
+	proxyUrl, _ := url.Parse(s.URL)
+	tr := &http.Transport{TLSClientConfig: acceptAllCerts, Proxy: http.ProxyURL(proxyUrl)}
+	client = &http.Client{Transport: tr}
+	return
+}
+
+func TestSimpleHook(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(goproxy.SrcIpIs("127.0.0.1")).DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		req.URL.Path = "/bobo"
+		return req, nil
+	})
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if result := string(getOrFail(srv.URL+("/momo"), client, t)); result != "bobo" {
+		t.Error("Redirecting all requests from 127.0.0.1 to bobo, didn't work." +
+			" (Might break if Go's client sets RemoteAddr to IPv6 address). Got: " +
+			result)
+	}
+}
+
+func TestAlwaysHook(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		req.URL.Path = "/bobo"
+		return req, nil
+	})
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if result := string(getOrFail(srv.URL+("/momo"), client, t)); result != "bobo" {
+		t.Error("Redirecting all requests from 127.0.0.1 to bobo, didn't work." +
+			" (Might break if Go's client sets RemoteAddr to IPv6 address). Got: " +
+			result)
+	}
+}
+
+func TestReplaceResponse(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse().DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		resp.StatusCode = http.StatusOK
+		resp.Body = ioutil.NopCloser(bytes.NewBufferString("chico"))
+		return resp
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if result := string(getOrFail(srv.URL+("/momo"), client, t)); result != "chico" {
+		t.Error("hooked response, should be chico, instead:", result)
+	}
+}
+
+func TestReplaceReponseForUrl(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse(goproxy.UrlIs("/koko")).DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		resp.StatusCode = http.StatusOK
+		resp.Body = ioutil.NopCloser(bytes.NewBufferString("chico"))
+		return resp
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if result := string(getOrFail(srv.URL+("/koko"), client, t)); result != "chico" {
+		t.Error("hooked 'koko', should be chico, instead:", result)
+	}
+	if result := string(getOrFail(srv.URL+("/bobo"), client, t)); result != "bobo" {
+		t.Error("still, bobo should stay as usual, instead:", result)
+	}
+}
+
+func TestOneShotFileServer(t *testing.T) {
+	client, l := oneShotProxy(goproxy.NewProxyHttpServer(), t)
+	defer l.Close()
+
+	file := "test_data/panda.png"
+	info, err := os.Stat(file)
+	if err != nil {
+		t.Fatal("Cannot find", file)
+	}
+	if resp, err := client.Get(fs.URL + "/" + file); err == nil {
+		b, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			t.Fatal("got", string(b))
+		}
+		if int64(len(b)) != info.Size() {
+			t.Error("Expected Length", file, info.Size(), "actually", len(b), "starts", string(b[:10]))
+		}
+	} else {
+		t.Fatal("Cannot read from fs server", err)
+	}
+}
+
+func TestContentType(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse(goproxy.ContentTypeIs("image/png")).DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		resp.Header.Set("X-Shmoopi", "1")
+		return resp
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	for _, file := range []string{"test_data/panda.png", "test_data/football.png"} {
+		if resp, err := client.Get(localFile(file)); err != nil || resp.Header.Get("X-Shmoopi") != "1" {
+			if err == nil {
+				t.Error("pngs should have X-Shmoopi header = 1, actually", resp.Header.Get("X-Shmoopi"))
+			} else {
+				t.Error("error reading png", err)
+			}
+		}
+	}
+
+	file := "baby.jpg"
+	if resp, err := client.Get(localFile(file)); err != nil || resp.Header.Get("X-Shmoopi") != "" {
+		if err == nil {
+			t.Error("Non png images should NOT have X-Shmoopi header at all", resp.Header.Get("X-Shmoopi"))
+		} else {
+			t.Error("error reading png", err)
+		}
+	}
+}
+
+func getImage(file string, t *testing.T) image.Image {
+	newimage, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Fatal("Cannot read file", file, err)
+	}
+	img, _, err := image.Decode(bytes.NewReader(newimage))
+	if err != nil {
+		t.Fatal("Cannot decode image", file, err)
+	}
+	return img
+}
+
+func readAll(r io.Reader, t *testing.T) []byte {
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatal("Cannot read", err)
+	}
+	return b
+}
+func readFile(file string, t *testing.T) []byte {
+	b, err := ioutil.ReadFile(file)
+	if err != nil {
+		t.Fatal("Cannot read", err)
+	}
+	return b
+}
+func fatalOnErr(err error, msg string, t *testing.T) {
+	if err != nil {
+		t.Fatal(msg, err)
+	}
+}
+func panicOnErr(err error, msg string) {
+	if err != nil {
+		println(err.Error() + ":-" + msg)
+		os.Exit(-1)
+	}
+}
+
+func compareImage(eImg, aImg image.Image, t *testing.T) {
+	if eImg.Bounds().Dx() != aImg.Bounds().Dx() || eImg.Bounds().Dy() != aImg.Bounds().Dy() {
+		t.Error("image sizes different")
+		return
+	}
+	for i := 0; i < eImg.Bounds().Dx(); i++ {
+		for j := 0; j < eImg.Bounds().Dy(); j++ {
+			er, eg, eb, ea := eImg.At(i, j).RGBA()
+			ar, ag, ab, aa := aImg.At(i, j).RGBA()
+			if er != ar || eg != ag || eb != ab || ea != aa {
+				t.Error("images different at", i, j, "vals\n", er, eg, eb, ea, "\n", ar, ag, ab, aa, aa)
+				return
+			}
+		}
+	}
+}
+
+func TestConstantImageHandler(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	//panda := getImage("panda.png", t)
+	football := getImage("test_data/football.png", t)
+	proxy.OnResponse().Do(goproxy_image.HandleImage(func(img image.Image, ctx *goproxy.ProxyCtx) image.Image {
+		return football
+	}))
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	resp, err := client.Get(localFile("test_data/panda.png"))
+	if err != nil {
+		t.Fatal("Cannot get panda.png", err)
+	}
+
+	img, _, err := image.Decode(resp.Body)
+	if err != nil {
+		t.Error("decode", err)
+	} else {
+		compareImage(football, img, t)
+	}
+}
+
+func TestImageHandler(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	football := getImage("test_data/football.png", t)
+
+	proxy.OnResponse(goproxy.UrlIs("/test_data/panda.png")).Do(goproxy_image.HandleImage(func(img image.Image, ctx *goproxy.ProxyCtx) image.Image {
+		return football
+	}))
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	resp, err := client.Get(localFile("test_data/panda.png"))
+	if err != nil {
+		t.Fatal("Cannot get panda.png", err)
+	}
+
+	img, _, err := image.Decode(resp.Body)
+	if err != nil {
+		t.Error("decode", err)
+	} else {
+		compareImage(football, img, t)
+	}
+
+	// and again
+	resp, err = client.Get(localFile("test_data/panda.png"))
+	if err != nil {
+		t.Fatal("Cannot get panda.png", err)
+	}
+
+	img, _, err = image.Decode(resp.Body)
+	if err != nil {
+		t.Error("decode", err)
+	} else {
+		compareImage(football, img, t)
+	}
+}
+
+func TestChangeResp(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse().DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		resp.Body.Read([]byte{0})
+		resp.Body = ioutil.NopCloser(new(bytes.Buffer))
+		return resp
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	resp, err := client.Get(localFile("test_data/panda.png"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	ioutil.ReadAll(resp.Body)
+	_, err = client.Get(localFile("/bobo"))
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+func TestReplaceImage(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+
+	panda := getImage("test_data/panda.png", t)
+	football := getImage("test_data/football.png", t)
+
+	proxy.OnResponse(goproxy.UrlIs("/test_data/panda.png")).Do(goproxy_image.HandleImage(func(img image.Image, ctx *goproxy.ProxyCtx) image.Image {
+		return football
+	}))
+	proxy.OnResponse(goproxy.UrlIs("/test_data/football.png")).Do(goproxy_image.HandleImage(func(img image.Image, ctx *goproxy.ProxyCtx) image.Image {
+		return panda
+	}))
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	imgByPandaReq, _, err := image.Decode(bytes.NewReader(getOrFail(localFile("test_data/panda.png"), client, t)))
+	fatalOnErr(err, "decode panda", t)
+	compareImage(football, imgByPandaReq, t)
+
+	imgByFootballReq, _, err := image.Decode(bytes.NewReader(getOrFail(localFile("test_data/football.png"), client, t)))
+	fatalOnErr(err, "decode football", t)
+	compareImage(panda, imgByFootballReq, t)
+}
+
+func getCert(c *tls.Conn, t *testing.T) []byte {
+	if err := c.Handshake(); err != nil {
+		t.Fatal("cannot handshake", err)
+	}
+	return c.ConnectionState().PeerCertificates[0].Raw
+}
+
+func TestSimpleMitm(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(goproxy.ReqHostIs(https.Listener.Addr().String())).HandleConnect(goproxy.AlwaysMitm)
+	proxy.OnRequest(goproxy.ReqHostIs("no such host exists")).HandleConnect(goproxy.AlwaysMitm)
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	c, err := tls.Dial("tcp", https.Listener.Addr().String(), &tls.Config{InsecureSkipVerify: true})
+	if err != nil {
+		t.Fatal("cannot dial to tcp server", err)
+	}
+	origCert := getCert(c, t)
+	c.Close()
+
+	c2, err := net.Dial("tcp", l.Listener.Addr().String())
+	if err != nil {
+		t.Fatal("dialing to proxy", err)
+	}
+	creq, err := http.NewRequest("CONNECT", https.URL, nil)
+	//creq,err := http.NewRequest("CONNECT","https://google.com:443",nil)
+	if err != nil {
+		t.Fatal("create new request", creq)
+	}
+	creq.Write(c2)
+	c2buf := bufio.NewReader(c2)
+	resp, err := http.ReadResponse(c2buf, creq)
+	if err != nil || resp.StatusCode != 200 {
+		t.Fatal("Cannot CONNECT through proxy", err)
+	}
+	c2tls := tls.Client(c2, &tls.Config{InsecureSkipVerify: true})
+	proxyCert := getCert(c2tls, t)
+
+	if bytes.Equal(proxyCert, origCert) {
+		t.Errorf("Certificate after mitm is not different\n%v\n%v",
+			base64.StdEncoding.EncodeToString(origCert),
+			base64.StdEncoding.EncodeToString(proxyCert))
+	}
+
+	if resp := string(getOrFail(https.URL+"/bobo", client, t)); resp != "bobo" {
+		t.Error("Wrong response when mitm", resp, "expected bobo")
+	}
+	if resp := string(getOrFail(https.URL+"/query?result=bar", client, t)); resp != "bar" {
+		t.Error("Wrong response when mitm", resp, "expected bar")
+	}
+}
+
+func TestConnectHandler(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	althttps := httptest.NewTLSServer(ConstantHanlder("althttps"))
+	proxy.OnRequest().HandleConnectFunc(func(host string, ctx *goproxy.ProxyCtx) (*goproxy.ConnectAction, string) {
+		u, _ := url.Parse(althttps.URL)
+		return goproxy.OkConnect, u.Host
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	if resp := string(getOrFail(https.URL+"/alturl", client, t)); resp != "althttps" {
+		t.Error("Proxy should redirect CONNECT requests to local althttps server, expected 'althttps' got ", resp)
+	}
+}
+
+func TestMitmIsFiltered(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	//proxy.Verbose = true
+	proxy.OnRequest(goproxy.ReqHostIs(https.Listener.Addr().String())).HandleConnect(goproxy.AlwaysMitm)
+	proxy.OnRequest(goproxy.UrlIs("/momo")).DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		return nil, goproxy.TextResponse(req, "koko")
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if resp := string(getOrFail(https.URL+"/momo", client, t)); resp != "koko" {
+		t.Error("Proxy should capture /momo to be koko and not", resp)
+	}
+
+	if resp := string(getOrFail(https.URL+"/bobo", client, t)); resp != "bobo" {
+		t.Error("But still /bobo should be bobo and not", resp)
+	}
+}
+
+func TestFirstHandlerMatches(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		return nil, goproxy.TextResponse(req, "koko")
+	})
+	proxy.OnRequest().DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		panic("should never get here, previous response is no null")
+	})
+
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	if resp := string(getOrFail(srv.URL+"/", client, t)); resp != "koko" {
+		t.Error("should return always koko and not", resp)
+	}
+}
+
+func constantHttpServer(content []byte) (addr string) {
+	l, err := net.Listen("tcp", "localhost:0")
+	panicOnErr(err, "listen")
+	go func() {
+		c, err := l.Accept()
+		panicOnErr(err, "accept")
+		buf := bufio.NewReader(c)
+		_, err = http.ReadRequest(buf)
+		panicOnErr(err, "readReq")
+		c.Write(content)
+		c.Close()
+		l.Close()
+	}()
+	return l.Addr().String()
+}
+
+func TestIcyResponse(t *testing.T) {
+	// TODO: fix this test
+	return // skip for now
+	s := constantHttpServer([]byte("ICY 200 OK\r\n\r\nblablabla"))
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = true
+	_, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	req, err := http.NewRequest("GET", "http://"+s, nil)
+	panicOnErr(err, "newReq")
+	proxyip := l.URL[len("http://"):]
+	println("got ip: " + proxyip)
+	c, err := net.Dial("tcp", proxyip)
+	panicOnErr(err, "dial")
+	defer c.Close()
+	req.WriteProxy(c)
+	raw, err := ioutil.ReadAll(c)
+	panicOnErr(err, "readAll")
+	if string(raw) != "ICY 200 OK\r\n\r\nblablabla" {
+		t.Error("Proxy did not send the malformed response received")
+	}
+}
+
+type VerifyNoProxyHeaders struct {
+	*testing.T
+}
+
+func (v VerifyNoProxyHeaders) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Header.Get("Connection") != "" || r.Header.Get("Proxy-Connection") != "" ||
+		r.Header.Get("Proxy-Authenticate") != "" || r.Header.Get("Proxy-Authorization") != "" {
+		v.Error("Got Connection header from goproxy", r.Header)
+	}
+}
+
+func TestNoProxyHeaders(t *testing.T) {
+	s := httptest.NewServer(VerifyNoProxyHeaders{t})
+	client, l := oneShotProxy(goproxy.NewProxyHttpServer(), t)
+	defer l.Close()
+	req, err := http.NewRequest("GET", s.URL, nil)
+	panicOnErr(err, "bad request")
+	req.Header.Add("Connection", "close")
+	req.Header.Add("Proxy-Connection", "close")
+	req.Header.Add("Proxy-Authenticate", "auth")
+	req.Header.Add("Proxy-Authorization", "auth")
+	client.Do(req)
+}
+
+func TestNoProxyHeadersHttps(t *testing.T) {
+	s := httptest.NewTLSServer(VerifyNoProxyHeaders{t})
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().HandleConnect(goproxy.AlwaysMitm)
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	req, err := http.NewRequest("GET", s.URL, nil)
+	panicOnErr(err, "bad request")
+	req.Header.Add("Connection", "close")
+	req.Header.Add("Proxy-Connection", "close")
+	client.Do(req)
+}
+
+func TestHeadReqHasContentLength(t *testing.T) {
+	client, l := oneShotProxy(goproxy.NewProxyHttpServer(), t)
+	defer l.Close()
+
+	resp, err := client.Head(localFile("test_data/panda.png"))
+	panicOnErr(err, "resp to HEAD")
+	if resp.Header.Get("Content-Length") == "" {
+		t.Error("Content-Length should exist on HEAD requests")
+	}
+}
+
+func TestChunkedResponse(t *testing.T) {
+	l, err := net.Listen("tcp", ":10234")
+	panicOnErr(err, "listen")
+	defer l.Close()
+	go func() {
+		for i := 0; i < 2; i++ {
+			c, err := l.Accept()
+			panicOnErr(err, "accept")
+			_, err = http.ReadRequest(bufio.NewReader(c))
+			panicOnErr(err, "readrequest")
+			io.WriteString(c, "HTTP/1.1 200 OK\r\n"+
+				"Content-Type: text/plain\r\n"+
+				"Transfer-Encoding: chunked\r\n\r\n"+
+				"25\r\n"+
+				"This is the data in the first chunk\r\n\r\n"+
+				"1C\r\n"+
+				"and this is the second one\r\n\r\n"+
+				"3\r\n"+
+				"con\r\n"+
+				"8\r\n"+
+				"sequence\r\n0\r\n\r\n")
+			c.Close()
+		}
+	}()
+
+	c, err := net.Dial("tcp", "localhost:10234")
+	panicOnErr(err, "dial")
+	defer c.Close()
+	req, _ := http.NewRequest("GET", "/", nil)
+	req.Write(c)
+	resp, err := http.ReadResponse(bufio.NewReader(c), req)
+	panicOnErr(err, "readresp")
+	b, err := ioutil.ReadAll(resp.Body)
+	panicOnErr(err, "readall")
+	expected := "This is the data in the first chunk\r\nand this is the second one\r\nconsequence"
+	if string(b) != expected {
+		t.Errorf("Got `%v` expected `%v`", string(b), expected)
+	}
+
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnResponse().DoFunc(func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		panicOnErr(ctx.Error, "error reading output")
+		b, err := ioutil.ReadAll(resp.Body)
+		resp.Body.Close()
+		panicOnErr(err, "readall onresp")
+		if enc := resp.Header.Get("Transfer-Encoding"); enc != "" {
+			t.Fatal("Chunked response should be received as plaintext", enc)
+		}
+		resp.Body = ioutil.NopCloser(bytes.NewBufferString(strings.Replace(string(b), "e", "E", -1)))
+		return resp
+	})
+
+	client, s := oneShotProxy(proxy, t)
+	defer s.Close()
+
+	resp, err = client.Get("http://localhost:10234/")
+	panicOnErr(err, "client.Get")
+	b, err = ioutil.ReadAll(resp.Body)
+	panicOnErr(err, "readall proxy")
+	if string(b) != strings.Replace(expected, "e", "E", -1) {
+		t.Error("expected", expected, "w/ e->E. Got", string(b))
+	}
+}
+
+func TestGoproxyThroughProxy(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy2 := goproxy.NewProxyHttpServer()
+	doubleString := func(resp *http.Response, ctx *goproxy.ProxyCtx) *http.Response {
+		b, err := ioutil.ReadAll(resp.Body)
+		panicOnErr(err, "readAll resp")
+		resp.Body = ioutil.NopCloser(bytes.NewBufferString(string(b) + " " + string(b)))
+		return resp
+	}
+	proxy.OnRequest().HandleConnect(goproxy.AlwaysMitm)
+	proxy.OnResponse().DoFunc(doubleString)
+
+	_, l := oneShotProxy(proxy, t)
+	defer l.Close()
+
+	proxy2.ConnectDial = proxy2.NewConnectDialToProxy(l.URL)
+
+	client, l2 := oneShotProxy(proxy2, t)
+	defer l2.Close()
+	if r := string(getOrFail(https.URL+"/bobo", client, t)); r != "bobo bobo" {
+		t.Error("Expected bobo doubled twice, got", r)
+	}
+
+}
+
+func TestGoproxyHijackConnect(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest(goproxy.ReqHostIs(srv.Listener.Addr().String())).
+		HijackConnect(func(req *http.Request, client net.Conn, ctx *goproxy.ProxyCtx) {
+		t.Logf("URL %+#v\nSTR %s", req.URL, req.URL.String())
+		resp, err := http.Get("http:" + req.URL.String() + "/bobo")
+		panicOnErr(err, "http.Get(CONNECT url)")
+		panicOnErr(resp.Write(client), "resp.Write(client)")
+		resp.Body.Close()
+		client.Close()
+	})
+	client, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	proxyAddr := l.Listener.Addr().String()
+	conn, err := net.Dial("tcp", proxyAddr)
+	panicOnErr(err, "conn "+proxyAddr)
+	buf := bufio.NewReader(conn)
+	writeConnect(conn)
+	readConnectResponse(buf)
+	if txt := readResponse(buf); txt != "bobo" {
+		t.Error("Expected bobo for CONNECT /foo, got", txt)
+	}
+
+	if r := string(getOrFail(https.URL+"/bobo", client, t)); r != "bobo" {
+		t.Error("Expected bobo would keep working with CONNECT", r)
+	}
+}
+
+func readResponse(buf *bufio.Reader) string {
+	req, err := http.NewRequest("GET", srv.URL, nil)
+	panicOnErr(err, "NewRequest")
+	resp, err := http.ReadResponse(buf, req)
+	panicOnErr(err, "resp.Read")
+	defer resp.Body.Close()
+	txt, err := ioutil.ReadAll(resp.Body)
+	panicOnErr(err, "resp.Read")
+	return string(txt)
+}
+
+func writeConnect(w io.Writer) {
+	req, err := http.NewRequest("CONNECT", srv.URL[len("http://"):], nil)
+	panicOnErr(err, "NewRequest")
+	req.Write(w)
+	panicOnErr(err, "req(CONNECT).Write")
+}
+
+func readConnectResponse(buf *bufio.Reader) {
+	_, err := buf.ReadString('\n')
+	panicOnErr(err, "resp.Read connect resp")
+	_, err = buf.ReadString('\n')
+	panicOnErr(err, "resp.Read connect resp")
+}
+
+func TestCurlMinusP(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().HandleConnectFunc(func(host string, ctx *goproxy.ProxyCtx) (*goproxy.ConnectAction, string) {
+		return goproxy.HTTPMitmConnect, host
+	})
+	called := false
+	proxy.OnRequest().DoFunc(func(req *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
+		called = true
+		return req, nil
+	})
+	_, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	cmd := exec.Command("curl", "-p", "-sS", "--proxy", l.URL, srv.URL+"/bobo")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(output) != "bobo" {
+		t.Error("Expected bobo, got", string(output))
+	}
+	if !called {
+		t.Error("handler not called")
+	}
+}
+
+func TestSelfRequest(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	_, l := oneShotProxy(proxy, t)
+	defer l.Close()
+	if !strings.Contains(string(getOrFail(l.URL, http.DefaultClient, t)), "non-proxy") {
+		t.Fatal("non proxy requests should fail")
+	}
+}
+
+func TestHasGoproxyCA(t *testing.T) {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.OnRequest().HandleConnect(goproxy.AlwaysMitm)
+	s := httptest.NewServer(proxy)
+
+	proxyUrl, _ := url.Parse(s.URL)
+	goproxyCA := x509.NewCertPool()
+	goproxyCA.AddCert(goproxy.GoproxyCa.Leaf)
+
+	tr := &http.Transport{TLSClientConfig: &tls.Config{RootCAs: goproxyCA}, Proxy: http.ProxyURL(proxyUrl)}
+	client := &http.Client{Transport: tr}
+
+	if resp := string(getOrFail(https.URL+"/bobo", client, t)); resp != "bobo" {
+		t.Error("Wrong response when mitm", resp, "expected bobo")
+	}
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader.go
new file mode 100644
index 0000000000..1458af5871
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader.go
@@ -0,0 +1,97 @@
+package regretable
+
+import (
+	"io"
+)
+
+// A RegretableReader will allow you to read from a reader, and then
+// to "regret" reading it, and push back everything you've read.
+// For example,
+//	rb := NewRegretableReader(bytes.NewBuffer([]byte{1,2,3}))
+//	var b = make([]byte,1)
+//	rb.Read(b) // b[0] = 1
+//	rb.Regret()
+//	ioutil.ReadAll(rb.Read) // returns []byte{1,2,3},nil
+type RegretableReader struct {
+	reader   io.Reader
+	overflow bool
+	r, w     int
+	buf      []byte
+}
+
+var defaultBufferSize = 500
+
+// Same as RegretableReader, but allows closing the underlying reader
+type RegretableReaderCloser struct {
+	RegretableReader
+	c      io.Closer
+}
+
+// Closes the underlying readCloser, you cannot regret after closing the stream
+func (rbc *RegretableReaderCloser) Close() error {
+	return rbc.c.Close()
+}
+
+// initialize a RegretableReaderCloser with underlying readCloser rc
+func NewRegretableReaderCloser(rc io.ReadCloser) *RegretableReaderCloser {
+	return &RegretableReaderCloser{*NewRegretableReader(rc), rc}
+}
+
+// initialize a RegretableReaderCloser with underlying readCloser rc
+func NewRegretableReaderCloserSize(rc io.ReadCloser, size int) *RegretableReaderCloser {
+	return &RegretableReaderCloser{*NewRegretableReaderSize(rc, size), rc}
+}
+
+// The next read from the RegretableReader will be as if the underlying reader
+// was never read (or from the last point forget is called).
+func (rb *RegretableReader) Regret() {
+	if rb.overflow {
+		panic("regretting after overflow makes no sense")
+	}
+	rb.r = 0
+}
+
+// Will "forget" everything read so far.
+//	rb := NewRegretableReader(bytes.NewBuffer([]byte{1,2,3}))
+//	var b = make([]byte,1)
+//	rb.Read(b) // b[0] = 1
+//	rb.Forget()
+//	rb.Read(b) // b[0] = 2
+//	rb.Regret()
+//	ioutil.ReadAll(rb.Read) // returns []byte{2,3},nil
+func (rb *RegretableReader) Forget() {
+	if rb.overflow {
+		panic("forgetting after overflow makes no sense")
+	}
+	rb.r = 0
+	rb.w = 0
+}
+
+// initialize a RegretableReader with underlying reader r, whose buffer is size bytes long
+func NewRegretableReaderSize(r io.Reader, size int) *RegretableReader {
+	return &RegretableReader{reader: r, buf: make([]byte, size) }
+}
+
+// initialize a RegretableReader with underlying reader r
+func NewRegretableReader(r io.Reader) *RegretableReader {
+	return NewRegretableReaderSize(r, defaultBufferSize)
+}
+
+// reads from the underlying reader. Will buffer all input until Regret is called.
+func (rb *RegretableReader) Read(p []byte) (n int, err error) {
+	if rb.overflow {
+		return rb.reader.Read(p)
+	}
+	if rb.r < rb.w {
+		n = copy(p, rb.buf[rb.r:rb.w])
+		rb.r += n
+		return
+	}
+	n, err = rb.reader.Read(p)
+	bn := copy(rb.buf[rb.w:], p[:n])
+	rb.w, rb.r = rb.w + bn, rb.w + n
+	if bn < n {
+		rb.overflow = true
+	}
+	return
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader_test.go
new file mode 100644
index 0000000000..55fa752bc8
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/regretable/regretreader_test.go
@@ -0,0 +1,174 @@
+package regretable_test
+
+import (
+	. "github.com/elazarl/goproxy/regretable"
+	"bytes"
+	"io"
+	"io/ioutil"
+	"strings"
+	"testing"
+)
+
+func TestRegretableReader(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	fivebytes := make([]byte, 5)
+	mb.Read(fivebytes)
+	mb.Regret()
+
+	s, _ := ioutil.ReadAll(mb)
+	if string(s) != word {
+		t.Errorf("Uncommited read is gone, [%d,%d] actual '%v' expected '%v'\n", len(s), len(word), string(s), word)
+	}
+}
+
+func TestRegretableEmptyRead(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	zero := make([]byte, 0)
+	mb.Read(zero)
+	mb.Regret()
+
+	s, err := ioutil.ReadAll(mb)
+	if string(s) != word {
+		t.Error("Uncommited read is gone, actual:", string(s), "expected:", word, "err:", err)
+	}
+}
+
+func TestRegretableAlsoEmptyRead(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	one := make([]byte, 1)
+	zero := make([]byte, 0)
+	five := make([]byte, 5)
+	mb.Read(one)
+	mb.Read(zero)
+	mb.Read(five)
+	mb.Regret()
+
+	s, _ := ioutil.ReadAll(mb)
+	if string(s) != word {
+		t.Error("Uncommited read is gone", string(s), "expected", word)
+	}
+}
+
+func TestRegretableRegretBeforeRead(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	five := make([]byte, 5)
+	mb.Regret()
+	mb.Read(five)
+
+	s, err := ioutil.ReadAll(mb)
+	if string(s) != "678" {
+		t.Error("Uncommited read is gone", string(s), len(string(s)), "expected", "678", len("678"), "err:", err)
+	}
+}
+
+func TestRegretableFullRead(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	twenty := make([]byte, 20)
+	mb.Read(twenty)
+	mb.Regret()
+
+	s, _ := ioutil.ReadAll(mb)
+	if string(s) != word {
+		t.Error("Uncommited read is gone", string(s), len(string(s)), "expected", word, len(word))
+	}
+}
+
+func assertEqual(t *testing.T, expected, actual string) {
+	if expected!=actual {
+		t.Fatal("Expected", expected, "actual", actual)
+	}
+}
+
+func assertReadAll(t *testing.T, r io.Reader) string {
+	s, err := ioutil.ReadAll(r)
+	if err!=nil {
+		t.Fatal("error when reading", err)
+	}
+	return string(s)
+}
+
+func TestRegretableRegretTwice(t *testing.T) {
+	buf := new(bytes.Buffer)
+	mb := NewRegretableReader(buf)
+	word := "12345678"
+	buf.WriteString(word)
+
+	assertEqual(t, word, assertReadAll(t, mb))
+	mb.Regret()
+	assertEqual(t, word, assertReadAll(t, mb))
+	mb.Regret()
+	assertEqual(t, word, assertReadAll(t, mb))
+}
+
+type CloseCounter struct {
+	r      io.Reader
+	closed int
+}
+
+func (cc *CloseCounter) Read(b []byte) (int, error) {
+	return cc.r.Read(b)
+}
+
+func (cc *CloseCounter) Close() error {
+	cc.closed++
+	return nil
+}
+
+func assert(t *testing.T, b bool, msg string) {
+	if !b {
+		t.Errorf("Assertion Error: %s", msg)
+	}
+}
+
+func TestRegretableCloserSizeRegrets(t *testing.T) {
+	defer func() {
+		if r := recover(); r == nil || !strings.Contains(r.(string), "regret") {
+			t.Error("Did not panic when regretting overread buffer:", r)
+		}
+	}()
+	buf := new(bytes.Buffer)
+	buf.WriteString("123456")
+	mb := NewRegretableReaderCloserSize(ioutil.NopCloser(buf), 3)
+	mb.Read(make([]byte, 4))
+	mb.Regret()
+}
+
+func TestRegretableCloserRegretsClose(t *testing.T) {
+	buf := new(bytes.Buffer)
+	cc := &CloseCounter{buf, 0}
+	mb := NewRegretableReaderCloser(cc)
+	word := "12345678"
+	buf.WriteString(word)
+
+	mb.Read([]byte{0})
+	mb.Close()
+	if cc.closed != 1 {
+		t.Error("RegretableReaderCloser ignores Close")
+	}
+	mb.Regret()
+	mb.Close()
+	if cc.closed != 2 {
+		t.Error("RegretableReaderCloser does ignore Close after regret")
+	}
+	// TODO(elazar): return an error if client issues Close more than once after regret
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/responses.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/responses.go
new file mode 100644
index 0000000000..b304b8829b
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/responses.go
@@ -0,0 +1,38 @@
+package goproxy
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+)
+
+// Will generate a valid http response to the given request the response will have
+// the given contentType, and http status.
+// Typical usage, refuse to process requests to local addresses:
+//
+//	proxy.OnRequest(IsLocalHost()).DoFunc(func(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request,*http.Response) {
+//		return nil,NewResponse(r,goproxy.ContentTypeHtml,http.StatusUnauthorized,
+//			`<!doctype html><html><head><title>Can't use proxy for local addresses</title></head><body/></html>`)
+//	})
+func NewResponse(r *http.Request, contentType string, status int, body string) *http.Response {
+	resp := &http.Response{}
+	resp.Request = r
+	resp.TransferEncoding = r.TransferEncoding
+	resp.Header = make(http.Header)
+	resp.Header.Add("Content-Type", contentType)
+	resp.StatusCode = status
+	buf := bytes.NewBufferString(body)
+	resp.ContentLength = int64(buf.Len())
+	resp.Body = ioutil.NopCloser(buf)
+	return resp
+}
+
+const (
+	ContentTypeText = "text/plain"
+	ContentTypeHtml = "text/html"
+)
+
+// Alias for NewResponse(r,ContentTypeText,http.StatusAccepted,text)
+func TextResponse(r *http.Request, text string) *http.Response {
+	return NewResponse(r, ContentTypeText, http.StatusAccepted, text)
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/signer.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/signer.go
new file mode 100644
index 0000000000..f6d99fc7fa
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/signer.go
@@ -0,0 +1,87 @@
+package goproxy
+
+import (
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"math/big"
+	"net"
+	"runtime"
+	"sort"
+	"time"
+)
+
+func hashSorted(lst []string) []byte {
+	c := make([]string, len(lst))
+	copy(c, lst)
+	sort.Strings(c)
+	h := sha1.New()
+	for _, s := range c {
+		h.Write([]byte(s + ","))
+	}
+	return h.Sum(nil)
+}
+
+func hashSortedBigInt(lst []string) *big.Int {
+	rv := new(big.Int)
+	rv.SetBytes(hashSorted(lst))
+	return rv
+}
+
+var goproxySignerVersion = ":goroxy1"
+
+func signHost(ca tls.Certificate, hosts []string) (cert tls.Certificate, err error) {
+	var x509ca *x509.Certificate
+
+	// Use the provided ca and not the global GoproxyCa for certificate generation.
+	if x509ca, err = x509.ParseCertificate(ca.Certificate[0]); err != nil {
+		return
+	}
+	start := time.Unix(0, 0)
+	end, err := time.Parse("2006-01-02", "2049-12-31")
+	if err != nil {
+		panic(err)
+	}
+	hash := hashSorted(append(hosts, goproxySignerVersion, ":"+runtime.Version()))
+	serial := new(big.Int)
+	serial.SetBytes(hash)
+	template := x509.Certificate{
+		// TODO(elazar): instead of this ugly hack, just encode the certificate and hash the binary form.
+		SerialNumber: serial,
+		Issuer:       x509ca.Subject,
+		Subject: pkix.Name{
+			Organization: []string{"GoProxy untrusted MITM proxy Inc"},
+		},
+		NotBefore: start,
+		NotAfter:  end,
+
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+	}
+	for _, h := range hosts {
+		if ip := net.ParseIP(h); ip != nil {
+			template.IPAddresses = append(template.IPAddresses, ip)
+		} else {
+			template.DNSNames = append(template.DNSNames, h)
+		}
+	}
+	var csprng CounterEncryptorRand
+	if csprng, err = NewCounterEncryptorRandFromKey(ca.PrivateKey, hash); err != nil {
+		return
+	}
+	var certpriv *rsa.PrivateKey
+	if certpriv, err = rsa.GenerateKey(&csprng, 1024); err != nil {
+		return
+	}
+	var derBytes []byte
+	if derBytes, err = x509.CreateCertificate(&csprng, &template, x509ca, &certpriv.PublicKey, ca.PrivateKey); err != nil {
+		return
+	}
+	return tls.Certificate{
+		Certificate: [][]byte{derBytes, ca.Certificate[0]},
+		PrivateKey:  certpriv,
+	}, nil
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/signer_test.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/signer_test.go
new file mode 100644
index 0000000000..d0e24d2985
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/signer_test.go
@@ -0,0 +1,87 @@
+package goproxy
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+	"time"
+)
+
+func orFatal(msg string, err error, t *testing.T) {
+	if err != nil {
+		t.Fatal(msg, err)
+	}
+}
+
+type ConstantHanlder string
+
+func (h ConstantHanlder) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	w.Write([]byte(h))
+}
+
+func getBrowser(args []string) string {
+	for i, arg := range args {
+		if arg == "-browser" && i+1 < len(arg) {
+			return args[i+1]
+		}
+		if strings.HasPrefix(arg, "-browser=") {
+			return arg[len("-browser="):]
+		}
+	}
+	return ""
+}
+
+func TestSingerTls(t *testing.T) {
+	cert, err := signHost(GoproxyCa, []string{"example.com", "1.1.1.1", "localhost"})
+	orFatal("singHost", err, t)
+	cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])
+	orFatal("ParseCertificate", err, t)
+	expected := "key verifies with Go"
+	server := httptest.NewUnstartedServer(ConstantHanlder(expected))
+	defer server.Close()
+	server.TLS = &tls.Config{Certificates: []tls.Certificate{cert, GoproxyCa}}
+	server.TLS.BuildNameToCertificate()
+	server.StartTLS()
+	certpool := x509.NewCertPool()
+	certpool.AddCert(GoproxyCa.Leaf)
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{RootCAs: certpool},
+	}
+	asLocalhost := strings.Replace(server.URL, "127.0.0.1", "localhost", -1)
+	req, err := http.NewRequest("GET", asLocalhost, nil)
+	orFatal("NewRequest", err, t)
+	resp, err := tr.RoundTrip(req)
+	orFatal("RoundTrip", err, t)
+	txt, err := ioutil.ReadAll(resp.Body)
+	orFatal("ioutil.ReadAll", err, t)
+	if string(txt) != expected {
+		t.Errorf("Expected '%s' got '%s'", expected, string(txt))
+	}
+	browser := getBrowser(os.Args)
+	if browser != "" {
+		exec.Command(browser, asLocalhost).Run()
+		time.Sleep(10 * time.Second)
+	}
+}
+
+func TestSingerX509(t *testing.T) {
+	cert, err := signHost(GoproxyCa, []string{"example.com", "1.1.1.1", "localhost"})
+	orFatal("singHost", err, t)
+	cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])
+	orFatal("ParseCertificate", err, t)
+	certpool := x509.NewCertPool()
+	certpool.AddCert(GoproxyCa.Leaf)
+	orFatal("VerifyHostname", cert.Leaf.VerifyHostname("example.com"), t)
+	orFatal("CheckSignatureFrom", cert.Leaf.CheckSignatureFrom(GoproxyCa.Leaf), t)
+	_, err = cert.Leaf.Verify(x509.VerifyOptions{
+		DNSName: "example.com",
+		Roots:   certpool,
+	})
+	orFatal("Verify", err, t)
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/baby.jpg b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/baby.jpg
new file mode 100644
index 0000000000..c377bb8e32
Binary files /dev/null and b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/baby.jpg differ
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/football.png b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/football.png
new file mode 100644
index 0000000000..7eefac18f7
Binary files /dev/null and b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/football.png differ
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/panda.png b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/panda.png
new file mode 100644
index 0000000000..cdfdb5e681
Binary files /dev/null and b/Godeps/_workspace/src/github.com/elazarl/goproxy/test_data/panda.png differ
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/roundtripper.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/roundtripper.go
new file mode 100644
index 0000000000..3651ad86c0
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/roundtripper.go
@@ -0,0 +1,19 @@
+package transport
+import "net/http"
+type RoundTripper interface {
+	// RoundTrip executes a single HTTP transaction, returning
+	// the Response for the request req.  RoundTrip should not
+	// attempt to interpret the response.  In particular,
+	// RoundTrip must return err == nil if it obtained a response,
+	// regardless of the response's HTTP status code.  A non-nil
+	// err should be reserved for failure to obtain a response.
+	// Similarly, RoundTrip should not attempt to handle
+	// higher-level protocol details such as redirects,
+	// authentication, or cookies.
+	//
+	// RoundTrip should not modify the request, except for
+	// consuming the Body.  The request's URL and Header fields
+	// are guaranteed to be initialized.
+	RoundTrip(*http.Request) (*http.Response, error)
+	DetailedRoundTrip(*http.Request) (*RoundTripDetails, *http.Response, error)
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/transport.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/transport.go
new file mode 100644
index 0000000000..fc1c82b1a5
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/transport.go
@@ -0,0 +1,789 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// HTTP client implementation. See RFC 2616.
+// 
+// This is the low-level Transport implementation of RoundTripper.
+// The high-level interface is in client.go.
+
+// This file is DEPRECATED and keep solely for backward compatibility.
+
+package transport
+
+import (
+	"net/http"
+	"bufio"
+	"compress/gzip"
+	"crypto/tls"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net"
+	"net/url"
+	"os"
+	"strings"
+	"sync"
+)
+
+// DefaultTransport is the default implementation of Transport and is
+// used by DefaultClient.  It establishes a new network connection for
+// each call to Do and uses HTTP proxies as directed by the
+// $HTTP_PROXY and $NO_PROXY (or $http_proxy and $no_proxy)
+// environment variables.
+var DefaultTransport RoundTripper = &Transport{Proxy: ProxyFromEnvironment}
+
+// DefaultMaxIdleConnsPerHost is the default value of Transport's
+// MaxIdleConnsPerHost.
+const DefaultMaxIdleConnsPerHost = 2
+
+// Transport is an implementation of RoundTripper that supports http,
+// https, and http proxies (for either http or https with CONNECT).
+// Transport can also cache connections for future re-use.
+type Transport struct {
+	lk       sync.Mutex
+	idleConn map[string][]*persistConn
+	altProto map[string]RoundTripper // nil or map of URI scheme => RoundTripper
+
+	// TODO: tunable on global max cached connections
+	// TODO: tunable on timeout on cached connections
+	// TODO: optional pipelining
+
+	// Proxy specifies a function to return a proxy for a given
+	// Request. If the function returns a non-nil error, the
+	// request is aborted with the provided error.
+	// If Proxy is nil or returns a nil *URL, no proxy is used.
+	Proxy func(*http.Request) (*url.URL, error)
+
+	// Dial specifies the dial function for creating TCP
+	// connections.
+	// If Dial is nil, net.Dial is used.
+	Dial func(net, addr string) (c net.Conn, err error)
+
+	// TLSClientConfig specifies the TLS configuration to use with
+	// tls.Client. If nil, the default configuration is used.
+	TLSClientConfig *tls.Config
+
+	DisableKeepAlives  bool
+	DisableCompression bool
+
+	// MaxIdleConnsPerHost, if non-zero, controls the maximum idle
+	// (keep-alive) to keep to keep per-host.  If zero,
+	// DefaultMaxIdleConnsPerHost is used.
+	MaxIdleConnsPerHost int
+}
+
+// ProxyFromEnvironment returns the URL of the proxy to use for a
+// given request, as indicated by the environment variables
+// $HTTP_PROXY and $NO_PROXY (or $http_proxy and $no_proxy).
+// An error is returned if the proxy environment is invalid.
+// A nil URL and nil error are returned if no proxy is defined in the
+// environment, or a proxy should not be used for the given request.
+func ProxyFromEnvironment(req *http.Request) (*url.URL, error) {
+	proxy := getenvEitherCase("HTTP_PROXY")
+	if proxy == "" {
+		return nil, nil
+	}
+	if !useProxy(canonicalAddr(req.URL)) {
+		return nil, nil
+	}
+	proxyURL, err := url.Parse(proxy)
+	if err != nil || proxyURL.Scheme == "" {
+		if u, err := url.Parse("http://" + proxy); err == nil {
+			proxyURL = u
+			err = nil
+		}
+	}
+	if err != nil {
+		return nil, fmt.Errorf("invalid proxy address %q: %v", proxy, err)
+	}
+	return proxyURL, nil
+}
+
+// ProxyURL returns a proxy function (for use in a Transport)
+// that always returns the same URL.
+func ProxyURL(fixedURL *url.URL) func(*http.Request) (*url.URL, error) {
+	return func(*http.Request) (*url.URL, error) {
+		return fixedURL, nil
+	}
+}
+
+// transportRequest is a wrapper around a *Request that adds
+// optional extra headers to write.
+type transportRequest struct {
+	*http.Request        // original request, not to be mutated
+	extra    http.Header // extra headers to write, or nil
+}
+
+func (tr *transportRequest) extraHeaders() http.Header {
+	if tr.extra == nil {
+		tr.extra = make(http.Header)
+	}
+	return tr.extra
+}
+
+type RoundTripDetails struct {
+	Host string
+	TCPAddr *net.TCPAddr
+	IsProxy bool
+	Error error
+}
+
+func (t *Transport) DetailedRoundTrip(req *http.Request) (details *RoundTripDetails, resp *http.Response, err error) {
+	if req.URL == nil {
+		return nil, nil, errors.New("http: nil Request.URL")
+	}
+	if req.Header == nil {
+		return nil, nil, errors.New("http: nil Request.Header")
+	}
+	if req.URL.Scheme != "http" && req.URL.Scheme != "https" {
+		t.lk.Lock()
+		var rt RoundTripper
+		if t.altProto != nil {
+			rt = t.altProto[req.URL.Scheme]
+		}
+		t.lk.Unlock()
+		if rt == nil {
+			return nil, nil, &badStringError{"unsupported protocol scheme", req.URL.Scheme}
+		}
+		return rt.DetailedRoundTrip(req)
+	}
+	treq := &transportRequest{Request: req}
+	cm, err := t.connectMethodForRequest(treq)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Get the cached or newly-created connection to either the
+	// host (for http or https), the http proxy, or the http proxy
+	// pre-CONNECTed to https server.  In any case, we'll be ready
+	// to send it requests.
+	pconn, err := t.getConn(cm)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	resp, err = pconn.roundTrip(treq)
+	return &RoundTripDetails{pconn.host, pconn.ip, pconn.isProxy, err}, resp, err
+}
+
+// RoundTrip implements the RoundTripper interface.
+func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
+	_, resp, err = t.DetailedRoundTrip(req)
+	return
+}
+
+// RegisterProtocol registers a new protocol with scheme.
+// The Transport will pass requests using the given scheme to rt.
+// It is rt's responsibility to simulate HTTP request semantics.
+//
+// RegisterProtocol can be used by other packages to provide
+// implementations of protocol schemes like "ftp" or "file".
+func (t *Transport) RegisterProtocol(scheme string, rt RoundTripper) {
+	if scheme == "http" || scheme == "https" {
+		panic("protocol " + scheme + " already registered")
+	}
+	t.lk.Lock()
+	defer t.lk.Unlock()
+	if t.altProto == nil {
+		t.altProto = make(map[string]RoundTripper)
+	}
+	if _, exists := t.altProto[scheme]; exists {
+		panic("protocol " + scheme + " already registered")
+	}
+	t.altProto[scheme] = rt
+}
+
+// CloseIdleConnections closes any connections which were previously
+// connected from previous requests but are now sitting idle in
+// a "keep-alive" state. It does not interrupt any connections currently
+// in use.
+func (t *Transport) CloseIdleConnections() {
+	t.lk.Lock()
+	defer t.lk.Unlock()
+	if t.idleConn == nil {
+		return
+	}
+	for _, conns := range t.idleConn {
+		for _, pconn := range conns {
+			pconn.close()
+		}
+	}
+	t.idleConn = make(map[string][]*persistConn)
+}
+
+//
+// Private implementation past this point.
+//
+
+func getenvEitherCase(k string) string {
+	if v := os.Getenv(strings.ToUpper(k)); v != "" {
+		return v
+	}
+	return os.Getenv(strings.ToLower(k))
+}
+
+func (t *Transport) connectMethodForRequest(treq *transportRequest) (*connectMethod, error) {
+	cm := &connectMethod{
+		targetScheme: treq.URL.Scheme,
+		targetAddr:   canonicalAddr(treq.URL),
+	}
+	if t.Proxy != nil {
+		var err error
+		cm.proxyURL, err = t.Proxy(treq.Request)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return cm, nil
+}
+
+// proxyAuth returns the Proxy-Authorization header to set
+// on requests, if applicable.
+func (cm *connectMethod) proxyAuth() string {
+	if cm.proxyURL == nil {
+		return ""
+	}
+	if u := cm.proxyURL.User; u != nil {
+		return "Basic " + base64.URLEncoding.EncodeToString([]byte(u.String()))
+	}
+	return ""
+}
+
+// putIdleConn adds pconn to the list of idle persistent connections awaiting
+// a new request.
+// If pconn is no longer needed or not in a good state, putIdleConn
+// returns false.
+func (t *Transport) putIdleConn(pconn *persistConn) bool {
+	t.lk.Lock()
+	defer t.lk.Unlock()
+	if t.DisableKeepAlives || t.MaxIdleConnsPerHost < 0 {
+		pconn.close()
+		return false
+	}
+	if pconn.isBroken() {
+		return false
+	}
+	key := pconn.cacheKey
+	max := t.MaxIdleConnsPerHost
+	if max == 0 {
+		max = DefaultMaxIdleConnsPerHost
+	}
+	if len(t.idleConn[key]) >= max {
+		pconn.close()
+		return false
+	}
+	t.idleConn[key] = append(t.idleConn[key], pconn)
+	return true
+}
+
+func (t *Transport) getIdleConn(cm *connectMethod) (pconn *persistConn) {
+	t.lk.Lock()
+	defer t.lk.Unlock()
+	if t.idleConn == nil {
+		t.idleConn = make(map[string][]*persistConn)
+	}
+	key := cm.String()
+	for {
+		pconns, ok := t.idleConn[key]
+		if !ok {
+			return nil
+		}
+		if len(pconns) == 1 {
+			pconn = pconns[0]
+			delete(t.idleConn, key)
+		} else {
+			// 2 or more cached connections; pop last
+			// TODO: queue?
+			pconn = pconns[len(pconns)-1]
+			t.idleConn[key] = pconns[0 : len(pconns)-1]
+		}
+		if !pconn.isBroken() {
+			return
+		}
+	}
+	return
+}
+
+func (t *Transport) dial(network, addr string) (c net.Conn, raddr string, ip *net.TCPAddr, err error) {
+	if t.Dial != nil {
+		ip, err = net.ResolveTCPAddr("tcp", addr)
+		if err!=nil {
+			return
+		}
+		c, err = t.Dial(network, addr)
+		raddr = addr
+		return
+	}
+	addri, err := net.ResolveTCPAddr("tcp", addr)
+	if err!=nil {
+		return
+	}
+	c, err = net.DialTCP("tcp", nil, addri)
+	raddr = addr
+	ip = addri
+	return
+}
+
+// getConn dials and creates a new persistConn to the target as
+// specified in the connectMethod.  This includes doing a proxy CONNECT
+// and/or setting up TLS.  If this doesn't return an error, the persistConn
+// is ready to write requests to.
+func (t *Transport) getConn(cm *connectMethod) (*persistConn, error) {
+	if pc := t.getIdleConn(cm); pc != nil {
+		return pc, nil
+	}
+
+	conn, raddr, ip, err := t.dial("tcp", cm.addr())
+	if err != nil {
+		if cm.proxyURL != nil {
+			err = fmt.Errorf("http: error connecting to proxy %s: %v", cm.proxyURL, err)
+		}
+		return nil, err
+	}
+
+	pa := cm.proxyAuth()
+
+	pconn := &persistConn{
+		t:        t,
+		cacheKey: cm.String(),
+		conn:     conn,
+		reqch:    make(chan requestAndChan, 50),
+		host: raddr,
+		ip: ip,
+	}
+
+	switch {
+	case cm.proxyURL == nil:
+		// Do nothing.
+	case cm.targetScheme == "http":
+		pconn.isProxy = true
+		if pa != "" {
+			pconn.mutateHeaderFunc = func(h http.Header) {
+				h.Set("Proxy-Authorization", pa)
+			}
+		}
+	case cm.targetScheme == "https":
+		connectReq := &http.Request{
+			Method: "CONNECT",
+			URL:    &url.URL{Opaque: cm.targetAddr},
+			Host:   cm.targetAddr,
+			Header: make(http.Header),
+		}
+		if pa != "" {
+			connectReq.Header.Set("Proxy-Authorization", pa)
+		}
+		connectReq.Write(conn)
+
+		// Read response.
+		// Okay to use and discard buffered reader here, because
+		// TLS server will not speak until spoken to.
+		br := bufio.NewReader(conn)
+		resp, err := http.ReadResponse(br, connectReq)
+		if err != nil {
+			conn.Close()
+			return nil, err
+		}
+		if resp.StatusCode != 200 {
+			f := strings.SplitN(resp.Status, " ", 2)
+			conn.Close()
+			return nil, errors.New(f[1])
+		}
+	}
+
+	if cm.targetScheme == "https" {
+		// Initiate TLS and check remote host name against certificate.
+		conn = tls.Client(conn, t.TLSClientConfig)
+		if err = conn.(*tls.Conn).Handshake(); err != nil {
+			return nil, err
+		}
+		if t.TLSClientConfig == nil || !t.TLSClientConfig.InsecureSkipVerify {
+			if err = conn.(*tls.Conn).VerifyHostname(cm.tlsHost()); err != nil {
+				return nil, err
+			}
+		}
+		pconn.conn = conn
+	}
+
+	pconn.br = bufio.NewReader(pconn.conn)
+	pconn.bw = bufio.NewWriter(pconn.conn)
+	go pconn.readLoop()
+	return pconn, nil
+}
+
+// useProxy returns true if requests to addr should use a proxy,
+// according to the NO_PROXY or no_proxy environment variable.
+// addr is always a canonicalAddr with a host and port.
+func useProxy(addr string) bool {
+	if len(addr) == 0 {
+		return true
+	}
+	host, _, err := net.SplitHostPort(addr)
+	if err != nil {
+		return false
+	}
+	if host == "localhost" {
+		return false
+	}
+	if ip := net.ParseIP(host); ip != nil {
+		if ip.IsLoopback() {
+			return false
+		}
+	}
+
+	no_proxy := getenvEitherCase("NO_PROXY")
+	if no_proxy == "*" {
+		return false
+	}
+
+	addr = strings.ToLower(strings.TrimSpace(addr))
+	if hasPort(addr) {
+		addr = addr[:strings.LastIndex(addr, ":")]
+	}
+
+	for _, p := range strings.Split(no_proxy, ",") {
+		p = strings.ToLower(strings.TrimSpace(p))
+		if len(p) == 0 {
+			continue
+		}
+		if hasPort(p) {
+			p = p[:strings.LastIndex(p, ":")]
+		}
+		if addr == p || (p[0] == '.' && (strings.HasSuffix(addr, p) || addr == p[1:])) {
+			return false
+		}
+	}
+	return true
+}
+
+// connectMethod is the map key (in its String form) for keeping persistent
+// TCP connections alive for subsequent HTTP requests.
+//
+// A connect method may be of the following types:
+//
+// Cache key form                Description
+// -----------------             -------------------------
+// ||http|foo.com                http directly to server, no proxy
+// ||https|foo.com               https directly to server, no proxy
+// http://proxy.com|https|foo.com  http to proxy, then CONNECT to foo.com
+// http://proxy.com|http           http to proxy, http to anywhere after that
+//
+// Note: no support to https to the proxy yet.
+//
+type connectMethod struct {
+	proxyURL     *url.URL // nil for no proxy, else full proxy URL
+	targetScheme string   // "http" or "https"
+	targetAddr   string   // Not used if proxy + http targetScheme (4th example in table)
+}
+
+func (ck *connectMethod) String() string {
+	proxyStr := ""
+	if ck.proxyURL != nil {
+		proxyStr = ck.proxyURL.String()
+	}
+	return strings.Join([]string{proxyStr, ck.targetScheme, ck.targetAddr}, "|")
+}
+
+// addr returns the first hop "host:port" to which we need to TCP connect.
+func (cm *connectMethod) addr() string {
+	if cm.proxyURL != nil {
+		return canonicalAddr(cm.proxyURL)
+	}
+	return cm.targetAddr
+}
+
+// tlsHost returns the host name to match against the peer's
+// TLS certificate.
+func (cm *connectMethod) tlsHost() string {
+	h := cm.targetAddr
+	if hasPort(h) {
+		h = h[:strings.LastIndex(h, ":")]
+	}
+	return h
+}
+
+// persistConn wraps a connection, usually a persistent one
+// (but may be used for non-keep-alive requests as well)
+type persistConn struct {
+	t        *Transport
+	cacheKey string // its connectMethod.String()
+	conn     net.Conn
+	br       *bufio.Reader       // from conn
+	bw       *bufio.Writer       // to conn
+	reqch    chan requestAndChan // written by roundTrip(); read by readLoop()
+	isProxy  bool
+
+	// mutateHeaderFunc is an optional func to modify extra
+	// headers on each outbound request before it's written. (the
+	// original Request given to RoundTrip is not modified)
+	mutateHeaderFunc func(http.Header)
+
+	lk                   sync.Mutex // guards numExpectedResponses and broken
+	numExpectedResponses int
+	broken               bool // an error has happened on this connection; marked broken so it's not reused.
+
+	host string
+	ip *net.TCPAddr
+}
+
+func (pc *persistConn) isBroken() bool {
+	pc.lk.Lock()
+	defer pc.lk.Unlock()
+	return pc.broken
+}
+
+var remoteSideClosedFunc func(error) bool // or nil to use default
+
+func remoteSideClosed(err error) bool {
+	if err == io.EOF {
+		return true
+	}
+	if remoteSideClosedFunc != nil {
+		return remoteSideClosedFunc(err)
+	}
+	return false
+}
+
+func (pc *persistConn) readLoop() {
+	alive := true
+	var lastbody io.ReadCloser // last response body, if any, read on this connection
+
+	for alive {
+		pb, err := pc.br.Peek(1)
+
+		pc.lk.Lock()
+		if pc.numExpectedResponses == 0 {
+			pc.closeLocked()
+			pc.lk.Unlock()
+			if len(pb) > 0 {
+				log.Printf("Unsolicited response received on idle HTTP channel starting with %q; err=%v",
+					string(pb), err)
+			}
+			return
+		}
+		pc.lk.Unlock()
+
+		rc := <-pc.reqch
+
+		// Advance past the previous response's body, if the
+		// caller hasn't done so.
+		if lastbody != nil {
+			lastbody.Close() // assumed idempotent
+			lastbody = nil
+		}
+		resp, err := http.ReadResponse(pc.br, rc.req)
+
+		if err != nil {
+			pc.close()
+		} else {
+			hasBody := rc.req.Method != "HEAD" && resp.ContentLength != 0
+			if rc.addedGzip && hasBody && resp.Header.Get("Content-Encoding") == "gzip" {
+				resp.Header.Del("Content-Encoding")
+				resp.Header.Del("Content-Length")
+				resp.ContentLength = -1
+				gzReader, zerr := gzip.NewReader(resp.Body)
+				if zerr != nil {
+					pc.close()
+					err = zerr
+				} else {
+					resp.Body = &readFirstCloseBoth{&discardOnCloseReadCloser{gzReader}, resp.Body}
+				}
+			}
+			resp.Body = &bodyEOFSignal{body: resp.Body}
+		}
+
+		if err != nil || resp.Close || rc.req.Close {
+			alive = false
+		}
+
+		hasBody := resp != nil && resp.ContentLength != 0
+		var waitForBodyRead chan bool
+		if alive {
+			if hasBody {
+				lastbody = resp.Body
+				waitForBodyRead = make(chan bool)
+				resp.Body.(*bodyEOFSignal).fn = func() {
+					if !pc.t.putIdleConn(pc) {
+						alive = false
+					}
+					waitForBodyRead <- true
+				}
+			} else {
+				// When there's no response body, we immediately
+				// reuse the TCP connection (putIdleConn), but
+				// we need to prevent ClientConn.Read from
+				// closing the Response.Body on the next
+				// loop, otherwise it might close the body
+				// before the client code has had a chance to
+				// read it (even though it'll just be 0, EOF).
+				lastbody = nil
+
+				if !pc.t.putIdleConn(pc) {
+					alive = false
+				}
+			}
+		}
+
+		rc.ch <- responseAndError{resp, err}
+
+		// Wait for the just-returned response body to be fully consumed
+		// before we race and peek on the underlying bufio reader.
+		if waitForBodyRead != nil {
+			<-waitForBodyRead
+		}
+	}
+}
+
+type responseAndError struct {
+	res *http.Response
+	err error
+}
+
+type requestAndChan struct {
+	req *http.Request
+	ch  chan responseAndError
+
+	// did the Transport (as opposed to the client code) add an
+	// Accept-Encoding gzip header? only if it we set it do
+	// we transparently decode the gzip.
+	addedGzip bool
+}
+
+func (pc *persistConn) roundTrip(req *transportRequest) (resp *http.Response, err error) {
+	if pc.mutateHeaderFunc != nil {
+		panic("mutateHeaderFunc not supported in modified Transport")
+		pc.mutateHeaderFunc(req.extraHeaders())
+	}
+
+	// Ask for a compressed version if the caller didn't set their
+	// own value for Accept-Encoding. We only attempted to
+	// uncompress the gzip stream if we were the layer that
+	// requested it.
+	requestedGzip := false
+	if !pc.t.DisableCompression && req.Header.Get("Accept-Encoding") == "" {
+		// Request gzip only, not deflate. Deflate is ambiguous and 
+		// not as universally supported anyway.
+		// See: http://www.gzip.org/zlib/zlib_faq.html#faq38
+		requestedGzip = true
+		req.extraHeaders().Set("Accept-Encoding", "gzip")
+	}
+
+	pc.lk.Lock()
+	pc.numExpectedResponses++
+	pc.lk.Unlock()
+
+	// orig: err = req.Request.write(pc.bw, pc.isProxy, req.extra)
+	if pc.isProxy {
+		err = req.Request.WriteProxy(pc.bw)
+	} else {
+		err = req.Request.Write(pc.bw)
+	}
+	if err != nil {
+		pc.close()
+		return
+	}
+	pc.bw.Flush()
+
+	ch := make(chan responseAndError, 1)
+	pc.reqch <- requestAndChan{req.Request, ch, requestedGzip}
+	re := <-ch
+	pc.lk.Lock()
+	pc.numExpectedResponses--
+	pc.lk.Unlock()
+
+	return re.res, re.err
+}
+
+func (pc *persistConn) close() {
+	pc.lk.Lock()
+	defer pc.lk.Unlock()
+	pc.closeLocked()
+}
+
+func (pc *persistConn) closeLocked() {
+	pc.broken = true
+	pc.conn.Close()
+	pc.mutateHeaderFunc = nil
+}
+
+var portMap = map[string]string{
+	"http":  "80",
+	"https": "443",
+}
+
+// canonicalAddr returns url.Host but always with a ":port" suffix
+func canonicalAddr(url *url.URL) string {
+	addr := url.Host
+	if !hasPort(addr) {
+		return addr + ":" + portMap[url.Scheme]
+	}
+	return addr
+}
+
+func responseIsKeepAlive(res *http.Response) bool {
+	// TODO: implement.  for now just always shutting down the connection.
+	return false
+}
+
+// bodyEOFSignal wraps a ReadCloser but runs fn (if non-nil) at most
+// once, right before the final Read() or Close() call returns, but after
+// EOF has been seen.
+type bodyEOFSignal struct {
+	body     io.ReadCloser
+	fn       func()
+	isClosed bool
+}
+
+func (es *bodyEOFSignal) Read(p []byte) (n int, err error) {
+	n, err = es.body.Read(p)
+	if es.isClosed && n > 0 {
+		panic("http: unexpected bodyEOFSignal Read after Close; see issue 1725")
+	}
+	if err == io.EOF && es.fn != nil {
+		es.fn()
+		es.fn = nil
+	}
+	return
+}
+
+func (es *bodyEOFSignal) Close() (err error) {
+	if es.isClosed {
+		return nil
+	}
+	es.isClosed = true
+	err = es.body.Close()
+	if err == nil && es.fn != nil {
+		es.fn()
+		es.fn = nil
+	}
+	return
+}
+
+type readFirstCloseBoth struct {
+	io.ReadCloser
+	io.Closer
+}
+
+func (r *readFirstCloseBoth) Close() error {
+	if err := r.ReadCloser.Close(); err != nil {
+		r.Closer.Close()
+		return err
+	}
+	if err := r.Closer.Close(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// discardOnCloseReadCloser consumes all its input on Close.
+type discardOnCloseReadCloser struct {
+	io.ReadCloser
+}
+
+func (d *discardOnCloseReadCloser) Close() error {
+	io.Copy(ioutil.Discard, d.ReadCloser) // ignore errors; likely invalid or already closed
+	return d.ReadCloser.Close()
+}
diff --git a/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/util.go b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/util.go
new file mode 100644
index 0000000000..af0eda1ee6
--- /dev/null
+++ b/Godeps/_workspace/src/github.com/elazarl/goproxy/transport/util.go
@@ -0,0 +1,15 @@
+package transport
+
+import (
+	"fmt"
+	"strings"
+)
+
+type badStringError struct {
+	what string
+	str  string
+}
+
+func (e *badStringError) Error() string { return fmt.Sprintf("%s %q", e.what, e.str) }
+
+func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastIndex(s, "]") }
diff --git a/test/images/goproxy/.gitignore b/test/images/goproxy/.gitignore
new file mode 100644
index 0000000000..663e1754bd
--- /dev/null
+++ b/test/images/goproxy/.gitignore
@@ -0,0 +1 @@
+goproxy
diff --git a/test/images/goproxy/Dockerfile b/test/images/goproxy/Dockerfile
new file mode 100644
index 0000000000..9aef17d92c
--- /dev/null
+++ b/test/images/goproxy/Dockerfile
@@ -0,0 +1,17 @@
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM scratch
+ADD goproxy goproxy
+ENTRYPOINT ["/goproxy"]
diff --git a/test/images/goproxy/Makefile b/test/images/goproxy/Makefile
new file mode 100644
index 0000000000..2f496ee798
--- /dev/null
+++ b/test/images/goproxy/Makefile
@@ -0,0 +1,15 @@
+all: push
+
+TAG = 0.1
+
+goproxy: goproxy.go
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./goproxy.go
+
+image: goproxy
+	docker build -t gcr.io/google_containers/goproxy:$(TAG) .
+
+push: image
+	gcloud docker push gcr.io/google_containers/goproxy:$(TAG)
+
+clean:
+	rm -f goproxy
diff --git a/test/images/goproxy/goproxy.go b/test/images/goproxy/goproxy.go
new file mode 100644
index 0000000000..b3b1f6e243
--- /dev/null
+++ b/test/images/goproxy/goproxy.go
@@ -0,0 +1,30 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"log"
+	"net/http"
+
+	"github.com/elazarl/goproxy"
+)
+
+func main() {
+	proxy := goproxy.NewProxyHttpServer()
+	proxy.Verbose = true
+	log.Fatal(http.ListenAndServe(":8080", proxy))
+}