@@ -163,7 +163,7 @@ class RequestHandlerFactory: public HTTPRequestHandlerFactory
 			app.logger().information(it->first + ": " + it->second);
 		}
 
-		if (request.getURI() == "/ws")
+		if(request.find("Upgrade") != request.end() && request["Upgrade"] == "websocket")
 			return new WebSocketRequestHandler;
 		else
 			return new PageRequestHandler;
 
@@ -340,7 +340,7 @@ void Context::createSSLContext()
 			break;
 #endif
 		default:
-			throw Poco::InvalidArgumentException("Invalid usage");
+			throw Poco::InvalidArgumentException("Invalid or unsupported usage");
 		}
 	}
 	if (!_pSSLContext)
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ class RequestHandlerFactory: public HTTPRequestHandlerFactory`
`163`	`163`	`app.logger().information(it->first + ": " + it->second);`
`164`	`164`	`}`
`165`	`165`
`166`		`- if (request.getURI() == "/ws")`
	`166`	`+ if(request.find("Upgrade") != request.end() && request["Upgrade"] == "websocket")`
`167`	`167`	`return new WebSocketRequestHandler;`
`168`	`168`	`else`
`169`	`169`	`return new PageRequestHandler;`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ void Context::createSSLContext()`
`340`	`340`	`break;`
`341`	`341`	`#endif`
`342`	`342`	`default:`
`343`		`- throw Poco::InvalidArgumentException("Invalid usage");`
	`343`	`+ throw Poco::InvalidArgumentException("Invalid or unsupported usage");`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`	`if (!_pSSLContext)`