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 AA1D318386 for ; Thu, 3 Mar 2016 20:06:07 +0000 (UTC) Received: (qmail 63539 invoked by uid 500); 3 Mar 2016 20:06:07 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 63406 invoked by uid 500); 3 Mar 2016 20:06:07 -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 63218 invoked by uid 99); 3 Mar 2016 20:06:07 -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; Thu, 03 Mar 2016 20:06:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B3AAE78FA; Thu, 3 Mar 2016 20:06:07 +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: Thu, 03 Mar 2016 20:06:10 -0000 Message-Id: <81d158da4f6e4ca28f54023233618796@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] chttpd commit: updated refs/heads/master to ad754a3 Merge remote branch 'github/pr/101' This closes #101 Signed-off-by: ILYA Khlopotov Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/ad754a38 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/ad754a38 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/ad754a38 Branch: refs/heads/master Commit: ad754a387aa884daa0e3c1ff255f51e18ba75c0e Parents: 41ac33a 02bdd77 Author: ILYA Khlopotov Authored: Thu Mar 3 12:01:54 2016 -0800 Committer: ILYA Khlopotov Committed: Thu Mar 3 12:01:54 2016 -0800 ---------------------------------------------------------------------- src/chttpd.erl | 29 ++++++++++++++--------------- src/chttpd_cors.erl | 41 +++++++++++++++++++++++++++++++++-------- src/chttpd_external.erl | 9 ++++----- 3 files changed, 51 insertions(+), 28 deletions(-) ----------------------------------------------------------------------