diff options
| author | chrislu <chris.lu@gmail.com> | 2024-09-09 09:07:55 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-09-09 09:07:58 -0700 |
| commit | 43d9f68219537722b121235b1e07ca8a86a02a57 (patch) | |
| tree | 87b687d316b2609cb74e2994d8ce4a9af85ba78f | |
| parent | d8e18a8eb7746e69b00b6a84e7704d95d8eddb5f (diff) | |
| download | seaweedfs-43d9f68219537722b121235b1e07ca8a86a02a57.tar.xz seaweedfs-43d9f68219537722b121235b1e07ca8a86a02a57.zip | |
more consistent server header for s3 apis
| -rw-r--r-- | weed/s3api/stats.go | 3 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers.go | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/weed/s3api/stats.go b/weed/s3api/stats.go index ee52da11d..cd04b9970 100644 --- a/weed/s3api/stats.go +++ b/weed/s3api/stats.go @@ -3,6 +3,7 @@ package s3api import ( "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" stats_collect "github.com/seaweedfs/seaweedfs/weed/stats" + "github.com/seaweedfs/seaweedfs/weed/util" "net/http" "strconv" "time" @@ -11,7 +12,7 @@ import ( func track(f http.HandlerFunc, action string) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { bucket, _ := s3_constants.GetBucketAndObject(r) - w.Header().Set("Server", "SeaweedFS S3") + w.Header().Set("Server", "SeaweedFS "+util.VERSION) recorder := stats_collect.NewStatusResponseWriter(w) start := time.Now() f(recorder, r) diff --git a/weed/server/filer_server_handlers.go b/weed/server/filer_server_handlers.go index 33f63f65a..69774ce27 100644 --- a/weed/server/filer_server_handlers.go +++ b/weed/server/filer_server_handlers.go @@ -75,7 +75,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) { return } - w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+util.VERSION) switch r.Method { case http.MethodGet, http.MethodHead: @@ -163,7 +163,7 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque return } - w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+util.VERSION) switch r.Method { case http.MethodGet, http.MethodHead: @@ -224,7 +224,7 @@ func (fs *FilerServer) maybeCheckJwtAuthorization(r *http.Request, isWrite bool) } func (fs *FilerServer) filerHealthzHandler(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION) + w.Header().Set("Server", "SeaweedFS "+util.VERSION) if _, err := fs.filer.Store.FindEntry(context.Background(), filer.TopicsDir); err != nil && err != filer_pb.ErrNotFound { glog.Warningf("filerHealthzHandler FindEntry: %+v", err) w.WriteHeader(http.StatusServiceUnavailable) |