You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ry...@apache.org on 2013/03/13 22:10:46 UTC
[2/2] git commit: Check that the content-type from the RequestHeaders
is not undefined. Fixes COUCHDB-1697
Updated Branches:
refs/heads/1697-fix-if-non-match-cors 2cc063040 -> bc3ef5b8c
Check that the content-type from the RequestHeaders is not undefined. Fixes COUCHDB-1697
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bc3ef5b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bc3ef5b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bc3ef5b8
Branch: refs/heads/1697-fix-if-non-match-cors
Commit: bc3ef5b8cfd58b9d07868c1267c4099f994e53d8
Parents: 0235722
Author: Ryan Ramage <ry...@gmail.com>
Authored: Wed Mar 13 15:09:40 2013 -0600
Committer: Ryan Ramage <ry...@gmail.com>
Committed: Wed Mar 13 15:09:40 2013 -0600
----------------------------------------------------------------------
src/couchdb/couch_httpd_cors.erl | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bc3ef5b8/src/couchdb/couch_httpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl
index 1ce890e..ce41557 100644
--- a/src/couchdb/couch_httpd_cors.erl
+++ b/src/couchdb/couch_httpd_cors.erl
@@ -216,10 +216,14 @@ maybe_apply_cors_headers(CorsHeaders, RequestHeaders0) ->
% now we need to check whether the Content-Type valus is
% in ?SIMPLE_CONTENT_TYPE_VALUES and if it isn’t add Content-
% Type to to ExposedHeaders
- ContentType = string:to_lower(
- proplists:get_value("Content-Type", RequestHeaders0)),
-
- IncludeContentType = lists:member(ContentType, ?SIMPLE_CONTENT_TYPE_VALUES),
+ ContentType = proplists:get_value("Content-Type", RequestHeaders0),
+ IncludeContentType = case ContentType of
+ undefined ->
+ false;
+ _ ->
+ ContentType_ = string:to_lower(ContentType),
+ lists:member(ContentType_, ?SIMPLE_CONTENT_TYPE_VALUES)
+ end,
ExposedHeaders = case IncludeContentType of
false ->
lists:umerge(ExposedHeaders0, ["Content-Type"]);