You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ii...@apache.org on 2016/06/02 17:52:30 UTC
[1/2] chttpd commit: updated refs/heads/master to 880dedc
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master f3d5d1b0c -> 880dedc94
Fix compilation warnings
COUCHDB-2730
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/a66760bd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/a66760bd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/a66760bd
Branch: refs/heads/master
Commit: a66760bd6b389c6fecd72388fa314163931c8c89
Parents: f3d5d1b
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Jun 2 10:38:16 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Jun 2 10:38:16 2016 -0700
----------------------------------------------------------------------
src/chttpd_db.erl | 2 +-
src/chttpd_external.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a66760bd/src/chttpd_db.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index 09cea5b..9bb94d9 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -555,7 +555,7 @@ db_req(#httpd{method='PUT',path_parts=[_,<<"_security">>],user_ctx=Ctx}=Req,
throw(Else)
end;
-db_req(#httpd{method='GET',path_parts=[_,<<"_security">>],user_ctx=Ctx}=Req, Db) ->
+db_req(#httpd{method='GET',path_parts=[_,<<"_security">>]}=Req, Db) ->
send_json(Req, fabric:get_security(Db));
db_req(#httpd{path_parts=[_,<<"_security">>]}=Req, _Db) ->
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a66760bd/src/chttpd_external.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_external.erl b/src/chttpd_external.erl
index 5e93cee..ec3afaa 100644
--- a/src/chttpd_external.erl
+++ b/src/chttpd_external.erl
@@ -122,7 +122,7 @@ get_db_info(#db{} = Db) ->
couch_db:get_db_info(Db).
-get_db_security(#db{main_pid = nil}=Db, #user_ctx{}=UserCtx) ->
+get_db_security(#db{main_pid = nil}=Db, #user_ctx{}) ->
fabric:get_security(Db);
get_db_security(#db{}=Db, #user_ctx{}) ->
couch_db:get_security(Db).
[2/2] chttpd commit: updated refs/heads/master to 880dedc
Posted by ii...@apache.org.
Merge remote branch 'cloudant:2730-fix-compilation-warnings'
This closes #124
Signed-off-by: ILYA Khlopotov <ii...@ca.ibm.com>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/880dedc9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/880dedc9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/880dedc9
Branch: refs/heads/master
Commit: 880dedc94ef8d6f6707328370dd78a787388ea9b
Parents: f3d5d1b a66760b
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Thu Jun 2 10:52:11 2016 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Thu Jun 2 10:52:11 2016 -0700
----------------------------------------------------------------------
src/chttpd_db.erl | 2 +-
src/chttpd_external.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------