nginx-util: do not use fallthrough attribute
authorPeter Stadler <peter.stadler@student.uibk.ac.at>
Wed, 19 May 2021 08:38:44 +0000 (10:38 +0200)
committerRosen Penev <rosenp@gmail.com>
Tue, 1 Jun 2021 00:25:22 +0000 (17:25 -0700)
fixes issue #15653

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
(cherry picked from commit 49a84e9b226c617929e3ad30aad27ab35712f096)

net/nginx-util/Makefile
net/nginx-util/src/nginx-ssl-util.hpp

index 54eb8bf876d22f37c11a298f03dde71d6e5fc66e..b1d9c5e6fa626b367a33d19adebf1fe30a86fdc1 100644 (file)
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx-util
-PKG_VERSION:=1.5
+PKG_VERSION:=1.6
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
 
index 4f12925db8eb6234b29ef4460a22f462fdf2703b..5a64b000a847c1d217bd04bf22630b8bc463bb1f 100644 (file)
@@ -166,9 +166,14 @@ static constexpr auto _escape = _Line{
         std::string ret{};
         for (char c : strptr) {
             switch (c) {
-                case '^': ret += '\\'; [[fallthrough]];
-                case '_': [[fallthrough]];
-                case '-': ret += c; break;
+                case '^':
+                    ret += '\\';
+                    ret += c;
+                    break;
+                case '_':
+                case '-':
+                    ret += c;
+                    break;
                 default:
                     if ((isalpha(c) != 0) || (isdigit(c) != 0)) {
                         ret += c;