couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [01/10] git commit: updated refs/heads/fauxton-view-improvements to 2171e16
Date Thu, 23 May 2013 15:42:23 GMT
Updated Branches:
  refs/heads/fauxton-view-improvements 8babf7e93 -> 2171e1612 (forced update)


Save the auth values so if the AuthSession cookie has passed the Time left threshold it gets
updated


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1122401b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1122401b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1122401b

Branch: refs/heads/fauxton-view-improvements
Commit: 1122401b76d9c039f4cbc10a6a43bdca7edea3e8
Parents: 7a93945
Author: Martin Higham <martin@ocastalabs.com>
Authored: Wed May 22 10:43:40 2013 +0100
Committer: Martin Higham <martin@ocastalabs.com>
Committed: Wed May 22 10:43:40 2013 +0100

----------------------------------------------------------------------
 src/couchdb/couch_httpd.erl         |    3 ++-
 src/couchdb/couch_httpd_rewrite.erl |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1122401b/src/couchdb/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 66d28d2..7c89d0e 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -316,7 +316,8 @@ handle_request_int(MochiReq, DefaultFun,
         design_url_handlers = DesignUrlHandlers,
         default_fun = DefaultFun,
         url_handlers = UrlHandlers,
-        user_ctx = erlang:erase(pre_rewrite_user_ctx)
+        user_ctx = erlang:erase(pre_rewrite_user_ctx),
+        auth = erlang:erase(pre_rewrite_auth)
     },
 
     HandlerFun = couch_util:dict_find(HandlerKey, UrlHandlers, DefaultFun),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1122401b/src/couchdb/couch_httpd_rewrite.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd_rewrite.erl b/src/couchdb/couch_httpd_rewrite.erl
index 232d2a3..1187397 100644
--- a/src/couchdb/couch_httpd_rewrite.erl
+++ b/src/couchdb/couch_httpd_rewrite.erl
@@ -198,8 +198,11 @@ handle_rewrite_req(#httpd{
                 design_url_handlers = DesignUrlHandlers,
                 default_fun = DefaultFun,
                 url_handlers = UrlHandlers,
-                user_ctx = UserCtx
+                user_ctx = UserCtx,
+               auth = Auth
             } = Req,
+
+            erlang:put(pre_rewrite_auth, Auth),
             erlang:put(pre_rewrite_user_ctx, UserCtx),
             couch_httpd:handle_request_int(MochiReq1, DefaultFun,
                     UrlHandlers, DbUrlHandlers, DesignUrlHandlers)


Mime
View raw message