libgo: Update to current Go library.

[pf3gnuchains/gcc-fork.git] / libgo / go / http / fs.go

diff --git a/libgo/go/http/fs.go b/libgo/go/http/fs.go
index 8b5c477..c5efffc 100644 (file)
--- a/libgo/go/http/fs.go
+++ b/libgo/go/http/fs.go
@@ -72,7 +72,7 @@ func serveFile(w ResponseWriter, r *Request, name string, redirect bool) {
                return
        }
 
-       f, err := os.Open(name, os.O_RDONLY, 0)
+       f, err := os.Open(name)
        if err != nil {
                // TODO expose actual error?
                NotFound(w, r)
@@ -113,7 +113,7 @@ func serveFile(w ResponseWriter, r *Request, name string, redirect bool) {
        // use contents of index.html for directory, if present
        if d.IsDirectory() {
                index := name + filepath.FromSlash(indexPage)
-               ff, err := os.Open(index, os.O_RDONLY, 0)
+               ff, err := os.Open(index)
                if err == nil {
                        defer ff.Close()
                        dd, err := ff.Stat()
@@ -134,21 +134,23 @@ func serveFile(w ResponseWriter, r *Request, name string, redirect bool) {
        size := d.Size
        code := StatusOK
 
-       // use extension to find content type.
-       ext := filepath.Ext(name)
-       if ctype := mime.TypeByExtension(ext); ctype != "" {
-               w.Header().Set("Content-Type", ctype)
-       } else {
-               // read first chunk to decide between utf-8 text and binary
-               var buf [1024]byte
-               n, _ := io.ReadFull(f, buf[:])
-               b := buf[:n]
-               if isText(b) {
-                       w.Header().Set("Content-Type", "text-plain; charset=utf-8")
-               } else {
-                       w.Header().Set("Content-Type", "application/octet-stream") // generic binary
+       // If Content-Type isn't set, use the file's extension to find it.
+       if w.Header().Get("Content-Type") == "" {
+               ctype := mime.TypeByExtension(filepath.Ext(name))
+               if ctype == "" {
+                       // read a chunk to decide between utf-8 text and binary
+                       var buf [1024]byte
+                       n, _ := io.ReadFull(f, buf[:])
+                       b := buf[:n]
+                       if isText(b) {
+                               ctype = "text-plain; charset=utf-8"
+                       } else {
+                               // generic binary
+                               ctype = "application/octet-stream"
+                       }
+                       f.Seek(0, os.SEEK_SET) // rewind to output whole file
                }
-               f.Seek(0, 0) // rewind to output whole file
+               w.Header().Set("Content-Type", ctype)
        }
 
        // handle Content-Range header.
@@ -163,7 +165,7 @@ func serveFile(w ResponseWriter, r *Request, name string, redirect bool) {
        }
        if len(ranges) == 1 {
                ra := ranges[0]
-               if _, err := f.Seek(ra.start, 0); err != nil {
+               if _, err := f.Seek(ra.start, os.SEEK_SET); err != nil {
                        Error(w, err.String(), StatusRequestedRangeNotSatisfiable)
                        return
                }