diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2016-12-26 02:14:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-26 02:14:09 -0800 |
| commit | f7ff98c747d2d3a4358fc0de8f0de78706ce9dc7 (patch) | |
| tree | a73f4e52540b8cb15f54e35ec1f2a35c1e92e36f | |
| parent | 6b5867ce9d5d4c3b38df963acaf609a607fc3fd3 (diff) | |
| parent | 5b18cf09e7643d08f28f0e963c56474eafb35747 (diff) | |
| download | seaweedfs-f7ff98c747d2d3a4358fc0de8f0de78706ce9dc7.tar.xz seaweedfs-f7ff98c747d2d3a4358fc0de8f0de78706ce9dc7.zip | |
Merge pull request #424 from listeng/master
Return json data when content-type is "application/json"
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index bf95e37b9..5bd59b23f 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -74,7 +74,12 @@ func (fs *FilerServer) listDirectoryHandler(w http.ResponseWriter, r *http.Reque lastFileName, shouldDisplayLoadMore, } - ui.StatusTpl.Execute(w, args) + + if strings.ToLower(r.Header.Get("Content-Type")) == "application/json" { + writeJsonQuiet(w, r, http.StatusOK, args) + } else { + ui.StatusTpl.Execute(w, args) + } } func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) { |