From 824a89316d59353181990f5a461157751ca67907 Mon Sep 17 00:00:00 2001 From: Nathaniel Waisbrot Date: Sun, 16 Mar 2014 00:24:58 -0400 Subject: [PATCH] fixes to compile under Erlang 17.0-rc2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified files with Oscar Hellström's name to be UTF-8 Started asn1 before public_key in eunit tests --- doc/overview.edoc | 2 +- src/lhttpc.app.src | 2 +- src/lhttpc.erl | 2 +- src/lhttpc_client.erl | 2 +- src/lhttpc_lib.erl | 2 +- src/lhttpc_manager.erl | 2 +- src/lhttpc_sock.erl | 2 +- src/lhttpc_sup.erl | 2 +- test/lhttpc_lib_tests.erl | 2 +- test/lhttpc_manager_tests.erl | 4 +++- test/lhttpc_tests.erl | 3 ++- test/socket_server.erl | 2 +- test/webserver.erl | 2 +- util/make_doc.erl | 2 +- util/run_test.erl | 2 +- 15 files changed, 18 insertions(+), 15 deletions(-) diff --git a/doc/overview.edoc b/doc/overview.edoc index d625b27d..4a6731a3 100644 --- a/doc/overview.edoc +++ b/doc/overview.edoc @@ -1,4 +1,4 @@ -@author Oscar Hellstr�m +@author Oscar Hellström @doc A lightweight HTTP client. The only functions of much interest right now are {@link lhttpc:request/4}, {@link lhttpc:request/5}, {@link lhttpc:request/6} and diff --git a/src/lhttpc.app.src b/src/lhttpc.app.src index 1c3d93bb..4b1cc8a2 100644 --- a/src/lhttpc.app.src +++ b/src/lhttpc.app.src @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc This is the specification for the lhttpc application. %%% @end {application, lhttpc, diff --git a/src/lhttpc.erl b/src/lhttpc.erl index 8b3dc308..978a0d8c 100644 --- a/src/lhttpc.erl +++ b/src/lhttpc.erl @@ -25,7 +25,7 @@ %%% ---------------------------------------------------------------------------- %%------------------------------------------------------------------------------ -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc Main interface to the lightweight http client. %%% See {@link request/4}, {@link request/5} and {@link request/6} functions. %%% @end diff --git a/src/lhttpc_client.erl b/src/lhttpc_client.erl index 3a159120..0f5542f3 100644 --- a/src/lhttpc_client.erl +++ b/src/lhttpc_client.erl @@ -26,7 +26,7 @@ %%------------------------------------------------------------------------------ %%% @private -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc This module implements the HTTP request handling. This should normally %%% not be called directly since it should be spawned by the lhttpc module. %%% @end diff --git a/src/lhttpc_lib.erl b/src/lhttpc_lib.erl index a83123b1..ff5247ba 100644 --- a/src/lhttpc_lib.erl +++ b/src/lhttpc_lib.erl @@ -26,7 +26,7 @@ %%------------------------------------------------------------------------------ %%% @private -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc %%% This module implements various library functions used in lhttpc. %%------------------------------------------------------------------------------ diff --git a/src/lhttpc_manager.erl b/src/lhttpc_manager.erl index 80ee047c..94c23653 100644 --- a/src/lhttpc_manager.erl +++ b/src/lhttpc_manager.erl @@ -25,7 +25,7 @@ %%% ---------------------------------------------------------------------------- %%------------------------------------------------------------------------------ -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @author Filipe David Manana %%% @doc Connection manager for the HTTP client. %%% This gen_server is responsible for keeping track of persistent diff --git a/src/lhttpc_sock.erl b/src/lhttpc_sock.erl index 306779d5..48e958a7 100644 --- a/src/lhttpc_sock.erl +++ b/src/lhttpc_sock.erl @@ -26,7 +26,7 @@ %%------------------------------------------------------------------------------ %%% @private -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc %%% This module implements wrappers for socket operations. %%% Makes it possible to have the same interface to ssl and tcp sockets. diff --git a/src/lhttpc_sup.erl b/src/lhttpc_sup.erl index ed917f9d..9fedc46f 100644 --- a/src/lhttpc_sup.erl +++ b/src/lhttpc_sup.erl @@ -25,7 +25,7 @@ %%% ---------------------------------------------------------------------------- %%------------------------------------------------------------------------------ -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @doc Top supervisor for the lhttpc application. %%% This is normally started by the application behaviour implemented in %%% {@link lhttpc}. diff --git a/test/lhttpc_lib_tests.erl b/test/lhttpc_lib_tests.erl index c8e135a3..b8893893 100644 --- a/test/lhttpc_lib_tests.erl +++ b/test/lhttpc_lib_tests.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström -module(lhttpc_lib_tests). -include("../include/lhttpc_types.hrl"). diff --git a/test/lhttpc_manager_tests.erl b/test/lhttpc_manager_tests.erl index 4e24afe0..fe445ca1 100644 --- a/test/lhttpc_manager_tests.erl +++ b/test/lhttpc_manager_tests.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @author Filipe David Manana -module(lhttpc_manager_tests). @@ -36,6 +36,8 @@ %%% Eunit setup stuff start_app() -> + application:start(crypto), + application:start(asn1), application:start(public_key), ok = application:start(ssl), _ = application:load(lhttpc), diff --git a/test/lhttpc_tests.erl b/test/lhttpc_tests.erl index 7b6b809a..b14330e5 100644 --- a/test/lhttpc_tests.erl +++ b/test/lhttpc_tests.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström -module(lhttpc_tests). -export([test_no/2]). @@ -100,6 +100,7 @@ test_no(N, Tests) -> start_app() -> application:start(crypto), + application:start(asn1), application:start(public_key), ok = application:start(ssl), ok = lhttpc:start(). diff --git a/test/socket_server.erl b/test/socket_server.erl index 15fdcd83..16dee646 100644 --- a/test/socket_server.erl +++ b/test/socket_server.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström -module(socket_server). -export([connect/1, listen/0, accept/1]). diff --git a/test/webserver.erl b/test/webserver.erl index 7da8cc63..ea09f53d 100644 --- a/test/webserver.erl +++ b/test/webserver.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström %%% @author Magnus Henoch %%% @doc Simple web server for testing purposes %%% @end diff --git a/util/make_doc.erl b/util/make_doc.erl index 53beba11..4419f132 100644 --- a/util/make_doc.erl +++ b/util/make_doc.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström -module(make_doc). -export([edoc/0]). diff --git a/util/run_test.erl b/util/run_test.erl index b759e664..9fc736c9 100644 --- a/util/run_test.erl +++ b/util/run_test.erl @@ -24,7 +24,7 @@ %%% ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. %%% ---------------------------------------------------------------------------- -%%% @author Oscar Hellstr�m +%%% @author Oscar Hellström -module(run_test). -export([run/0]).