Skip to content

Commit c3953d7

Browse files
committed
Fixed merge from TFS failure (commit 3537d1e) (codeplex #204)
1 parent 83c458f commit c3953d7

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Release/src/http/listener/http_listener.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ static void check_listener_uri(const http::uri &address)
3939
{
4040
// Somethings like proper URI schema are verified by the URI class.
4141
// We only need to check certain things specific to HTTP.
42+
43+
#ifdef _MS_WINDOWS
44+
//HTTP Server API includes SSL support
45+
if(address.scheme() != U("http") && address.scheme() != U("https"))
46+
{
47+
throw std::invalid_argument("URI scheme must be 'http' or 'https'");
48+
}
49+
#else
4250
if(address.scheme() == U("https"))
4351
{
4452
throw std::invalid_argument("Listeners using 'https' are not yet supported");
@@ -48,6 +56,7 @@ static void check_listener_uri(const http::uri &address)
4856
{
4957
throw std::invalid_argument("URI scheme must be 'http'");
5058
}
59+
#endif
5160

5261
if(address.host().empty())
5362
{

0 commit comments

Comments
 (0)