couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iil...@apache.org
Subject [12/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372
Date Tue, 01 Mar 2016 20:00:45 GMT
Remove equivalent copy of etag_match/2 from original


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/36f13a11
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/36f13a11
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/36f13a11

Branch: refs/heads/split_out_httpd_stack
Commit: 36f13a1102befcfebf9d662547be316a1a84e4c8
Parents: 8e24353
Author: ILYA Khlopotov <iilyak@ca.ibm.com>
Authored: Thu Feb 25 11:13:57 2016 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
Committed: Tue Mar 1 08:35:07 2016 -0800

----------------------------------------------------------------------
 src/couch_httpd_original.erl | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/36f13a11/src/couch_httpd_original.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_original.erl b/src/couch_httpd_original.erl
index b84df74..95a7c6f 100644
--- a/src/couch_httpd_original.erl
+++ b/src/couch_httpd_original.erl
@@ -19,7 +19,7 @@
 -export([verify_is_server_admin/1,error_info/1]).
 -export([make_fun_spec_strs/1]).
 
--export([etag_match/2, etag_maybe/2]).
+-export([etag_maybe/2]).
 
 -export([start_chunked_response/3,send_chunk/2]).
 -export([start_response_length/4, start_response/3]).
@@ -66,7 +66,8 @@
     absolute_uri/2,
     body/1,
     log_request/2,
-    etag_respond/3
+    etag_respond/3,
+    etag_match/2
 ]).
 
 -define(HANDLER_NAME_IN_MODULE_POS, 6).
@@ -476,14 +477,6 @@ host_for_request(#httpd{mochi_req=MochiReq}) ->
     end.
 
 
-etag_match(Req, CurrentEtag) when is_binary(CurrentEtag) ->
-    etag_match(Req, binary_to_list(CurrentEtag));
-
-etag_match(Req, CurrentEtag) ->
-    EtagsToMatch = string:tokens(
-        header_value(Req, "If-None-Match", ""), ", "),
-    lists:member(CurrentEtag, EtagsToMatch).
-
 etag_maybe(Req, RespFun) ->
     try
         RespFun()


Mime
View raw message