aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/http/request.go
diff options
context:
space:
mode:
authorDavid Symonds <dsymonds@golang.org>2011-03-01 22:38:18 +1100
committerDavid Symonds <dsymonds@golang.org>2011-03-01 22:38:18 +1100
commit7eaecb89157f8e9bd9abaacf74a9a7084acf36fb (patch)
tree60cbddee53f8c4f6a085d550c957792808d0b15b /src/pkg/http/request.go
parent4b0ecd3f49bc003ec19df69be51eee585032d30a (diff)
downloadgo-7eaecb89157f8e9bd9abaacf74a9a7084acf36fb.tar.xz
http: export parseHTTPVersion.
R=rsc, adg CC=golang-dev https://golang.org/cl/4244045
Diffstat (limited to 'src/pkg/http/request.go')
-rw-r--r--src/pkg/http/request.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/http/request.go b/src/pkg/http/request.go
index f7ea758bb4..0fd5df4e3b 100644
--- a/src/pkg/http/request.go
+++ b/src/pkg/http/request.go
@@ -315,8 +315,9 @@ func atoi(s string, i int) (n, i1 int, ok bool) {
return n, i, true
}
-// Parse HTTP version: "HTTP/1.2" -> (1, 2, true).
-func parseHTTPVersion(vers string) (int, int, bool) {
+// ParseHTTPVersion parses a HTTP version string.
+// "HTTP/1.2" returns (1, 2, true).
+func ParseHTTPVersion(vers string) (major, minor int, ok bool) {
if len(vers) < 5 || vers[0:5] != "HTTP/" {
return 0, 0, false
}
@@ -324,7 +325,6 @@ func parseHTTPVersion(vers string) (int, int, bool) {
if !ok || i >= len(vers) || vers[i] != '.' {
return 0, 0, false
}
- var minor int
minor, i, ok = atoi(vers, i+1)
if !ok || i != len(vers) {
return 0, 0, false
@@ -416,7 +416,7 @@ func ReadRequest(b *bufio.Reader) (req *Request, err os.Error) {
}
req.Method, req.RawURL, req.Proto = f[0], f[1], f[2]
var ok bool
- if req.ProtoMajor, req.ProtoMinor, ok = parseHTTPVersion(req.Proto); !ok {
+ if req.ProtoMajor, req.ProtoMinor, ok = ParseHTTPVersion(req.Proto); !ok {
return nil, &badStringError{"malformed HTTP version", req.Proto}
}