Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC36E1885A for ; Tue, 1 Mar 2016 20:00:38 +0000 (UTC) Received: (qmail 98716 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98242 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 96693 invoked by uid 99); 1 Mar 2016 20:00:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 20:00:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9EE1E714D; Tue, 1 Mar 2016 20:00:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 01 Mar 2016 20:01:06 -0000 Message-Id: In-Reply-To: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> References: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372 Extract set_socket_options/2 function 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/e48282fe Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/e48282fe Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/e48282fe Branch: refs/heads/split_out_httpd_stack Commit: e48282fe3e3b05a946ca9c1bdea8c991ed93a382 Parents: 52c75f9 Author: ILYA Khlopotov Authored: Fri Feb 26 13:24:25 2016 -0800 Committer: ILYA Khlopotov Committed: Tue Mar 1 08:35:09 2016 -0800 ---------------------------------------------------------------------- src/couch_httpd_handler.erl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/e48282fe/src/couch_httpd_handler.erl ---------------------------------------------------------------------- diff --git a/src/couch_httpd_handler.erl b/src/couch_httpd_handler.erl index 69c47ee..245dd55 100644 --- a/src/couch_httpd_handler.erl +++ b/src/couch_httpd_handler.erl @@ -90,12 +90,7 @@ handle_request(Stack, MochiReq0) -> handle_request_int(Stack, MochiReq) -> Begin = os:timestamp(), - case Stack:socket_options() of - undefined -> - ok; - SocketOpts -> - ok = mochiweb_socket:setopts(MochiReq:get(socket), SocketOpts) - end. + set_socket_options(Stack, MochiReq), % for the path, use the raw path with the query string and fragment % removed, but URL quoting left intact @@ -485,3 +480,11 @@ ssl_options() -> end end, ServerOpts ++ ClientOpts. + +set_socket_options(Stack, MochiReq) -> + case Stack:socket_options() of + undefined -> + ok; + SocketOpts -> + ok = mochiweb_socket:setopts(MochiReq:get(socket), SocketOpts) + end.