You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2018/10/03 20:44:41 UTC
[07/10] mochiweb commit: updated refs/heads/upstream to 9608d78
Fix Erlang 21 compatibility
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/93ab04d5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/93ab04d5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/93ab04d5
Branch: refs/heads/upstream
Commit: 93ab04d5db241564ff08aefdf8a4fbaf5a4c6f66
Parents: c06e08e
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Tue Sep 25 17:25:27 2018 -0400
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Sep 25 17:25:27 2018 -0400
----------------------------------------------------------------------
examples/hmac_api/hmac_api_lib.erl | 2 ++
examples/https/https_store.erl | 2 ++
examples/keepalive/keepalive.erl | 2 ++
rebar.config | 1 -
src/mochifmt.erl | 3 +++
src/mochiweb_acceptor.erl | 2 ++
src/mochiweb_http.erl | 4 ++++
src/mochiweb_multipart.erl | 2 ++
src/mochiweb_request.erl | 2 ++
src/mochiweb_response.erl | 2 ++
src/mochiweb_websocket.erl | 2 ++
support/templates/mochiwebapp_skel/src/mochiapp_web.erl | 2 ++
test/mochiweb_http_tests.erl | 2 ++
test/mochiweb_request_tests.erl | 2 ++
test/mochiweb_tests.erl | 2 ++
test/mochiweb_websocket_tests.erl | 2 ++
16 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/examples/hmac_api/hmac_api_lib.erl
----------------------------------------------------------------------
diff --git a/examples/hmac_api/hmac_api_lib.erl b/examples/hmac_api/hmac_api_lib.erl
index 6d04954..95d7c58 100644
--- a/examples/hmac_api/hmac_api_lib.erl
+++ b/examples/hmac_api/hmac_api_lib.erl
@@ -5,6 +5,8 @@
-author("Hypernumbers Ltd <go...@hypernumbers.com>").
+-compile(tuple_calls).
+
%%% this library supports the hmac_sha api on both the client-side
%%% AND the server-side
%%%
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/examples/https/https_store.erl
----------------------------------------------------------------------
diff --git a/examples/https/https_store.erl b/examples/https/https_store.erl
index 959cc00..23e2447 100644
--- a/examples/https/https_store.erl
+++ b/examples/https/https_store.erl
@@ -34,6 +34,8 @@
-module(https_store).
+-compile(tuple_calls).
+
-export([start/0,
stop/0,
dispatch/1,
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/examples/keepalive/keepalive.erl
----------------------------------------------------------------------
diff --git a/examples/keepalive/keepalive.erl b/examples/keepalive/keepalive.erl
index 965a17e..a371e91 100644
--- a/examples/keepalive/keepalive.erl
+++ b/examples/keepalive/keepalive.erl
@@ -1,5 +1,7 @@
-module(keepalive).
+-compile(tuple_calls).
+
%% your web app can push data to clients using a technique called comet long
%% polling. browsers make a request and your server waits to send a
%% response until data is available. see wikipedia for a better explanation:
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 014ff05..adc1d78 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,6 +1,5 @@
% -*- mode: erlang -*-
{erl_opts, [debug_info,
- tuple_calls,
{platform_define, "^R15", 'gen_tcp_r15b_workaround'},
{platform_define, "^(R14|R15|R16B-)", 'crypto_compatibility'},
{platform_define, "^(R14|R15|R16B|17)", 'rand_mod_unavailable'},
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochifmt.erl
----------------------------------------------------------------------
diff --git a/src/mochifmt.erl b/src/mochifmt.erl
index 6381bb7..5a5ed45 100644
--- a/src/mochifmt.erl
+++ b/src/mochifmt.erl
@@ -24,6 +24,9 @@
%%
-module(mochifmt).
-author('bob@mochimedia.com').
+
+-compile(tuple_calls).
+
-export([format/2, format_field/2, convert_field/2, get_value/2, get_field/2]).
-export([tokenize/1, format/3, get_field/3, format_field/3]).
-export([bformat/2, bformat/3]).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_acceptor.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_acceptor.erl b/src/mochiweb_acceptor.erl
index 44ce91f..3fd6925 100644
--- a/src/mochiweb_acceptor.erl
+++ b/src/mochiweb_acceptor.erl
@@ -24,6 +24,8 @@
-module(mochiweb_acceptor).
-author('bob@mochimedia.com').
+-compile(tuple_calls).
+
-include("internal.hrl").
-export([start_link/3, start_link/4, init/4]).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_http.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_http.erl b/src/mochiweb_http.erl
index 3b02065..a4bfa9e 100644
--- a/src/mochiweb_http.erl
+++ b/src/mochiweb_http.erl
@@ -28,6 +28,8 @@
-export([after_response/2, reentry/1]).
-export([parse_range_request/1, range_skip_length/2]).
+-compile(tuple_calls).
+
-define(REQUEST_RECV_TIMEOUT, 300000). %% timeout waiting for request line
-define(HEADERS_RECV_TIMEOUT, 30000). %% timeout waiting for headers
@@ -41,6 +43,8 @@ r15b_workaround() -> true.
r15b_workaround() -> false.
-endif.
+
+
parse_options(Options) ->
{loop, HttpLoop} = proplists:lookup(loop, Options),
Loop = {?MODULE, loop, [HttpLoop]},
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_multipart.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_multipart.erl b/src/mochiweb_multipart.erl
index fd75443..6f611c0 100644
--- a/src/mochiweb_multipart.erl
+++ b/src/mochiweb_multipart.erl
@@ -24,6 +24,8 @@
-module(mochiweb_multipart).
-author('bob@mochimedia.com').
+-compile(tuple_calls).
+
-export([parse_form/1, parse_form/2]).
-export([parse_multipart_request/2]).
-export([parts_to_body/3, parts_to_multipart_body/4]).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_request.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_request.erl b/src/mochiweb_request.erl
index 02a4953..240f043 100644
--- a/src/mochiweb_request.erl
+++ b/src/mochiweb_request.erl
@@ -24,6 +24,8 @@
-module(mochiweb_request).
-author('bob@mochimedia.com').
+-compile(tuple_calls).
+
-include_lib("kernel/include/file.hrl").
-include("internal.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_response.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_response.erl b/src/mochiweb_response.erl
index 195e652..dc9569e 100644
--- a/src/mochiweb_response.erl
+++ b/src/mochiweb_response.erl
@@ -24,6 +24,8 @@
-module(mochiweb_response).
-author('bob@mochimedia.com').
+-compile(tuple_calls).
+
-define(QUIP, "Any of you quaids got a smint?").
-export([new/3, get_header_value/2, get/2, dump/1]).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/src/mochiweb_websocket.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_websocket.erl b/src/mochiweb_websocket.erl
index 14b242a..690c91f 100644
--- a/src/mochiweb_websocket.erl
+++ b/src/mochiweb_websocket.erl
@@ -25,6 +25,8 @@
%% @doc Websockets module for Mochiweb. Based on Misultin websockets module.
+-compile(tuple_calls).
+
-export([loop/5, upgrade_connection/2, request/5]).
-export([send/3]).
-ifdef(TEST).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
----------------------------------------------------------------------
diff --git a/support/templates/mochiwebapp_skel/src/mochiapp_web.erl b/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
index 8429a88..7ffb44d 100644
--- a/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
+++ b/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
@@ -6,6 +6,8 @@
-module({{appid}}_web).
-author("{{author}}").
+-compile(tuple_calls).
+
-export([start/1, stop/0, loop/2]).
%% External API
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/test/mochiweb_http_tests.erl
----------------------------------------------------------------------
diff --git a/test/mochiweb_http_tests.erl b/test/mochiweb_http_tests.erl
index 0003451..1057755 100644
--- a/test/mochiweb_http_tests.erl
+++ b/test/mochiweb_http_tests.erl
@@ -7,6 +7,8 @@
-define(SHOULD_HAVE_BUG, false).
-endif.
+-compile(tuple_calls).
+
has_acceptor_bug_test_() ->
{setup,
fun start_server/0,
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/test/mochiweb_request_tests.erl
----------------------------------------------------------------------
diff --git a/test/mochiweb_request_tests.erl b/test/mochiweb_request_tests.erl
index b40c867..b8f93e2 100644
--- a/test/mochiweb_request_tests.erl
+++ b/test/mochiweb_request_tests.erl
@@ -1,5 +1,7 @@
-module(mochiweb_request_tests).
+-compile(tuple_calls).
+
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/test/mochiweb_tests.erl
----------------------------------------------------------------------
diff --git a/test/mochiweb_tests.erl b/test/mochiweb_tests.erl
index 23f8312..697f7c6 100644
--- a/test/mochiweb_tests.erl
+++ b/test/mochiweb_tests.erl
@@ -2,6 +2,8 @@
-include_lib("eunit/include/eunit.hrl").
-include("mochiweb_test_util.hrl").
+-compile(tuple_calls).
+
with_server(Transport, ServerFun, ClientFun) ->
mochiweb_test_util:with_server(Transport, ServerFun, ClientFun).
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/93ab04d5/test/mochiweb_websocket_tests.erl
----------------------------------------------------------------------
diff --git a/test/mochiweb_websocket_tests.erl b/test/mochiweb_websocket_tests.erl
index eb8de5b..71fb9a6 100644
--- a/test/mochiweb_websocket_tests.erl
+++ b/test/mochiweb_websocket_tests.erl
@@ -23,6 +23,8 @@
%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
%% THE SOFTWARE.
+-compile(tuple_calls).
+
-include_lib("eunit/include/eunit.hrl").
make_handshake_for_correct_client_test() ->