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

Support HTTP HEAD requests, always add Content-Length HTTP header.

Browse source
This commit is contained in:
Daniel A. Nagy 2015-05-12 21:06:29 +02:00
parent 20feba262c
commit 3e113e2915
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bzz/httpaccess.go
View file

@ -10,6 +10,7 @@ import (
"io" "io"
"net/http" "net/http"
"regexp" "regexp"
"strconv"
"sync" "sync"
"time" "time"
) )
@ -113,7 +114,7 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) {
} else { } else {
http.Error(w, "No POST to "+uri+" allowed.", http.StatusBadRequest) http.Error(w, "No POST to "+uri+" allowed.", http.StatusBadRequest)
} }
case r.Method == "GET": case r.Method == "GET" || r.Method == "HEAD":
if uriMatcher.MatchString(uri) { if uriMatcher.MatchString(uri) {
dpaLogger.Debugf("Swarm: Raw GET request %s received", uri) dpaLogger.Debugf("Swarm: Raw GET request %s received", uri)
name := uri[5:69] name := uri[5:69]
@ -191,10 +192,11 @@ func handler(w http.ResponseWriter, r *http.Request, dpa *DPA) {
http.Error(w, "Object "+uri+" not found.", http.StatusNotFound) http.Error(w, "Object "+uri+" not found.", http.StatusNotFound)
break MANIFEST_RESOLUTION break MANIFEST_RESOLUTION
} else if mimeType != manifestType { } else if mimeType != manifestType {
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))
w.WriteHeader(int(status)) w.WriteHeader(int(status))
reader := dpa.Retrieve(key)
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)