diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-12 20:19:07 +0500 |
|---|---|---|
| committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-12 20:19:07 +0500 |
| commit | 7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a (patch) | |
| tree | 069222c906cbf56feb003c806f60230cdbf81844 /api/channel.go | |
| parent | 6bf1203581a295e82116c23bc4fe2d9d29362cf4 (diff) | |
| parent | 6cb4f82ee5a17cd1d32ae19c266b78c2cfd604e6 (diff) | |
| download | chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.tar.gz chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.tar.bz2 chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/api/channel.go b/api/channel.go index ff5b0f8da..e97e08fc0 100644 --- a/api/channel.go +++ b/api/channel.go @@ -729,7 +729,6 @@ func getChannel(c *Context, w http.ResponseWriter, r *http.Request) { return } else { w.Header().Set(model.HEADER_ETAG_SERVER, data.Etag()) - w.Header().Set("Expires", "-1") w.Write([]byte(data.ToJson())) } } @@ -798,7 +797,6 @@ func getChannelExtraInfo(c *Context, w http.ResponseWriter, r *http.Request) { data := model.ChannelExtra{Id: channel.Id, Members: extraMembers, MemberCount: memberCount} w.Header().Set(model.HEADER_ETAG_SERVER, extraEtag) - w.Header().Set("Expires", "-1") w.Write([]byte(data.ToJson())) } } |