diff options
| author | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
| commit | a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203 (patch) | |
| tree | 612f52c27a693e57feff96f1bfa0fa1d01e0a0af /lib/inets/src/http_server | |
| parent | f602ae4f0c727c1ff37e69887ba33f46b24c54e1 (diff) | |
| parent | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff) | |
| download | otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.gz otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.bz2 otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.zip | |
Merge branch 'bmk/inets/inets58_integration' into major
[httpc] Deprecated interface module <c>http</c> has been removed.
It has (long) been replaced by http client interface module httpc.
OTP-9359
[httpc|httpd] The old ssl implementation (based on OpenSSL),
has been deprecated. The config option that specified usage of
this version of the ssl app, *ossl*, has been removed.
OTP-9522
Diffstat (limited to 'lib/inets/src/http_server')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index f4d8a6c09f..189527e2b3 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -219,9 +219,8 @@ load("ServerName " ++ ServerName, []) -> load("SocketType " ++ SocketType, []) -> %% ssl is the same as HTTP_DEFAULT_SSL_KIND - %% ossl is ssl based on OpenSSL (the "old" ssl) %% essl is the pure Erlang-based ssl (the "new" ssl) - case check_enum(clean(SocketType), ["ssl", "ossl", "essl", "ip_comm"]) of + case check_enum(clean(SocketType), ["ssl", "essl", "ip_comm"]) of {ok, ValidSocketType} -> {ok, [], {socket_type, ValidSocketType}}; {error,_} -> @@ -541,7 +540,6 @@ validate_config_params([{server_name, Value} | _]) -> validate_config_params([{socket_type, Value} | Rest]) when (Value =:= ip_comm) orelse (Value =:= ssl) orelse - (Value =:= ossl) orelse (Value =:= essl) -> validate_config_params(Rest); validate_config_params([{socket_type, Value} | _]) -> @@ -811,7 +809,7 @@ lookup_socket_type(ConfigDB) -> case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of ip_comm -> ip_comm; - SSL when (SSL =:= ssl) orelse (SSL =:= ossl) orelse (SSL =:= essl) -> + SSL when (SSL =:= ssl) orelse (SSL =:= essl) -> SSLTag = if (SSL =:= ssl) -> |