diff --git a/src/Makefile.am b/src/Makefile.am index c926c7c8..a1cebe28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -211,19 +211,20 @@ OPERATORS = \ UTILS = \ - utils/acmp.cc \ - utils/base64.cc \ - utils/decode.cc \ - utils/geo_lookup.cc \ - utils/https_client.cc \ - utils/ip_tree.cc \ - utils/md5.cc \ - utils/msc_string.cc \ - utils/msc_tree.cc \ - utils/random.cc \ - utils/regex.cc \ - utils/sha1.cc \ - utils/system.cc + utils/acmp.cc \ + utils/base64.cc \ + utils/decode.cc \ + utils/geo_lookup.cc \ + utils/https_client.cc \ + utils/ip_tree.cc \ + utils/md5.cc \ + utils/msc_tree.cc \ + utils/random.cc \ + utils/regex.cc \ + utils/sha1.cc \ + utils/string.cc \ + utils/system.cc + COLLECTION = \ diff --git a/src/actions/allow.cc b/src/actions/allow.cc index f858d6e2..e76dc590 100644 --- a/src/actions/allow.cc +++ b/src/actions/allow.cc @@ -20,7 +20,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "modsecurity/modsecurity.h" diff --git a/src/actions/ctl/rule_remove_target_by_id.cc b/src/actions/ctl/rule_remove_target_by_id.cc index e3003bf5..300551b8 100644 --- a/src/actions/ctl/rule_remove_target_by_id.cc +++ b/src/actions/ctl/rule_remove_target_by_id.cc @@ -20,7 +20,7 @@ #include #include "modsecurity/transaction.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/actions/ctl/rule_remove_target_by_tag.cc b/src/actions/ctl/rule_remove_target_by_tag.cc index 18009320..c8f02971 100644 --- a/src/actions/ctl/rule_remove_target_by_tag.cc +++ b/src/actions/ctl/rule_remove_target_by_tag.cc @@ -20,7 +20,7 @@ #include #include "modsecurity/transaction.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/actions/phase.cc b/src/actions/phase.cc index 5507646f..865914cf 100644 --- a/src/actions/phase.cc +++ b/src/actions/phase.cc @@ -21,7 +21,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "modsecurity/modsecurity.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/actions/set_var.cc b/src/actions/set_var.cc index 4420aaa4..6fd19c62 100644 --- a/src/actions/set_var.cc +++ b/src/actions/set_var.cc @@ -21,7 +21,7 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" #include "src/macro_expansion.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/actions/severity.cc b/src/actions/severity.cc index 2ec199e8..82e4e434 100644 --- a/src/actions/severity.cc +++ b/src/actions/severity.cc @@ -21,7 +21,7 @@ #include "src/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/transformations/css_decode.cc b/src/actions/transformations/css_decode.cc index eac6f485..a69200b9 100644 --- a/src/actions/transformations/css_decode.cc +++ b/src/actions/transformations/css_decode.cc @@ -26,7 +26,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/actions/transformations/escape_seq_decode.cc b/src/actions/transformations/escape_seq_decode.cc index 6d4db1f3..44bf136b 100644 --- a/src/actions/transformations/escape_seq_decode.cc +++ b/src/actions/transformations/escape_seq_decode.cc @@ -25,7 +25,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/hex_decode.cc b/src/actions/transformations/hex_decode.cc index f7bbba7d..9c99d2f7 100644 --- a/src/actions/transformations/hex_decode.cc +++ b/src/actions/transformations/hex_decode.cc @@ -25,7 +25,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/html_entity_decode.h b/src/actions/transformations/html_entity_decode.h index 75c20e04..8e9d92fd 100644 --- a/src/actions/transformations/html_entity_decode.h +++ b/src/actions/transformations/html_entity_decode.h @@ -18,7 +18,7 @@ #include "src/actions/action.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #ifndef SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_ #define SRC_ACTIONS_TRANSFORMATIONS_HTML_ENTITY_DECODE_H_ diff --git a/src/actions/transformations/js_decode.cc b/src/actions/transformations/js_decode.cc index aaa8aee0..cc7ee2af 100644 --- a/src/actions/transformations/js_decode.cc +++ b/src/actions/transformations/js_decode.cc @@ -26,7 +26,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/actions/transformations/sql_hex_decode.cc b/src/actions/transformations/sql_hex_decode.cc index 194c977f..e1fe560e 100644 --- a/src/actions/transformations/sql_hex_decode.cc +++ b/src/actions/transformations/sql_hex_decode.cc @@ -25,7 +25,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/actions/transformations/url_decode_uni.cc b/src/actions/transformations/url_decode_uni.cc index 9d842137..0014efa8 100644 --- a/src/actions/transformations/url_decode_uni.cc +++ b/src/actions/transformations/url_decode_uni.cc @@ -27,7 +27,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "modsecurity/rules.h" namespace modsecurity { diff --git a/src/actions/transformations/url_encode.cc b/src/actions/transformations/url_encode.cc index d15e5f27..ffcf2ed7 100644 --- a/src/actions/transformations/url_encode.cc +++ b/src/actions/transformations/url_encode.cc @@ -24,7 +24,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { namespace actions { diff --git a/src/actions/transformations/utf8_to_unicode.cc b/src/actions/transformations/utf8_to_unicode.cc index b48b4a3c..175cea5a 100644 --- a/src/actions/transformations/utf8_to_unicode.cc +++ b/src/actions/transformations/utf8_to_unicode.cc @@ -25,7 +25,7 @@ #include "modsecurity/transaction.h" #include "src/actions/transformations/transformation.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/collection/backend/in_memory-per_process.cc b/src/collection/backend/in_memory-per_process.cc index ff5f6f9e..0f3bbeb0 100644 --- a/src/collection/backend/in_memory-per_process.cc +++ b/src/collection/backend/in_memory-per_process.cc @@ -25,7 +25,7 @@ #include "modsecurity/collection/variable.h" #include "src/utils/regex.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/collection/collections.cc b/src/collection/collections.cc index bd9833c5..82ad72a6 100644 --- a/src/collection/collections.cc +++ b/src/collection/collections.cc @@ -27,7 +27,7 @@ #include "modsecurity/collection/variable.h" #include "modsecurity/collection/collection.h" #include "src/collection/backend/in_memory-per_process.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/macro_expansion.cc b/src/macro_expansion.cc index 59c52997..302d5fae 100644 --- a/src/macro_expansion.cc +++ b/src/macro_expansion.cc @@ -19,7 +19,7 @@ #include "src/variables/rule.h" #include "src/variables/tx.h" #include "src/variables/highest_severity.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index d903ed43..10c1273f 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -55,7 +55,7 @@ class Driver; #include "modsecurity/rule.h" #include "src/operators/operator.h" #include "src/utils/geo_lookup.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "src/utils/system.h" #include "src/variables/xml.h" #include "src/variables/duration.h" diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index bfce46f3..88e49f92 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -7,7 +7,7 @@ #include "src/parser/driver.h" #include "src/parser/seclang-parser.hh" #include "src/utils/https_client.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::Parser::Driver; using modsecurity::Utils::HttpsClient; diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc index 471b0101..bb777ec4 100644 --- a/src/request_body_processor/multipart.cc +++ b/src/request_body_processor/multipart.cc @@ -28,7 +28,7 @@ #include "modsecurity/collection/collections.h" #include "modsecurity/rules.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/rule.cc b/src/rule.cc index 29c03965..58b14347 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -30,7 +30,7 @@ #include "src/actions/transformations/none.h" #include "src/actions/tag.h" #include "src/variables/variations/exclusion.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "modsecurity/rules.h" #include "modsecurity/rule_message.h" #include "src/macro_expansion.h" diff --git a/src/rule_message.cc b/src/rule_message.cc index 8e8e1c30..93036369 100644 --- a/src/rule_message.cc +++ b/src/rule_message.cc @@ -19,7 +19,7 @@ #include "modsecurity/modsecurity.h" #include "modsecurity/transaction.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/rules_exceptions.cc b/src/rules_exceptions.cc index 356b0520..e4e7aad3 100644 --- a/src/rules_exceptions.cc +++ b/src/rules_exceptions.cc @@ -17,7 +17,7 @@ #include -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/transaction.cc b/src/transaction.cc index 6da0445b..1d18ed31 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -41,7 +41,7 @@ #include "src/request_body_processor/json.h" #include "src/audit_log/audit_log.h" #include "src/unique_id.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #include "src/utils/system.h" #include "src/utils/decode.h" #include "src/utils/random.h" diff --git a/src/utils/decode.cc b/src/utils/decode.cc index 42a38da3..c33f46d4 100644 --- a/src/utils/decode.cc +++ b/src/utils/decode.cc @@ -15,7 +15,7 @@ #include "src/utils/decode.h" #include "modsecurity/modsecurity.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/utils/decode.h b/src/utils/decode.h index c39072f4..98304722 100644 --- a/src/utils/decode.h +++ b/src/utils/decode.h @@ -19,7 +19,7 @@ #include #include "modsecurity/modsecurity.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" #ifndef SRC_UTILS_DECODE_H_ #define SRC_UTILS_DECODE_H_ diff --git a/src/utils/msc_string.cc b/src/utils/string.cc similarity index 99% rename from src/utils/msc_string.cc rename to src/utils/string.cc index 6e86b0cc..797c9cf8 100644 --- a/src/utils/msc_string.cc +++ b/src/utils/string.cc @@ -39,7 +39,7 @@ #include "modsecurity/modsecurity.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" namespace modsecurity { diff --git a/src/utils/msc_string.h b/src/utils/string.h similarity index 100% rename from src/utils/msc_string.h rename to src/utils/string.h diff --git a/src/variables/rule.cc b/src/variables/rule.cc index 5e45ca44..38a7f53d 100644 --- a/src/variables/rule.cc +++ b/src/variables/rule.cc @@ -44,7 +44,7 @@ #include "src/actions/xmlns.h" #include "src/actions/log_data.h" #include "src/actions/msg.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/src/variables/variable.cc b/src/variables/variable.cc index d2a3f873..c8379185 100644 --- a/src/variables/variable.cc +++ b/src/variables/variable.cc @@ -22,7 +22,7 @@ #include "modsecurity/transaction.h" #include "src/variables/variations/exclusion.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/test/unit/unit.cc b/test/unit/unit.cc index 28d7795c..c963df31 100644 --- a/test/unit/unit.cc +++ b/test/unit/unit.cc @@ -28,7 +28,7 @@ #include "test/common/modsecurity_test_results.h" #include "test/common/colors.h" #include "test/unit/unit_test.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String; diff --git a/test/unit/unit_test.cc b/test/unit/unit_test.cc index ab04da41..2d884055 100644 --- a/test/unit/unit_test.cc +++ b/test/unit/unit_test.cc @@ -24,7 +24,7 @@ #include "test/common/colors.h" #include "src/utils/regex.h" -#include "src/utils/msc_string.h" +#include "src/utils/string.h" using modsecurity::utils::String;