diff options
| author | Micael Karlberg <[email protected]> | 2011-04-19 13:38:54 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-19 13:38:54 +0200 |
| commit | cddd6988812ae2a6e696db2f49fba5b0eee4d570 (patch) | |
| tree | 1b531bfd335d35283ed5e8957a47b594e0fed6e7 /lib/inets/src | |
| parent | f9346bbd247b8fcef5e4f68e94b429cb39f9d4ac (diff) | |
| parent | 5488c7843c8930d14d1d0d2ec0aa23d0d491afbc (diff) | |
| download | otp-cddd6988812ae2a6e696db2f49fba5b0eee4d570.tar.gz otp-cddd6988812ae2a6e696db2f49fba5b0eee4d570.tar.bz2 otp-cddd6988812ae2a6e696db2f49fba5b0eee4d570.zip | |
Merge branch 'bmk/inets/default_ssl/OTP-9230' into bmk/inets/inet56_integration
OTP-9230
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_lib/http_internal.hrl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_lib/http_internal.hrl b/lib/inets/src/http_lib/http_internal.hrl index 5440f214b5..2e924667c6 100644 --- a/lib/inets/src/http_lib/http_internal.hrl +++ b/lib/inets/src/http_lib/http_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2010. All Rights Reserved. +%% Copyright Ericsson AB 2002-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -28,8 +28,8 @@ -define(HTTP_MAX_URI_SIZE, nolimit). -ifndef(HTTP_DEFAULT_SSL_KIND). --define(HTTP_DEFAULT_SSL_KIND, ossl). -%% -define(HTTP_DEFAULT_SSL_KIND, essl). +%% -define(HTTP_DEFAULT_SSL_KIND, ossl). +-define(HTTP_DEFAULT_SSL_KIND, essl). -endif. % -ifdef(HTTP_DEFAULT_SSL_KIND). |