From 7380fab68ba3ac9a7d50588d346ab7106f105dce Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 27 Aug 2014 13:55:10 +0200 Subject: [PATCH 1/3] NetSSL: Fix typo in documentation --- NetSSL_OpenSSL/include/Poco/Net/Context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NetSSL_OpenSSL/include/Poco/Net/Context.h b/NetSSL_OpenSSL/include/Poco/Net/Context.h index 7fbcffc84..c99def1ae 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Context.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Context.h @@ -52,7 +52,7 @@ public: CLIENT_USE, /// Context is used by a client. SERVER_USE, /// Context is used by a server. TLSV1_CLIENT_USE, /// Context is used by a client requiring TLSv1. - TLSV1_SERVER_USE /// Context is used by a server requiring TLSv2. + TLSV1_SERVER_USE /// Context is used by a server requiring TLSv1. }; enum VerificationMode From 069a98094077c29ffc18775e27e2024a5ccb3d55 Mon Sep 17 00:00:00 2001 From: Paul Rosset Date: Fri, 29 Aug 2014 10:28:05 +0200 Subject: [PATCH 2/3] fixed websocket server to work with websocket.org --- Net/samples/WebSocketServer/src/WebSocketServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/samples/WebSocketServer/src/WebSocketServer.cpp b/Net/samples/WebSocketServer/src/WebSocketServer.cpp index aa260277a..4b8daf28b 100644 --- a/Net/samples/WebSocketServer/src/WebSocketServer.cpp +++ b/Net/samples/WebSocketServer/src/WebSocketServer.cpp @@ -163,7 +163,7 @@ public: 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; From 9af456762f26ac521e826d950fa862cec24c0cda Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Fri, 29 Aug 2014 18:29:08 -0500 Subject: [PATCH 3/3] Update buildwin.ps1 --- buildwin.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildwin.ps1 b/buildwin.ps1 index 6fc748074..51ff757bd 100644 --- a/buildwin.ps1 +++ b/buildwin.ps1 @@ -62,7 +62,7 @@ Param function Add-Env-Var([string] $lib, [string] $var) { - if ((${Env:$var} -eq $null) -or (-not ${Env:$var}.Contains(${Env:$lib_$var"}))) + if ((${Env:$var} -eq $null) -or (-not ${Env:$var}.Contains(${Env:$lib_$var}))) { $libvar = "$lib" + "_" + "$var" $envvar = [Environment]::GetEnvironmentVariable($libvar, "Process")