[X2Go-Commits] [x2gohtmlclient] 01/01: conf/nginx/snippets/x2gohtmlclient-wswrapper.conf: Put regular expression into double-quotes. Otherwise nginx misinterprets the curly braces as config block braces.

git-admin at x2go.org git-admin at x2go.org
Tue Dec 7 17:45:49 CET 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gohtmlclient.

commit 38e46ea964a4102e25ef2fdcd7b3cfd792605158
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 7 17:43:40 2021 +0100

    conf/nginx/snippets/x2gohtmlclient-wswrapper.conf: Put regular expression into double-quotes. Otherwise nginx misinterprets the curly braces as config block braces.
---
 conf/nginx/snippets/x2gohtmlclient-wswrapper.conf | 2 +-
 debian/changelog                                  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/conf/nginx/snippets/x2gohtmlclient-wswrapper.conf b/conf/nginx/snippets/x2gohtmlclient-wswrapper.conf
index ade1002..7a03866 100644
--- a/conf/nginx/snippets/x2gohtmlclient-wswrapper.conf
+++ b/conf/nginx/snippets/x2gohtmlclient-wswrapper.conf
@@ -2,7 +2,7 @@
 
 proxy_read_timeout 300;
 
-location ~ ^/x2gows/([0-9]{4,5})$ {
+location ~ "^/x2gows/([0-9]{4,5})$" {
 	proxy_pass       http://127.0.0.1:$1;
 	proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection "upgrade";
diff --git a/debian/changelog b/debian/changelog
index 5c76a8c..fd9fc38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 x2gohtmlclient (1.0-0x2go1) UNRELEASED; urgency=medium
 
-  [ Mike Gabriel ]
+  [ Oleksandr Shneyder ]
   * Initial release.
+
+  [ Mike Gabriel ]
+  * conf/nginx/snippets/x2gohtmlclient-wswrapper.conf:
+    - Put regular expression into double-quotes. Otherwise nginx misinterprets
+      the curly braces as config block braces.
   * d/control: Add nginx to Suggests: field.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 11:10:43 +0200

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gohtmlclient.git


More information about the x2go-commits mailing list