summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-01 12:30:46 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-07-02 17:13:00 -0700
commit6b48dbe231cf1a793b2071cf8e4c751d13f5abad (patch)
treeac9181c0a04f41c891548dc0f6bb2f01f43ce1fa
parent5a597c96061712e1a08ddec2c15129ba2ed9e4f3 (diff)
downloadchat-6b48dbe231cf1a793b2071cf8e4c751d13f5abad.tar.gz
chat-6b48dbe231cf1a793b2071cf8e4c751d13f5abad.tar.bz2
chat-6b48dbe231cf1a793b2071cf8e4c751d13f5abad.zip
Added two possible options for removing blue bar error, will choose one later
-rw-r--r--api/user.go2
-rw-r--r--web/react/utils/client.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/user.go b/api/user.go
index 292d2b61b..7aad23ab6 100644
--- a/api/user.go
+++ b/api/user.go
@@ -469,7 +469,7 @@ func getMe(c *Context, w http.ResponseWriter, r *http.Request) {
} else {
result.Data.(*model.User).Sanitize(map[string]bool{})
w.Header().Set(model.HEADER_ETAG_SERVER, result.Data.(*model.User).Etag())
- w.Header().Set("Expires", "-1")
+ w.Header().Set("Cache-Control", "max-age=0, public") // should refresh
w.Write([]byte(result.Data.(*model.User).ToJson()))
return
}
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index a43e4eec5..dd835e863 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -287,7 +287,7 @@ module.exports.getMeSynchronous = function(success, error) {
if (success) success(data, textStatus, xhr);
},
error: function(xhr, status, err) {
- if (error) {
+ if (xhr.status != 200 && error) {
e = handleError("getMeSynchronous", xhr, status, err);
error(e);
};