Request 3041 (accepted)

Overview

Request 3041 (accepted)

Release of 0.9.13

Created by mollekopf about 2 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit guam-selfcontained

Submit package Kolab:16:Testing / guam-selfcontained to package Kolab:Winterfell / guam-selfcontained

guam.spec Changed

buildtarball.sh Changed

debian.changelog Changed

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3 Deleted

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3/rebar_compiler_erl Deleted

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3/rebar_compiler_erl/source.dag Deleted

guam-0.9.12.tar.gz/CHANGELOG.md -> guam-0.9.13.tar.gz/CHANGELOG.md Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_compilation.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_compilation.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_port_env.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_port_env.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_port_specs.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_port_specs.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_prv_clean.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_prv_clean.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_prv_compile.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_prv_compile.beam Changed

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_util.beam -> guam-0.9.13.tar.gz/_checkouts/pc/ebin/pc_util.beam Changed

guam-0.9.13.tar.gz/apps/kolab_guam/src/compat.hrl Added

guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.9.13.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.9.13.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -29,6 +29,7 @@
 -export( process_client_data/3 ).
 
 -include("kolab_guam_session.hrl").
+-include("compat.hrl").
 
 %% public API
 start_link(SupervisorPID, ListenSocket, ImapConfig, ImplicitTLS, TLSConfig, Rules) -> gen_server:start_link(?MODULE, SupervisorPID, ListenSocket, ImapConfig, ImplicitTLS, TLSConfig, Rules, ).
@@ -176,11 +177,21 @@
 set_socket_active(#state{ client_tls_active = true, socket = Socket}) -> ssl:setopts(Socket, { active, once });
 set_socket_active(#state{ client_tls_active = false, socket = Socket}) -> inet:setopts(Socket, { active, once }).
 
+
+% Backwards compatibility
+-ifdef(GUAM_OTP_21).
+ssl_accept(Socket, TLSConfig) ->
+    ssl:handshake(Socket, TLSConfig).
+-else.
+ssl_accept(Socket, TLSConfig) ->
+    ssl:ssl_accept(Socket, TLSConfig).
+-endif.
+
 accept_client(#state{ client_implicit_tls = true, tls_config = TLSConfig, listen_socket = ListenSocket, super_pid = SupervisorPID }) ->
     AcceptSocket = accept_socket(ListenSocket, SupervisorPID),
 
     { ok, SSLSocket } =
-    case ssl:ssl_accept(AcceptSocket, TLSConfig) of
+    case ssl_accept(AcceptSocket, TLSConfig) of
         { ok, Socket } ->
             { ok, Socket };
         {error, {tls_alert, Reason}} ->
@@ -397,7 +408,7 @@
     Response = <<Tag/binary, " OK Begin TLS negotiation now\r\n">>,
     relay_response(Socket, postprocess_server_data(Deflator, Response), false),
     inet:setopts(Socket, { active, false }), %% must be set to active false, otherwise can fail depending on timing
-    { ok, SSLSocket } = ssl:ssl_accept(Socket, TLSConfig),
+    { ok, SSLSocket } = ssl_accept(Socket, TLSConfig),
     { socket_upgraded, SSLSocket }.
 
 check_compress_request(undefined, <<"COMPRESS">>, Socket, TLS, Tag) -> start_client_compression(Socket, TLS, Tag);

guam-0.9.12.tar.gz/cache/rebar3/hex/packages.idx -> guam-0.9.13.tar.gz/cache/rebar3/hex/packages.idx Changed

guam-0.9.12.tar.gz/rebar.config -> guam-0.9.13.tar.gz/rebar.config Changed

guam.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3041 0

Request History

mollekopf created request about 2 years ago

Release of 0.9.13

mollekopf accepted request about 2 years ago