diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-30 11:18:35 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-30 11:18:35 +0100 |
| commit | c5cbc173bac6c24ec5c386ea742bd40e9d539993 (patch) | |
| tree | 9885c0c512d5e94aedfe2be03d0ba053a6c5afd8 | |
| parent | b34cf54f8f91d6bb758f7ea16610841cb35b5974 (diff) | |
| parent | 8aa4d8ea680f398a0afc8f0c0a7379e4fe096763 (diff) | |
| download | rabbitmq-server-c5cbc173bac6c24ec5c386ea742bd40e9d539993.tar.gz | |
Merging bug 23315 into default
| -rw-r--r-- | src/file_handle_cache.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 24 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index d2830a25..6a948d49 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -1171,7 +1171,7 @@ ulimit() -> ?FILE_HANDLES_LIMIT_WINDOWS; {unix, _OsName} -> %% Under Linux, Solaris and FreeBSD, ulimit is a shell - %% builtin, not a command. In OS X, it's a command. + %% builtin, not a command. In OS X and AIX it's a command. %% Fortunately, os:cmd invokes the cmd in a shell env, so %% we're safe in all cases. case os:cmd("ulimit -n") of diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index fe5ffccc..db5c71f6 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -46,8 +46,6 @@ -include("rabbit.hrl"). -include_lib("kernel/include/inet.hrl"). --include_lib("ssl/src/ssl_record.hrl"). - -define(RABBIT_TCP_OPTS, [ binary, @@ -120,27 +118,7 @@ boot_ssl() -> end} | SslOptsConfig] end, - % filter that removes RC4 ciphers can be - % removed when at least R14B (SSL 4.0.1) is required - CipherSuites = proplists:get_value(ciphers, - SslOpts, - ssl:cipher_suites()), - FilteredCipherSuites = - [C || C <- CipherSuites, - begin - SuiteCode = - if is_tuple(C) -> ssl_cipher:suite(C); - is_list(C) -> ssl_cipher:openssl_suite(C) - end, - SP = ssl_cipher:security_parameters( - SuiteCode, - #security_parameters{}), - SP#security_parameters.bulk_cipher_algorithm =/= ?RC4 - end], - SslOpts1 = [{ciphers, FilteredCipherSuites} - | [{K, V} || {K, V} <- SslOpts, K =/= ciphers]], - [start_ssl_listener(Host, Port, SslOpts1) - || {Host, Port} <- SslListeners], + [start_ssl_listener(Host, Port, SslOpts) || {Host, Port} <- SslListeners], ok end. |