[erlang-mochiweb] Fix int-to-string conversion
Peter Lemenkov
peter at fedoraproject.org
Tue Aug 17 10:24:45 UTC 2010
commit 4196a96753c354750a520ea4cb02c5ea61c95c35
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue Aug 17 14:24:29 2010 +0400
Fix int-to-string conversion
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...The-term-boolean-isn-t-availabie-in-R12B5.patch | 2 +-
...002-No-erlang-min-A-B-in-R12B-5-and-below.patch | 2 +-
...-such-function-erl_scan-string-3-in-R12B5.patch | 2 +-
...ction-lists-keyfind-3-in-R12B5-use-lists-.patch | 2 +-
...elated-tests-on-R12B-requires-ssl-example.patch | 2 +-
...r-conversion-from-int-to-string-should-be.patch | 26 ++++++++++++++++++++
erlang-mochiweb.spec | 7 ++++-
7 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch b/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
index 79a63ef..145798a 100644
--- a/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
+++ b/erlang-mochiweb-0001-The-term-boolean-isn-t-availabie-in-R12B5.patch
@@ -1,7 +1,7 @@
From 1868a3947adc52aafd27036fc28ae1c459bf5d08 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:09:50 +0400
-Subject: [PATCH 1/5] The term boolean isn't availabie in R12B5
+Subject: [PATCH 1/6] The term boolean isn't availabie in R12B5
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch b/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
index 14000bb..cb16028 100644
--- a/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
+++ b/erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
@@ -1,7 +1,7 @@
From 1351b93356bb540f7211fdbb7191961a45e3be89 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:10:42 +0400
-Subject: [PATCH 2/5] No erlang:min(A,B) in R12B-5 and below
+Subject: [PATCH 2/6] No erlang:min(A,B) in R12B-5 and below
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch b/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
index 79c19ee..e10c255 100644
--- a/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
+++ b/erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
@@ -1,7 +1,7 @@
From f95a72d3f13844b8d673f8dec1d397c400030c63 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:13:57 +0400
-Subject: [PATCH 3/5] No such function - erl_scan:string/3 in R12B5
+Subject: [PATCH 3/6] No such function - erl_scan:string/3 in R12B5
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch b/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
index 10164ab..0b530d2 100644
--- a/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
+++ b/erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
@@ -1,7 +1,7 @@
From ac87470246b571d4e7852c2c5af8dba12be6042d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 13 Jul 2010 15:16:13 +0400
-Subject: [PATCH 4/5] No such function lists:keyfind/3 in R12B5 - use lists:keysearch/3 instead
+Subject: [PATCH 4/6] No such function lists:keyfind/3 in R12B5 - use lists:keysearch/3 instead
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch b/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
index abaef6a..6d072d4 100644
--- a/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
+++ b/erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
@@ -1,7 +1,7 @@
From 0b6e3ffcdb617945fbfb74787b57b95b0198f8b2 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 10 Aug 2010 16:10:45 +0400
-Subject: [PATCH 5/5] Fixed ssl-related tests on R12B (requires ssl/examples from Erlang/OTP)
+Subject: [PATCH 5/6] Fixed ssl-related tests on R12B (requires ssl/examples from Erlang/OTP)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
diff --git a/erlang-mochiweb-0006-Fix-improper-conversion-from-int-to-string-should-be.patch b/erlang-mochiweb-0006-Fix-improper-conversion-from-int-to-string-should-be.patch
new file mode 100644
index 0000000..ab38825
--- /dev/null
+++ b/erlang-mochiweb-0006-Fix-improper-conversion-from-int-to-string-should-be.patch
@@ -0,0 +1,26 @@
+From 70765c74292adedfa7f91fb41f864db719484c73 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 17 Aug 2010 14:02:17 +0400
+Subject: [PATCH 6/6] Fix improper conversion from int to string (should be string to int)
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/mochiweb_socket_server.erl | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mochiweb_socket_server.erl b/src/mochiweb_socket_server.erl
+index 1aae09a..774fee7 100644
+--- a/src/mochiweb_socket_server.erl
++++ b/src/mochiweb_socket_server.erl
+@@ -123,7 +123,7 @@ start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) ->
+ ensure_int(N) when is_integer(N) ->
+ N;
+ ensure_int(S) when is_list(S) ->
+- integer_to_list(S).
++ list_to_integer(S).
+
+ ipv6_supported() ->
+ case (catch inet:getaddr("localhost", inet6)) of
+--
+1.7.2.1
+
diff --git a/erlang-mochiweb.spec b/erlang-mochiweb.spec
index 1dd82b5..971880c 100644
--- a/erlang-mochiweb.spec
+++ b/erlang-mochiweb.spec
@@ -4,7 +4,7 @@
Name: erlang-%{realname}
Version: 1.3
-Release: 0.6.20100724git9a53dbd7%{?dist}
+Release: 0.7.20100724git9a53dbd7%{?dist}
Summary: An Erlang library for building lightweight HTTP servers
Group: Development/Libraries
License: MIT
@@ -16,6 +16,7 @@ Patch2: erlang-mochiweb-0002-No-erlang-min-A-B-in-R12B-5-and-below.patch
Patch3: erlang-mochiweb-0003-No-such-function-erl_scan-string-3-in-R12B5.patch
Patch4: erlang-mochiweb-0004-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch
Patch5: erlang-mochiweb-0005-Fixed-ssl-related-tests-on-R12B-requires-ssl-example.patch
+Patch6: erlang-mochiweb-0006-Fix-improper-conversion-from-int-to-string-should-be.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: erlang
Requires: erlang-compiler
@@ -44,6 +45,7 @@ An Erlang library for building lightweight HTTP servers.
%patch4 -p1 -b .no-lists-keyfind-3
%patch5 -p1 -b .fix_for_ssl_cacert
%endif
+%patch6 -p1 -b .fix_int_to_string
chmod 755 scripts/new_mochiweb.erl
@@ -116,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 17 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.3-0.7.20100724git9a53dbd7
+- Fix improper int to string conversion
+
* Wed Aug 11 2010 Peter Lemenkov <lemenkov at gmail.com> - 1.3-0.6.20100724git9a53dbd7
- Fixed all tests on EL-5
- New git snapshot
More information about the scm-commits
mailing list