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 003E010ABD for ; Thu, 13 Feb 2014 16:07:21 +0000 (UTC) Received: (qmail 838 invoked by uid 500); 13 Feb 2014 16:06:04 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 623 invoked by uid 500); 13 Feb 2014 16:05:57 -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 566 invoked by uid 99); 13 Feb 2014 16:05:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 16:05:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21F9E925CBE; Thu, 13 Feb 2014 16:05:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Thu, 13 Feb 2014 16:05:56 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/50] mochiweb commit: updated refs/heads/import-upstream to 8eb1f22 Updated Branches: refs/heads/import-upstream [created] 8eb1f220b Merge pull request #107 from djnym/gen_tcp_fix Make the acceptor crash optional. Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/56a32a0c Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/56a32a0c Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/56a32a0c Branch: refs/heads/import-upstream Commit: 56a32a0cc091b69374f35aa0787c36c7776ae816 Parents: 15bc558 4afdf42 Author: Bob Ippolito Authored: Sat Apr 13 16:10:53 2013 -0700 Committer: Bob Ippolito Committed: Sat Apr 13 16:10:53 2013 -0700 ---------------------------------------------------------------------- rebar.config | 4 +++- scripts/check_for_gen_tcp_fix.erl | 28 ++++++++++++++++++++++++++++ src/mochiweb_http.erl | 20 ++++++++++++-------- src/mochiweb_socket_server.erl | 1 + 4 files changed, 44 insertions(+), 9 deletions(-) ----------------------------------------------------------------------