code review 4798046: undo CL 4808044 / 1bd754e69ce7

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
http://codereview.appspot.com/4808044

Committer: Russ Cox <rsc@golang.org>
»»»

[rsc, 2011-07-21 17:25:53]

Hello bradfitz (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg

[rsc, 2011-07-21 17:25:59]

*** Submitted as http://code.google.com/p/go/source/detail?r=52d566387339 ***

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
http://codereview.appspot.com/4808044

Committer: Russ Cox <rsc@golang.org>
»»»

TBR=bradfitz
CC=golang-dev
http://codereview.appspot.com/4798046

[bradfitz, 2011-07-21 17:28:37]

LGTM

On Thu, Jul 21, 2011 at 10:25 AM, <rsc@golang.org> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg
>
>
> Description:
> 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
> http://codereview.appspot.com/**4808044<http://codereview.appspot.com/4808044>
>
> Committer: Russ Cox <rsc@golang.org>
> »»»
>
> Please review this at
http://codereview.appspot.com/**4798046/<http://codereview.appspot.com/4798046/>
>
> Affected files:
>  M src/pkg/http/readrequest_test.**go
>  M src/pkg/http/request.go
>
>
> Index: src/pkg/http/readrequest_test.**go
> ==============================**==============================**=======
> --- a/src/pkg/http/readrequest_**test.go
> +++ b/src/pkg/http/readrequest_**test.go
> @@ -152,28 +152,6 @@
>                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) {
> Index: src/pkg/http/request.go
> ==============================**==============================**=======
> --- a/src/pkg/http/request.go
> +++ b/src/pkg/http/request.go
> @@ -548,11 +548,8 @@
>                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 @@
>        //      GET
http://www.google.com/index.**html<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")
>        }
>
>
>