diff options
| author | Micael Karlberg <[email protected]> | 2011-09-05 18:05:41 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-05 18:05:41 +0200 |
| commit | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (patch) | |
| tree | a657435e665c928ae22b723eb4fd3967aacf426e /lib/inets/src/http_server/httpd_conf.erl | |
| parent | cb1f02ef176767076593a1957506117d9f26dc40 (diff) | |
| parent | 396b490bb3a604152d4afffac672aa0c48174c16 (diff) | |
| download | otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.tar.gz otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.tar.bz2 otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.zip | |
Merge branch 'bmk/inets/ossl_removed_from_ssl_app/OTP-9522' into bmk/inets/inets58_integration
Diffstat (limited to 'lib/inets/src/http_server/httpd_conf.erl')
| -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) -> |