summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/user.go2
-rw-r--r--web/react/utils/client.jsx4
2 files changed, 3 insertions, 3 deletions
diff --git a/api/user.go b/api/user.go
index 7aad23ab6..292d2b61b 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("Cache-Control", "max-age=0, public") // should refresh
+ w.Header().Set("Expires", "-1")
w.Write([]byte(result.Data.(*model.User).ToJson()))
return
}
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index dd835e863..4433df5cf 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -280,14 +280,14 @@ module.exports.getMeSynchronous = function(success, error) {
url: "/api/v1/users/me",
dataType: 'json',
contentType: 'application/json',
- cache: false,
+ //cache: false,
type: 'GET',
success: function(data, textStatus, xhr) {
current_user = data;
if (success) success(data, textStatus, xhr);
},
error: function(xhr, status, err) {
- if (xhr.status != 200 && error) {
+ if (/*xhr.status != 200 && */error) {
e = handleError("getMeSynchronous", xhr, status, err);
error(e);
};