Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Philipp Huebner
7 years ago
|
0 |
# Version 1.0.4
|
|
1 |
|
|
2 |
* Better compliance with R17 and R18 (Paweł Chmielowski)
|
|
3 |
|
| 0 | 4 |
# Version 1.0.3
|
| 1 | 5 |
|
| 2 | 6 |
* Do not call internal erlang erl_exit function (Christophe Romain)
|
| 54 | 54 |
|
| 55 | 55 |
/* Wrappers around driver_alloc() that check */
|
| 56 | 56 |
/* for OOM. */
|
| 57 | |
void erl_exit(int n, char* v, ...) { abort(); }
|
|
57 |
|
|
58 |
#ifdef HAS_ERTS_EXIT
|
|
59 |
void erts_exit(int n, char* v, ...);
|
|
60 |
#define erl_exit erts_exit
|
|
61 |
#else
|
|
62 |
void erl_exit(int n, char* v, ...);
|
|
63 |
#endif
|
|
64 |
|
| 58 | 65 |
void *ftls_alloc(ErlDrvSizeT size);
|
| 59 | 66 |
void *ftls_realloc(void *ptr, ErlDrvSizeT size);
|
| 60 | 67 |
ErlDrvBinary *ftls_alloc_binary(ErlDrvSizeT size);
|
| 45 | 45 |
ModCfg = fun(Cfg, Keys, Op, Default) -> ModCfg0(ModCfg0, Cfg, Keys, Op, Default) end.
|
| 46 | 46 |
ModCfgS = fun(Cfg, Keys, Val) -> ModCfg0(ModCfg0, Cfg, Keys, fun(_V) -> Val end, "") end.
|
| 47 | 47 |
|
| 48 | |
Cfg0 = ModCfg(CONFIG, [port_env, "CFLAGS"], fun(V) -> V ++ " " ++ CfgCFlags end, "$CFLAGS"),
|
|
48 |
|
|
49 |
ExitFlag = case erlang:system_info(version) >= "7.3" of true -> "-DHAS_ERTS_EXIT"; _ -> "" end.
|
|
50 |
|
|
51 |
Cfg0 = ModCfg(CONFIG, [port_env, "CFLAGS"], fun(V) -> V ++ " " ++ ExitFlag ++ " " ++ CfgCFlags end, "$CFLAGS"),
|
| 49 | 52 |
Cfg00 = ModCfg(Cfg0, [port_env, "LDFLAGS"], fun(V) -> V ++ " " ++ CfgLDFlags end, "$LDFLAGS"),
|
| 50 | 53 |
Cfg1 = case CfgWithGCov of
|
| 51 | 54 |
"true" ->
|
| 22 | 22 |
|
| 23 | 23 |
{application, fast_tls,
|
| 24 | 24 |
[{description, "TLS / SSL OpenSSL-based native driver for Erlang / Elixir"},
|
| 25 | |
{vsn, "1.0.3"},
|
|
25 |
{vsn, "1.0.4"},
|
| 26 | 26 |
{modules, []},
|
| 27 | 27 |
{registered, []},
|
| 28 | 28 |
{applications, [kernel, stdlib]},
|
| 37 | 37 |
%% Internal exports, call-back functions.
|
| 38 | 38 |
-export([init/1, handle_call/3, handle_cast/2,
|
| 39 | 39 |
handle_info/2, code_change/3, terminate/2]).
|
|
40 |
|
|
41 |
-ifdef(TEST).
|
|
42 |
-include_lib("eunit/include/eunit.hrl").
|
|
43 |
-endif.
|
| 40 | 44 |
|
| 41 | 45 |
-define(SET_CERTIFICATE_FILE_ACCEPT, 1).
|
| 42 | 46 |
|
|
| 420 | 424 |
[erl_ddll:format_error(ErrorDesc)]),
|
| 421 | 425 |
Err
|
| 422 | 426 |
end.
|
|
427 |
|
|
428 |
-ifdef(TEST).
|
|
429 |
|
|
430 |
load_nif_test() ->
|
|
431 |
?assertEqual(ok, load_driver()).
|
|
432 |
|
|
433 |
-endif.⏎
|