undo CL 4808044 / 1bd754e69ce7

ServeMux depends on having a URL
in order to mux.  It might be that the right
fix is to have CONNECT handlers just not
look at URL.

««« original CL description
http: do not parse req.URL for CONNECT

CONNECT's argument is not a URL.

R=golang-dev, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/4808044

»»»

TBR=bradfitz
CC=golang-dev
https://golang.org/cl/4798046

diff --git a/src/pkg/http/readrequest_test.go b/src/pkg/http/readrequest_test.go
index adac86a47fb3bff4f1ff2a1372d5a263e4e5fc7f..79f8de70d3c8b61051c25efc596f504f4e0964e0 100644 (file)
--- a/src/pkg/http/readrequest_test.go
+++ b/src/pkg/http/readrequest_test.go
@@ -152,28 +152,6 @@ var reqTests = []reqTest{
                noBody,
                "parse : empty url",
        },
-
-       // CONNECT method.
-       {
-               "CONNECT proxy.example.com:443 HTTP/1.0\r\n" +
-                       "Host: proxy.example.com\r\n\r\n",
-
-               &Request{
-                       Method:        "CONNECT",
-                       RawURL:        "proxy.example.com:443",
-                       URL:           nil,
-                       Proto:         "HTTP/1.0",
-                       ProtoMajor:    1,
-                       ProtoMinor:    0,
-                       Close:         false,
-                       ContentLength: 0,
-                       Host:          "proxy.example.com",
-                       Form:          Values{},
-               },
-
-               noBody,
-               noError,
-       },
 }
 
 func TestReadRequest(t *testing.T) {

diff --git a/src/pkg/http/request.go b/src/pkg/http/request.go
index cfde345f1054b3832587467fb5892feca85ddadc..2917cc1e6e18d37d2f8b6eafabb9fd56dadab2f0 100644 (file)
--- a/src/pkg/http/request.go
+++ b/src/pkg/http/request.go
@@ -548,11 +548,8 @@ func ReadRequest(b *bufio.Reader) (req *Request, err os.Error) {
                return nil, &badStringError{"malformed HTTP version", req.Proto}
        }
 
-       isConnect := strings.ToUpper(req.Method) == "CONNECT"
-       if !isConnect {
-               if req.URL, err = ParseRequestURL(req.RawURL); err != nil {
-                       return nil, err
-               }
+       if req.URL, err = ParseRequestURL(req.RawURL); err != nil {
+               return nil, err
        }
 
        // Subsequent lines: Key: value.
@@ -569,9 +566,7 @@ func ReadRequest(b *bufio.Reader) (req *Request, err os.Error) {
        //      GET http://www.google.com/index.html HTTP/1.1
        //      Host: doesntmatter
        // the same.  In the second case, any Host line is ignored.
-       if !isConnect {
-               req.Host = req.URL.Host
-       }
+       req.Host = req.URL.Host
        if req.Host == "" {
                req.Host = req.Header.Get("Host")
        }