Merge pull request #2732 from martinhsv/v3/master

martinhsv · web-flow · commit 763db3f63a50 · 2022-04-26T21:37:41.000-04:00
Fix initcol error message wording
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 v3.x.y - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+  - Fix initcol error message wording
+    [Issue #2731 - @877509395, @martinhsv]
   - Tolerate other parameters after boundary in multipart C-T
     [Issue #1900 - @martinhsv]
   - Add DebugLog message for bad pattern in rx operator
diff --git a/src/actions/init_col.cc b/src/actions/init_col.cc
@@ -46,7 +46,7 @@ bool InitCol::init(std::string *error) {
         m_collection_key != "global" &&
         m_collection_key != "resource") {
         error->assign("Something wrong with initcol: collection must be " \
-            "`ip' or `global'");
+            "`ip', `global' or `resource'");
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ bool InitCol::init(std::string *error) {`
`46`	`46`	`m_collection_key != "global" &&`
`47`	`47`	`m_collection_key != "resource") {`
`48`	`48`	`error->assign("Something wrong with initcol: collection must be " \`
`49`		- "`ip' or `global'");
	`49`	+ "`ip', `global' or `resource'");
`50`	`50`	`return false;`
`51`	`51`	`}`
`52`	`52`