forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 13:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Proper status handling for range requests.

Browse source
This commit is contained in:
Daniel A. Nagy 2015-05-12 21:51:34 +02:00
parent 3e113e2915
commit e030b2153a
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bzz/httpaccess.go
View file

@ -10,7 +10,6 @@ import (
"io" "io"
"net/http" "net/http"
"regexp" "regexp"
"strconv"
"sync" "sync"
"time" "time"
) )
@ -174,10 +173,6 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) {
// content type defaults to manifest // content type defaults to manifest
entry.ContentType = manifestType entry.ContentType = manifestType
} }
if entry.Status == 0 {
// status defaults to 200
entry.Status = 200
}
pathLen := len(entry.Path) pathLen := len(entry.Path)
if len(path) >= pathLen && path[:pathLen] == entry.Path && prefix <= pathLen { if len(path) >= pathLen && path[:pathLen] == entry.Path && prefix <= pathLen {
dpaLogger.Debugf("Swarm: \"%s\" matches \"%s\".", path, entry.Path) dpaLogger.Debugf("Swarm: \"%s\" matches \"%s\".", path, entry.Path)
@ -195,8 +190,9 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) {
reader := dpa.Retrieve(key) reader := dpa.Retrieve(key)
w.Header().Set("Content-Type", mimeType) w.Header().Set("Content-Type", mimeType)
dpaLogger.Debugf("Swarm: HTTP Status %d", status) dpaLogger.Debugf("Swarm: HTTP Status %d", status)
w.Header().Set("Content-Length", strconv.FormatInt(reader.Size(), 10)) if status > 0 {
w.WriteHeader(int(status)) w.WriteHeader(int(status))
}
dpaLogger.Debugf("Swarm: Reading %d bytes.", reader.Size()) dpaLogger.Debugf("Swarm: Reading %d bytes.", reader.Size())
http.ServeContent(w, r, name, time.Unix(0, 0), reader) http.ServeContent(w, r, name, time.Unix(0, 0), reader)
dpaLogger.Debugf("Swarm: Served %s as %s.", mimeType, uri) dpaLogger.Debugf("Swarm: Served %s as %s.", mimeType, uri)