You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/28 14:00:05 UTC
[42/50] chttpd commit: updated refs/heads/master to 58020ab
Update chttpd_external with s/couch_httpd/chttpd/
Switch to using chttpd:send_{json,response} from chttpd_external so
that _show and _update functions are properly sending CORS headers.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/a456f88c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/a456f88c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/a456f88c
Branch: refs/heads/master
Commit: a456f88c2265e895421f131c504f1bb269edba99
Parents: 71d9709
Author: Russell Branca <ch...@gmail.com>
Authored: Fri Mar 28 10:25:46 2014 -0700
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 31 11:55:11 2014 +0100
----------------------------------------------------------------------
src/chttpd_external.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a456f88c/src/chttpd_external.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_external.erl b/src/chttpd_external.erl
index cfd13b2..d86e13f 100644
--- a/src/chttpd_external.erl
+++ b/src/chttpd_external.erl
@@ -126,9 +126,9 @@ send_external_response(Req, Response) ->
Headers1 = default_or_content_type(CType, Headers),
case Json of
nil ->
- couch_httpd:send_response(Req, Code, Headers1, Data);
+ chttpd:send_response(Req, Code, Headers1, Data);
Json ->
- couch_httpd:send_json(Req, Code, Headers1, Json)
+ chttpd:send_json(Req, Code, Headers1, Json)
end.
parse_external_response({Response}) ->