[erlang-mochiweb] Fixed issue with R16B01

[Peter Lemenkov]

commit 70aff227783306f8cf9b973ec24e71051ef1d162
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Jun 21 14:07:51 2013 +0400

    Fixed issue with R16B01
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 ...ochiweb-acceptor-blocked-in-ssl-handshake.patch |    4 +-
 erlang-mochiweb-0002-Fix-for-Erlang-R16B01.patch   |   25 ++++++++++++++++++++
 erlang-mochiweb.spec                               |   10 ++++++-
 3 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch b/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
index 6e71651..f6779e9 100644
--- a/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
+++ b/erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
@@ -1,7 +1,7 @@
 From 0317512ee588b63c57306ae76dd4352ed24f33f0 Mon Sep 17 00:00:00 2001
 From: Wei Cao <cyg.cao at gmail.com>
 Date: Thu, 16 Aug 2012 10:53:07 +0800
-Subject: [PATCH 1/1] Fix Mochiweb acceptor blocked in ssl handshake
+Subject: [PATCH 1/2] Fix Mochiweb acceptor blocked in ssl handshake
 
 Acceptor cannot be recycled until ssl handshake is done,
 so it's possible and easy for all acceptors be blocked between the point
@@ -78,5 +78,5 @@ index 76b018c..ad27204 100644
      ssl:recv(Socket, Length, Timeout);
  recv(Socket, Length, Timeout) ->
 -- 
-1.8.1.4
+1.8.2.1
 
diff --git a/erlang-mochiweb-0002-Fix-for-Erlang-R16B01.patch b/erlang-mochiweb-0002-Fix-for-Erlang-R16B01.patch
new file mode 100644
index 0000000..720c6d2
--- /dev/null
+++ b/erlang-mochiweb-0002-Fix-for-Erlang-R16B01.patch
@@ -0,0 +1,25 @@
+From 92955e3f1d19e79bc41df30264da7f320964aa9e Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Fri, 21 Jun 2013 13:52:17 +0400
+Subject: [PATCH 2/2] Fix for Erlang R16B01
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/mochiweb_socket_server.erl | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mochiweb_socket_server.erl b/src/mochiweb_socket_server.erl
+index 029f195..24ecb49 100644
+--- a/src/mochiweb_socket_server.erl
++++ b/src/mochiweb_socket_server.erl
+@@ -141,6 +141,7 @@ start_server(F, State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
+ 
+ prep_ssl(true) ->
+     ok = mochiweb:ensure_started(crypto),
++    ok = mochiweb:ensure_started(asn1),
+     ok = mochiweb:ensure_started(public_key),
+     ok = mochiweb:ensure_started(ssl);
+ prep_ssl(false) ->
+-- 
+1.8.2.1
+
diff --git a/erlang-mochiweb.spec b/erlang-mochiweb.spec
index 858921f..e8707ee 100644
--- a/erlang-mochiweb.spec
+++ b/erlang-mochiweb.spec
@@ -7,15 +7,17 @@
 
 Name:		erlang-%{realname}
 Version:	2.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An Erlang library for building lightweight HTTP servers
 Group:		Development/Libraries
 License:	MIT
 URL:		http://github.com/mochi/mochiweb
-# wget --content-disposition https://github.com/mochi/mochiweb/tarball/v2.4.1
+# wget --content-disposition https://github.com/mochi/mochiweb/tarball/v2.4.2
 Source0:	%{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
 # Used in CouchDB, see https://github.com/mochi/mochiweb/issues/70
 Patch1:		erlang-mochiweb-0001-Fix-Mochiweb-acceptor-blocked-in-ssl-handshake.patch
+# Sent upstream - https://github.com/mochi/mochiweb/pull/112
+Patch2:		erlang-mochiweb-0002-Fix-for-Erlang-R16B01.patch
 BuildRequires:	erlang-rebar
 BuildRequires:	erlang-xmerl
 Requires:	erlang-compiler%{?_isa}
@@ -39,6 +41,7 @@ An Erlang library for building lightweight HTTP servers.
 %prep
 %setup -q -n %{upstream}-%{realname}-%{git_tag}
 %patch1 -p1 -b .couchdb
+%patch2 -p1 -b .r16b01
 
 
 %build
@@ -103,6 +106,9 @@ rebar eunit -v
 
 
 %changelog
+* Fri Jun 21 2013 Peter Lemenkov <lemenkov at gmail.com> - 2.4.2-2
+- Fixed issue with R16B01
+
 * Sat Mar 02 2013 Peter Lemenkov <lemenkov at gmail.com> - 2.4.2-1
 - Ver. 2.4.2