From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 29 21:42:29 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6C546893;
 Thu, 29 Nov 2012 21:42:29 +0000 (UTC)
 (envelope-from olgeni@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3744B8FC12;
 Thu, 29 Nov 2012 21:42:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qATLgT8Z060916;
 Thu, 29 Nov 2012 21:42:29 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qATLgTwG060914;
 Thu, 29 Nov 2012 21:42:29 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201211292142.qATLgTwG060914@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Thu, 29 Nov 2012 21:42:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307980 - in head/lang/erlang: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Nov 2012 21:42:29 -0000

Author: olgeni
Date: Thu Nov 29 21:42:28 2012
New Revision: 307980
URL: http://svnweb.freebsd.org/changeset/ports/307980

Log:
  Fix timeout issue in ssl_connection.erl.
  
  Due to a missing function clause to handle the ssl:ssl_accept-timeout,
  it was treated as a canceled timeout.
  
  Submitted by:	Ingela Anderton Andin on erlang-bugs
  Feature safe:	yes

Added:
  head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl   (contents, props changed)
Modified:
  head/lang/erlang/Makefile

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Thu Nov 29 20:51:45 2012	(r307979)
+++ head/lang/erlang/Makefile	Thu Nov 29 21:42:28 2012	(r307980)
@@ -7,6 +7,7 @@
 
 PORTNAME=	erlang
 PORTVERSION=	15.b.03
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\

Added: head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang/files/patch-lib_ssl_src_ssl__connection.erl	Thu Nov 29 21:42:28 2012	(r307980)
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- lib/ssl/src/ssl_connection.erl.orig
++++ lib/ssl/src/ssl_connection.erl
+@@ -986,6 +986,10 @@
+     gen_fsm:reply(RecvFrom, {error, timeout}),
+     {next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)};
+ 
++handle_info({cancel_start_or_recv, RecvFrom}, StateName, State) when connection =/= StateName->
++    gen_fsm:reply(RecvFrom, {error, timeout}),
++    {next_state, StateName, State#state{start_or_recv_from = undefined}, get_timeout(State)};
++
+ handle_info({cancel_start_or_recv, _RecvFrom}, StateName, State) ->
+     {next_state, StateName, State, get_timeout(State)};
+