net/http: simplify ParseHTTPVersion

Removes code. No need for atoi helper.

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/6285045

diff --git a/src/pkg/net/http/request.go b/src/pkg/net/http/request.go
index d442b13fdae19094ca0c70976aa7b714ef8e1222..a206b483a42c68389885dfaa54f10ae82348354f 100644 (file)
--- a/src/pkg/net/http/request.go
+++ b/src/pkg/net/http/request.go
@@ -19,6 +19,7 @@ import (
        "mime/multipart"
        "net/textproto"
        "net/url"
+       "strconv"
        "strings"
 )
 
@@ -369,36 +370,29 @@ func (req *Request) write(w io.Writer, usingProxy bool, extraHeaders Header) err
        return bw.Flush()
 }
 
-// Convert decimal at s[i:len(s)] to integer,
-// returning value, string position where the digits stopped,
-// and whether there was a valid number (digits, not too big).
-func atoi(s string, i int) (n, i1 int, ok bool) {
-       const Big = 1000000
-       if i >= len(s) || s[i] < '0' || s[i] > '9' {
-               return 0, 0, false
-       }
-       n = 0
-       for ; i < len(s) && '0' <= s[i] && s[i] <= '9'; i++ {
-               n = n*10 + int(s[i]-'0')
-               if n > Big {
-                       return 0, 0, false
-               }
-       }
-       return n, i, true
-}
-
 // ParseHTTPVersion parses a HTTP version string.
 // "HTTP/1.0" returns (1, 0, true).
 func ParseHTTPVersion(vers string) (major, minor int, ok bool) {
-       if len(vers) < 5 || vers[0:5] != "HTTP/" {
+       const Big = 1000000 // arbitrary upper bound
+       switch vers {
+       case "HTTP/1.1":
+               return 1, 1, true
+       case "HTTP/1.0":
+               return 1, 0, true
+       }
+       if !strings.HasPrefix(vers, "HTTP/") {
+               return 0, 0, false
+       }
+       dot := strings.Index(vers, ".")
+       if dot < 0 {
                return 0, 0, false
        }
-       major, i, ok := atoi(vers, 5)
-       if !ok || i >= len(vers) || vers[i] != '.' {
+       major, err := strconv.Atoi(vers[5:dot])
+       if err != nil || major < 0 || major > Big {
                return 0, 0, false
        }
-       minor, i, ok = atoi(vers, i+1)
-       if !ok || i != len(vers) {
+       minor, err = strconv.Atoi(vers[dot+1:])
+       if err != nil || minor < 0 || minor > Big {
                return 0, 0, false
        }
        return major, minor, true