make the authentication redirect URL configurable. setting it to the empty string yields the 0.11 behavior

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@957805 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 9 deletions

diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 1049aa9d..ef930147 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -745,14 +745,19 @@ error_headers(#httpd{mochi_req=MochiReq}=Req, Code, ErrorStr, ReasonStr) ->
                 % redirect to the session page.
                 case ErrorStr of
                 <<"unauthorized">> ->
-                    % if the accept header matches html, then do the redirect. else proceed as usual.
-                    case re:run(MochiReq:get_header_value("Accept"), "html", [{capture, none}]) of
-                    nomatch ->
-                        {Code, []};
-                    match ->
-                        UrlReturn = ?l2b(couch_util:url_encode(MochiReq:get(path))),
-                        UrlReason = ?l2b(couch_util:url_encode(ReasonStr)),
-                        {302, [{"Location", couch_httpd:absolute_uri(Req, <<"/_utils/session.html?return=",UrlReturn/binary,"&reason=",UrlReason/binary>>)}]}
+                    case couch_config:get("couch_httpd_auth", "authentication_redirect", nil) of
+                    nil -> {Code, []};
+                    AuthRedirect ->
+                        % if the accept header matches html, then do the redirect. else proceed as usual.
+                        case re:run(MochiReq:get_header_value("Accept"), "html", [{capture, none}]) of
+                        nomatch ->
+                            {Code, []};
+                        match ->
+                            AuthRedirectBin = ?l2b(AuthRedirect),
+                            UrlReturn = ?l2b(couch_util:url_encode(MochiReq:get(path))),
+                            UrlReason = ?l2b(couch_util:url_encode(ReasonStr)),
+                            {302, [{"Location", couch_httpd:absolute_uri(Req, <<AuthRedirectBin/binary,"?return=",UrlReturn/binary,"&reason=",UrlReason/binary>>)}]}
+                        end
                     end;
                 _Else ->
                     {Code, []}
diff --git a/src/couchdb/couch_rep_writer.erl b/src/couchdb/couch_rep_writer.erl
index 16fc1902..dd6396fd 100644
--- a/src/couchdb/couch_rep_writer.erl
+++ b/src/couchdb/couch_rep_writer.erl
@@ -78,7 +78,6 @@ write_bulk_docs(#http_db{headers = Headers} = Db, Docs) ->
         body = {[{new_edits, false}, {docs, JsonDocs}]},
         headers = couch_util:proplist_apply_field({"Content-Type", "application/json"}, [{"X-Couch-Full-Commit", "false"} | Headers])
     },
-    ?LOG_ERROR("headers ~p",[Request#http_db.headers]),
     ErrorsJson = case couch_rep_httpc:request(Request) of
     {FailProps} ->
         exit({target_error, couch_util:get_value(<<"error">>, FailProps)});