diff options
| -rw-r--r-- | CHANGELOG.asciidoc | 7 | ||||
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ebin/ranch.app | 2 | ||||
| -rw-r--r-- | src/ranch.erl | 2 | ||||
| -rw-r--r-- | src/ranch_acceptor.erl | 2 | ||||
| -rw-r--r-- | src/ranch_acceptors_sup.erl | 2 | ||||
| -rw-r--r-- | src/ranch_app.erl | 2 | ||||
| -rw-r--r-- | src/ranch_conns_sup.erl | 2 | ||||
| -rw-r--r-- | src/ranch_listener_sup.erl | 2 | ||||
| -rw-r--r-- | src/ranch_protocol.erl | 2 | ||||
| -rw-r--r-- | src/ranch_server.erl | 2 | ||||
| -rw-r--r-- | src/ranch_ssl.erl | 2 | ||||
| -rw-r--r-- | src/ranch_sup.erl | 2 | ||||
| -rw-r--r-- | src/ranch_tcp.erl | 2 | ||||
| -rw-r--r-- | src/ranch_transport.erl | 2 | ||||
| -rw-r--r-- | test/acceptor_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/ranch_ct_hook.erl | 2 | ||||
| -rw-r--r-- | test/sendfile_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/shutdown_SUITE.erl | 2 |
20 files changed, 25 insertions, 20 deletions
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index e7209cf..4a528cc 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,5 +1,11 @@ = CHANGELOG +== 1.5.0 + +* Add transport functions getopts/2, getstat/1 and getstat/2 +* Fix ranch:info/0 and ranch:procs/2 in embedded mode +* Prevent ranch_conns_sup from stopping on unexpected messages + == 1.4.0 * Add new transport option num_acceptor @@ -34,7 +40,6 @@ do not include code changes. == 1.2.0 - * Allow the supervised process and the process owning the socket to be different * Add many transport options (please refer to the documentation) * Add function ranch:get_addr/1 to retrieve both IP and port of listener @@ -1,4 +1,4 @@ -Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -2,7 +2,7 @@ PROJECT = ranch PROJECT_DESCRIPTION = Socket acceptor pool for TCP protocols. -PROJECT_VERSION = 1.4.0 +PROJECT_VERSION = 1.5.0 PROJECT_REGISTERED = ranch_server # Options. diff --git a/ebin/ranch.app b/ebin/ranch.app index 360dfa7..023d64f 100644 --- a/ebin/ranch.app +++ b/ebin/ranch.app @@ -1,6 +1,6 @@ {application, 'ranch', [ {description, "Socket acceptor pool for TCP protocols."}, - {vsn, "1.4.0"}, + {vsn, "1.5.0"}, {modules, ['ranch','ranch_acceptor','ranch_acceptors_sup','ranch_app','ranch_conns_sup','ranch_listener_sup','ranch_protocol','ranch_server','ranch_ssl','ranch_sup','ranch_tcp','ranch_transport']}, {registered, [ranch_sup,ranch_server]}, {applications, [kernel,stdlib,ssl]}, diff --git a/src/ranch.erl b/src/ranch.erl index d4adee5..70fb64c 100644 --- a/src/ranch.erl +++ b/src/ranch.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_acceptor.erl b/src/ranch_acceptor.erl index fbbf6b5..ada8016 100644 --- a/src/ranch_acceptor.erl +++ b/src/ranch_acceptor.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_acceptors_sup.erl b/src/ranch_acceptors_sup.erl index 0a79d35..f4b2fd8 100644 --- a/src/ranch_acceptors_sup.erl +++ b/src/ranch_acceptors_sup.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_app.erl b/src/ranch_app.erl index 25115c8..8ac470e 100644 --- a/src/ranch_app.erl +++ b/src/ranch_app.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_conns_sup.erl b/src/ranch_conns_sup.erl index 14c2481..6a2336f 100644 --- a/src/ranch_conns_sup.erl +++ b/src/ranch_conns_sup.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_listener_sup.erl b/src/ranch_listener_sup.erl index 584dc36..d3bc59d 100644 --- a/src/ranch_listener_sup.erl +++ b/src/ranch_listener_sup.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_protocol.erl b/src/ranch_protocol.erl index 85d2042..30a5b51 100644 --- a/src/ranch_protocol.erl +++ b/src/ranch_protocol.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2012-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2012-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_server.erl b/src/ranch_server.erl index 64f1f98..89c508c 100644 --- a/src/ranch_server.erl +++ b/src/ranch_server.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2012-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2012-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index 5f6d5c2..ac96e45 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_sup.erl b/src/ranch_sup.erl index eccf17d..f5bf82e 100644 --- a/src/ranch_sup.erl +++ b/src/ranch_sup.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_tcp.erl b/src/ranch_tcp.erl index 8cc03a1..bc0c75d 100644 --- a/src/ranch_tcp.erl +++ b/src/ranch_tcp.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/src/ranch_transport.erl b/src/ranch_transport.erl index 89ceb12..b671cf5 100644 --- a/src/ranch_transport.erl +++ b/src/ranch_transport.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2012-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2012-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl index f826f54..a8c6d23 100644 --- a/test/acceptor_SUITE.erl +++ b/test/acceptor_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2011-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2011-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/test/ranch_ct_hook.erl b/test/ranch_ct_hook.erl index bf452cc..183cdf5 100644 --- a/test/ranch_ct_hook.erl +++ b/test/ranch_ct_hook.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2015-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2015-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/test/sendfile_SUITE.erl b/test/sendfile_SUITE.erl index e2c9dc0..d89724f 100644 --- a/test/sendfile_SUITE.erl +++ b/test/sendfile_SUITE.erl @@ -1,5 +1,5 @@ %% Copyright (c) 2013, James Fish <[email protected]> -%% Copyright (c) 2015-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2015-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above diff --git a/test/shutdown_SUITE.erl b/test/shutdown_SUITE.erl index 1689581..cf1edfd 100644 --- a/test/shutdown_SUITE.erl +++ b/test/shutdown_SUITE.erl @@ -1,4 +1,4 @@ -%% Copyright (c) 2013-2017, Loïc Hoguin <[email protected]> +%% Copyright (c) 2013-2018, Loïc Hoguin <[email protected]> %% %% Permission to use, copy, modify, and/or distribute this software for any %% purpose with or without fee is hereby granted, provided that the above |