diff options
| author | Raimo Niskanen <[email protected]> | 2012-10-02 09:27:14 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-10-02 09:27:14 +0200 |
| commit | ab4dbd7a5efdd4e6e059b9287704c85c01f09fc9 (patch) | |
| tree | fc5b32c16f4767a66d90e8c9bb86041d5ae59ae3 /lib/inets/src/http_server | |
| parent | af9a8a011fd06ae54187bae73192c52495090933 (diff) | |
| parent | 016c1d33c5c4e53b28121ec4c1aaf267d508c1aa (diff) | |
| download | otp-ab4dbd7a5efdd4e6e059b9287704c85c01f09fc9.tar.gz otp-ab4dbd7a5efdd4e6e059b9287704c85c01f09fc9.tar.bz2 otp-ab4dbd7a5efdd4e6e059b9287704c85c01f09fc9.zip | |
Merge branch 'raimo/inets/https-proxy/OTP-10256'
* raimo/inets/https-proxy/OTP-10256:
inets httpc: Document that RFC 2817 is not supported
inets: Dialyzer fixes
inets httpc: TLS via proxy
inets: Remove obsolete testcases that are now in the proxy suite
inets: Add tests using external proxy running on localhost
Diffstat (limited to 'lib/inets/src/http_server')
| -rw-r--r-- | lib/inets/src/http_server/httpd_conf.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl index b575d7331b..747118431e 100644 --- a/lib/inets/src/http_server/httpd_conf.erl +++ b/lib/inets/src/http_server/httpd_conf.erl @@ -829,9 +829,7 @@ os_info(Info) -> {OsFamily, _OsName} when Info =:= partial -> lists:flatten(io_lib:format("(~w)", [OsFamily])); {OsFamily, OsName} -> - lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName])); - OsFamily -> - lists:flatten(io_lib:format("(~w)", [OsFamily])) + lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName])) end. otp_release() -> |