fix build error

Author: hellojukay

Diff for: fs.go

@@ -14,7 +14,7 @@ import (
 	"log"
 	"mime"
 	"mime/multipart"
-	. "net/http"
+	"net/http"
 	"net/textproto"
 	"net/url"
 	"os"
@@ -107,11 +107,11 @@ type File interface {
 	Stat() (os.FileInfo, error)
 }
 
-func dirList(w ResponseWriter, r *Request, f File) {
+func dirList(w http.ResponseWriter, r *http.Request, f File) {
 	dirs, err := f.Readdir(-1)
 	if err != nil {
 		logf(r, "http: error reading directory: %v", err)
-		Error(w, "Error reading directory", StatusInternalServerError)
+		http.Error(w, "Error reading directory", http.StatusInternalServerError)
 		return
 	}
 	sort.Slice(dirs, func(i, j int) bool { return dirs[i].Name() < dirs[j].Name() })
@@ -163,7 +163,7 @@ func dirList(w ResponseWriter, r *Request, f File) {
 // ServeContent uses it to handle requests using If-Match, If-None-Match, or If-Range.
 //
 // Note that *os.File implements the io.ReadSeeker interface.
-func ServeContent(w ResponseWriter, req *Request, name string, modtime time.Time, content io.ReadSeeker) {
+func ServeContent(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
 	sizeFunc := func() (int64, error) {
 		size, err := content.Seek(0, io.SeekEnd)
 		if err != nil {
@@ -192,14 +192,14 @@ var errNoOverlap = errors.New("invalid range: failed to overlap")
 // if modtime.IsZero(), modtime is unknown.
 // content must be seeked to the beginning of the file.
 // The sizeFunc is called at most once. Its error, if any, is sent in the HTTP response.
-func serveContent(w ResponseWriter, r *Request, name string, modtime time.Time, sizeFunc func() (int64, error), content io.ReadSeeker) {
+func serveContent(w http.ResponseWriter, r *http.Request, name string, modtime time.Time, sizeFunc func() (int64, error), content io.ReadSeeker) {
 	setLastModified(w, modtime)
 	done, rangeReq := checkPreconditions(w, r, modtime)
 	if done {
 		return
 	}
 
-	code := StatusOK
+	code := http.StatusOK
 
 	// If Content-Type isn't set, use the file's extension to find it, but
 	// if the Content-Type is unset explicitly, do not sniff the type.
@@ -211,10 +211,10 @@ func serveContent(w ResponseWriter, r *Request, name string, modtime time.Time,
 			// read a chunk to decide between utf-8 text and binary
 			var buf [sniffLen]byte
 			n, _ := io.ReadFull(content, buf[:])
-			ctype = DetectContentType(buf[:n])
+			ctype = http.DetectContentType(buf[:n])
 			_, err := content.Seek(0, io.SeekStart) // rewind to output whole file
 			if err != nil {
-				Error(w, "seeker can't seek", StatusInternalServerError)
+				http.Error(w, "seeker can't seek", http.StatusInternalServerError)
 				return
 			}
 		}
@@ -225,7 +225,7 @@ func serveContent(w ResponseWriter, r *Request, name string, modtime time.Time,
 
 	size, err := sizeFunc()
 	if err != nil {
-		Error(w, err.Error(), StatusInternalServerError)
+		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
@@ -238,7 +238,7 @@ func serveContent(w ResponseWriter, r *Request, name string, modtime time.Time,
 			if err == errNoOverlap {
 				w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", size))
 			}
-			Error(w, err.Error(), StatusRequestedRangeNotSatisfiable)
+			http.Error(w, err.Error(), http.StatusRequestedRangeNotSatisfiable)
 			return
 		}
 		if sumRangesSize(ranges) > size {
@@ -263,15 +263,15 @@ func serveContent(w ResponseWriter, r *Request, name string, modtime time.Time,
 			// multipart responses."
 			ra := ranges[0]
 			if _, err := content.Seek(ra.start, io.SeekStart); err != nil {
-				Error(w, err.Error(), StatusRequestedRangeNotSatisfiable)
+				http.Error(w, err.Error(), http.StatusRequestedRangeNotSatisfiable)
 				return
 			}
 			sendSize = ra.length
-			code = StatusPartialContent
+			code = http.StatusPartialContent
 			w.Header().Set("Content-Range", ra.contentRange(size))
 		case len(ranges) > 1:
 			sendSize = rangesMIMESize(ranges, ctype, size)
-			code = StatusPartialContent
+			code = http.StatusPartialContent
 
 			pr, pw := io.Pipe()
 			mw := multipart.NewWriter(pw)
@@ -362,7 +362,7 @@ const (
 	condFalse
 )
 
-func checkIfMatch(w ResponseWriter, r *Request) condResult {
+func checkIfMatch(w http.ResponseWriter, r *http.Request) condResult {
 	im := r.Header.Get("If-Match")
 	if im == "" {
 		return condNone
@@ -392,12 +392,12 @@ func checkIfMatch(w ResponseWriter, r *Request) condResult {
 	return condFalse
 }
 
-func checkIfUnmodifiedSince(r *Request, modtime time.Time) condResult {
+func checkIfUnmodifiedSince(r *http.Request, modtime time.Time) condResult {
 	ius := r.Header.Get("If-Unmodified-Since")
 	if ius == "" || isZeroTime(modtime) {
 		return condNone
 	}
-	if t, err := ParseTime(ius); err == nil {
+	if t, err := http.ParseTime(ius); err == nil {
 		// The Date-Modified header truncates sub-second precision, so
 		// use mtime < t+1s instead of mtime <= t to check for unmodified.
 		if modtime.Before(t.Add(1 * time.Second)) {
@@ -408,7 +408,7 @@ func checkIfUnmodifiedSince(r *Request, modtime time.Time) condResult {
 	return condNone
 }
 
-func checkIfNoneMatch(w ResponseWriter, r *Request) condResult {
+func checkIfNoneMatch(w http.ResponseWriter, r *http.Request) condResult {
 	inm := get(r.Header, "If-None-Match")
 	if inm == "" {
 		return condNone
@@ -437,15 +437,15 @@ func checkIfNoneMatch(w ResponseWriter, r *Request) condResult {
 	return condTrue
 }
 
-func checkIfModifiedSince(r *Request, modtime time.Time) condResult {
+func checkIfModifiedSince(r *http.Request, modtime time.Time) condResult {
 	if r.Method != "GET" && r.Method != "HEAD" {
 		return condNone
 	}
 	ims := r.Header.Get("If-Modified-Since")
 	if ims == "" || isZeroTime(modtime) {
 		return condNone
 	}
-	t, err := ParseTime(ims)
+	t, err := http.ParseTime(ims)
 	if err != nil {
 		return condNone
 	}
@@ -457,7 +457,7 @@ func checkIfModifiedSince(r *Request, modtime time.Time) condResult {
 	return condTrue
 }
 
-func checkIfRange(w ResponseWriter, r *Request, modtime time.Time) condResult {
+func checkIfRange(w http.ResponseWriter, r *http.Request, modtime time.Time) condResult {
 	if r.Method != "GET" && r.Method != "HEAD" {
 		return condNone
 	}
@@ -478,7 +478,7 @@ func checkIfRange(w ResponseWriter, r *Request, modtime time.Time) condResult {
 	if modtime.IsZero() {
 		return condFalse
 	}
-	t, err := ParseTime(ir)
+	t, err := http.ParseTime(ir)
 	if err != nil {
 		return condFalse
 	}
@@ -495,13 +495,13 @@ func isZeroTime(t time.Time) bool {
 	return t.IsZero() || t.Equal(unixEpochTime)
 }
 
-func setLastModified(w ResponseWriter, modtime time.Time) {
+func setLastModified(w http.ResponseWriter, modtime time.Time) {
 	if !isZeroTime(modtime) {
-		w.Header().Set("Last-Modified", modtime.UTC().Format(TimeFormat))
+		w.Header().Set("Last-Modified", modtime.UTC().Format(http.TimeFormat))
 	}
 }
 
-func writeNotModified(w ResponseWriter) {
+func writeNotModified(w http.ResponseWriter) {
 	// RFC 7232 section 4.1:
 	// a sender SHOULD NOT generate representation metadata other than the
 	// above listed fields unless said metadata exists for the purpose of
@@ -513,19 +513,19 @@ func writeNotModified(w ResponseWriter) {
 	if h.Get("Etag") != "" {
 		delete(h, "Last-Modified")
 	}
-	w.WriteHeader(StatusNotModified)
+	w.WriteHeader(http.StatusNotModified)
 }
 
 // checkPreconditions evaluates request preconditions and reports whether a precondition
 // resulted in sending StatusNotModified or StatusPreconditionFailed.
-func checkPreconditions(w ResponseWriter, r *Request, modtime time.Time) (done bool, rangeHeader string) {
+func checkPreconditions(w http.ResponseWriter, r *http.Request, modtime time.Time) (done bool, rangeHeader string) {
 	// This function carefully follows RFC 7232 section 6.
 	ch := checkIfMatch(w, r)
 	if ch == condNone {
 		ch = checkIfUnmodifiedSince(r, modtime)
 	}
 	if ch == condFalse {
-		w.WriteHeader(StatusPreconditionFailed)
+		w.WriteHeader(http.StatusPreconditionFailed)
 		return true, ""
 	}
 	switch checkIfNoneMatch(w, r) {
@@ -534,7 +534,7 @@ func checkPreconditions(w ResponseWriter, r *Request, modtime time.Time) (done b
 			writeNotModified(w)
 			return true, ""
 		} else {
-			w.WriteHeader(StatusPreconditionFailed)
+			w.WriteHeader(http.StatusPreconditionFailed)
 			return true, ""
 		}
 	case condNone:
@@ -552,7 +552,7 @@ func checkPreconditions(w ResponseWriter, r *Request, modtime time.Time) (done b
 }
 
 // name is '/'-separated, not filepath.Separator.
-func serveFile(w ResponseWriter, r *Request, fs FileSystem, name string, redirect bool) {
+func serveFile(w http.ResponseWriter, r *http.Request, fs FileSystem, name string, redirect bool) {
 	const indexPage = "/index.html"
 
 	// redirect .../index.html to .../
@@ -566,15 +566,15 @@ func serveFile(w ResponseWriter, r *Request, fs FileSystem, name string, redirec
 	f, err := fs.Open(name)
 	if err != nil {
 		msg, code := toHTTPError(err)
-		Error(w, msg, code)
+		http.Error(w, msg, code)
 		return
 	}
 	defer f.Close()
 
 	d, err := f.Stat()
 	if err != nil {
 		msg, code := toHTTPError(err)
-		Error(w, msg, code)
+		http.Error(w, msg, code)
 		return
 	}
 
@@ -625,7 +625,7 @@ func serveFile(w ResponseWriter, r *Request, fs FileSystem, name string, redirec
 			writeNotModified(w)
 			return
 		}
-		w.Header().Set("Last-Modified", d.ModTime().UTC().Format(TimeFormat))
+		w.Header().Set("Last-Modified", d.ModTime().UTC().Format(http.TimeFormat))
 		dirList(w, r, f)
 		return
 	}
@@ -642,23 +642,23 @@ func serveFile(w ResponseWriter, r *Request, fs FileSystem, name string, redirec
 // all errors. We don't want to start leaking information in error messages.
 func toHTTPError(err error) (msg string, httpStatus int) {
 	if os.IsNotExist(err) {
-		return "404 page not found", StatusNotFound
+		return "404 page not found", http.StatusNotFound
 	}
 	if os.IsPermission(err) {
-		return "403 Forbidden", StatusForbidden
+		return "403 Forbidden", http.StatusForbidden
 	}
 	// Default:
-	return "500 Internal Server Error", StatusInternalServerError
+	return "500 Internal Server Error", http.StatusInternalServerError
 }
 
 // localRedirect gives a Moved Permanently response.
 // It does not convert relative paths to absolute paths like Redirect does.
-func localRedirect(w ResponseWriter, r *Request, newPath string) {
+func localRedirect(w http.ResponseWriter, r *http.Request, newPath string) {
 	if q := r.URL.RawQuery; q != "" {
 		newPath += "?" + q
 	}
 	w.Header().Set("Location", newPath)
-	w.WriteHeader(StatusMovedPermanently)
+	w.WriteHeader(http.StatusMovedPermanently)
 }
 
 // ServeFile replies to the request with the contents of the named
@@ -682,15 +682,15 @@ func localRedirect(w ResponseWriter, r *Request, newPath string) {
 // Outside of those two special cases, ServeFile does not use
 // r.URL.Path for selecting the file or directory to serve; only the
 // file or directory provided in the name argument is used.
-func ServeFile(w ResponseWriter, r *Request, name string) {
+func ServeFile(w http.ResponseWriter, r *http.Request, name string) {
 	log.Printf("request method %s\n", r.Method)
 	if containsDotDot(r.URL.Path) {
 		// Too many programs use r.URL.Path to construct the argument to
 		// serveFile. Reject the request under the assumption that happened
 		// here and ".." may not be wanted.
 		// Note that name might not contain "..", for example if code (still
 		// incorrectly) used filepath.Join(myDir, r.URL.Path).
-		Error(w, "invalid URL path", StatusBadRequest)
+		http.Error(w, "invalid URL path", http.StatusBadRequest)
 		return
 	}
 	dir, file := filepath.Split(name)
@@ -726,11 +726,11 @@ type fileHandler struct {
 // As a special case, the returned file server redirects any request
 // ending in "/index.html" to the same path, without the final
 // "index.html".
-func FileServer(root FileSystem) Handler {
+func FileServer(root FileSystem) http.Handler {
 	return &fileHandler{root}
 }
 
-func (f *fileHandler) ServeHTTP(w ResponseWriter, r *Request) {
+func (f *fileHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	upath := r.URL.Path
 	if !strings.HasPrefix(upath, "/") {
 		upath = "/" + upath
@@ -745,7 +745,7 @@ func (f *fileHandler) ServeHTTP(w ResponseWriter, r *Request) {
 }
 
 // upload file
-func uploadFile(w ResponseWriter, r *Request, fs FileSystem, name string) {
+func uploadFile(w http.ResponseWriter, r *http.Request, fs FileSystem, name string) {
 	r.ParseMultipartForm(32 << 20)
 	file, handler, err := r.FormFile("file")
 	if err != nil {
@@ -892,8 +892,8 @@ func sumRangesSize(ranges []httpRange) (size int64) {
 }
 
 // is nil, logging is done via the log package's standard logger.
-func logf(r *Request, format string, args ...interface{}) {
-	s, _ := r.Context().Value(ServerContextKey).(*Server)
+func logf(r *http.Request, format string, args ...interface{}) {
+	s, _ := r.Context().Value(http.ServerContextKey).(*http.Server)
 	if s != nil && s.ErrorLog != nil {
 		s.ErrorLog.Printf(format, args...)
 	} else {
@@ -914,7 +914,7 @@ var htmlReplacer = strings.NewReplacer(
 const sniffLen = 512
 
 // get is like Get, but key must already be in CanonicalHeaderKey form.
-func get(h Header, key string) string {
+func get(h http.Header, key string) string {
 	if v := h[key]; len(v) > 0 {
 		return v[0]
 	}