code review 4607052: os.Error API: don't export os.ErrorString, use os.NewEr...

src/pkg/http/request.go

 // Copyright 2009 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 Request reading and parsing.
 
 // Package http implements parsing of HTTP requests, replies, and URLs and
 // provides an extensible HTTP server and a basic HTTP client.
 package http
 
@@ skipping 17 matching lines @@
 const (
         maxLineLength    = 4096 // assumed <= bufio.defaultBufSize
         maxValueLength   = 4096
         maxHeaderLines   = 1024
         chunkSize        = 4 << 10  // 4 KB chunks
         defaultMaxMemory = 32 << 20 // 32 MB
 )
 
 // ErrMissingFile is returned by FormFile when the provided file field name
 // is either not present in the request or not a file field.
-var ErrMissingFile = os.ErrorString("http: no such file")
+var ErrMissingFile = os.NewError("http: no such file")
 
 // HTTP request parsing errors.
 type ProtocolError struct {
-        os.ErrorString
-}
+        ErrorString string
+}
+
+func (err *ProtocolError) String() string { return err.ErrorString }
 
 var (
         ErrLineTooLong          = &ProtocolError{"header line too long"}
         ErrHeaderTooLong        = &ProtocolError{"header too long"}
         ErrShortBody            = &ProtocolError{"entity body too short"}
         ErrNotSupported         = &ProtocolError{"feature not supported"}
         ErrUnexpectedTrailer    = &ProtocolError{"trailer header without chunked transfer encoding"}
         ErrMissingContentLength = &ProtocolError{"missing ContentLength in HEAD response"}
         ErrNotMultipart         = &ProtocolError{"request Content-Type isn't multipart/form-data"}
         ErrMissingBoundary      = &ProtocolError{"no multipart boundary param Content-Type"}
@@ skipping 643 matching lines @@
         if r.Form != nil {
                 return
         }
 
         r.Form = make(Values)
         if r.URL != nil {
                 err = parseQuery(r.Form, r.URL.RawQuery)
         }
         if r.Method == "POST" {
                 if r.Body == nil {
-                        return os.ErrorString("missing form body")
+                        return os.NewError("missing form body")
                 }
                 ct := r.Header.Get("Content-Type")
                 switch strings.Split(ct, ";", 2)[0] {
                 case "text/plain", "application/x-www-form-urlencoded", "":
                         const maxFormSize = int64(10 << 20) // 10 MB is a lot of text.
                         b, e := ioutil.ReadAll(io.LimitReader(r.Body, maxFormSize+1))
                         if e != nil {
                                 if err == nil {
                                         err = e
                                 }
@@ skipping 90 matching lines @@
 func (r *Request) expectsContinue() bool {
         return strings.ToLower(r.Header.Get("Expect")) == "100-continue"
 }
 
 func (r *Request) wantsHttp10KeepAlive() bool {
         if r.ProtoMajor != 1 || r.ProtoMinor != 0 {
                 return false
         }
         return strings.Contains(strings.ToLower(r.Header.Get("Connection")), "keep-alive")
 }