[erlang-patches] Fix ssl:transport_accept/2 to handle socket close

Björn Gustavsson <>
Mon Mar 29 08:11:51 CEST 2010

On Mon, Mar 29, 2010 at 12:33 AM, Rory Byrne <> wrote:
>  git fetch git://github.com/jinsky/otp.git ssl_transport_accept_fix


I'll wait a few days with including this change because there is
currently a build problem in the ssl application, and because I've
had to revert a commit there is now a merge conflict with the
revert commit. Since the revert commit in the 'pu' branch is
a temporary thing, I will wait until it is gone before I'll resolve
any merge conflicts.

Another thing: Your branch contains multiple merges from the dev
branch. I cannot merge such a branch to 'pu', but I can handle
by cherry-picking the actual without much problems. Still, in the
future you might want to use "git rebase" instead of "git merge"
when you want to update your branch with the latest changes
from the dev branch (in case you haven't used "git merge",
note that "git pull" is the same as "git fetch" followed by
"git merge").

Björn Gustavsson, Erlang/OTP, Ericsson AB

More information about the erlang-patches mailing list