You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2014/09/12 20:58:29 UTC
[1/2] chttpd commit: updated refs/heads/2328-bug-cors-show-update to
0e1af4d
Repository: couchdb-chttpd
Updated Branches:
refs/heads/2328-bug-cors-show-update [created] 0e1af4dde
Make parse_external_response work with binaries and lists
COUCHDB-2328
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/359503dc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/359503dc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/359503dc
Branch: refs/heads/2328-bug-cors-show-update
Commit: 359503dc1c0caf4e36b4e9130d58d0c450d813c9
Parents: 6577ad1
Author: Russell Branca <ch...@apache.org>
Authored: Wed Sep 10 15:18:57 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Thu Sep 11 14:39:07 2014 -0700
----------------------------------------------------------------------
src/chttpd_external.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/359503dc/src/chttpd_external.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_external.erl b/src/chttpd_external.erl
index d86e13f..d77690d 100644
--- a/src/chttpd_external.erl
+++ b/src/chttpd_external.erl
@@ -153,7 +153,7 @@ parse_external_response({Response}) ->
};
{<<"headers">>, {Headers}} ->
NewHeaders = lists:map(fun({Header, HVal}) ->
- {binary_to_list(Header), binary_to_list(HVal)}
+ {couch_util:to_list(Header), couch_util:to_list(HVal)}
end, Headers),
Args#extern_resp_args{headers=NewHeaders};
_ -> % unknown key
[2/2] chttpd commit: updated refs/heads/2328-bug-cors-show-update to
0e1af4d
Posted by ch...@apache.org.
Add CORS headers to chttpd_external:send_external_response
COUCHDB-2328
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/0e1af4dd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/0e1af4dd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/0e1af4dd
Branch: refs/heads/2328-bug-cors-show-update
Commit: 0e1af4dde8c1432614517fc2d98517bc84f45ec1
Parents: 359503d
Author: Russell Branca <ch...@apache.org>
Authored: Wed Sep 10 15:20:40 2014 -0700
Committer: Russell Branca <ch...@apache.org>
Committed: Thu Sep 11 14:39:22 2014 -0700
----------------------------------------------------------------------
src/chttpd_external.erl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/0e1af4dd/src/chttpd_external.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_external.erl b/src/chttpd_external.erl
index d77690d..38932d1 100644
--- a/src/chttpd_external.erl
+++ b/src/chttpd_external.erl
@@ -124,11 +124,12 @@ send_external_response(Req, Response) ->
json = Json
} = parse_external_response(Response),
Headers1 = default_or_content_type(CType, Headers),
+ Headers2 = chttpd_cors:headers(Req, Headers1),
case Json of
nil ->
- chttpd:send_response(Req, Code, Headers1, Data);
+ chttpd:send_response(Req, Code, Headers2, Data);
Json ->
- chttpd:send_json(Req, Code, Headers1, Json)
+ chttpd:send_json(Req, Code, Headers2, Json)
end.
parse_external_response({Response}) ->