diff options
| author | Micael Karlberg <[email protected]> | 2011-09-05 15:29:46 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-05 15:29:46 +0200 |
| commit | 9f6baf2f3158117dab2e9daf92b2ac896c80d306 (patch) | |
| tree | 02d20ba9701d66e881017a4a0e841481195e2915 /lib/inets/src/http_server | |
| parent | cb1f02ef176767076593a1957506117d9f26dc40 (diff) | |
| download | otp-9f6baf2f3158117dab2e9daf92b2ac896c80d306.tar.gz otp-9f6baf2f3158117dab2e9daf92b2ac896c80d306.tar.bz2 otp-9f6baf2f3158117dab2e9daf92b2ac896c80d306.zip | |
Removed the ossl config option (from both client and server).
The ossl option is no longer valid since the old ssl (OpenSSL
based ssl variant) has been removed from the ssl app.
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) -> |