diff --git a/headers/modsecurity/modsecurity.h b/headers/modsecurity/modsecurity.h index 7f0921af..7d9e58d1 100644 --- a/headers/modsecurity/modsecurity.h +++ b/headers/modsecurity/modsecurity.h @@ -198,9 +198,9 @@ namespace modsecurity { MODSECURITY_MINOR "." MODSECURITY_PATCHLEVEL \ MODSECURITY_TAG -#define MODSECURITY_VERSION_NUM MODSECURITY_MAJOR \ - MODSECURITY_MINOR MODSECURITY_PATCHLEVEL MODSECURITY_TAG_NUM +#define MODSECURITY_VERSION_NUM 3040100 +#define MODSECURITY_CHECK_VERSION(a) (MODSECURITY_VERSION_NUM <= a) /* * @name ModSecLogCb diff --git a/src/Makefile.am b/src/Makefile.am index 4961ea5c..cb0fe206 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,8 +44,8 @@ pkginclude_HEADERS = \ ../headers/modsecurity/rule.h \ ../headers/modsecurity/rules.h \ ../headers/modsecurity/rule_message.h \ - ../headers/modsecurity/rules.h \ ../headers/modsecurity/rules_set.h \ + ../headers/modsecurity/rules_set_phases.h \ ../headers/modsecurity/rules_set_properties.h \ ../headers/modsecurity/rules_exceptions.h \ ../headers/modsecurity/transaction.h \ diff --git a/src/utils/https_client.cc b/src/utils/https_client.cc index fcaa2816..2ed4de62 100644 --- a/src/utils/https_client.cc +++ b/src/utils/https_client.cc @@ -64,7 +64,7 @@ bool HttpsClient::download(const std::string &uri) { CURL *curl; CURLcode res; std::string uniqueId = "ModSec-unique-id: " + UniqueId::uniqueId(); - std::string status = "ModSec-status: " MODSECURITY_VERSION_NUM; + std::string status = "ModSec-status: " + std::to_string(MODSECURITY_VERSION_NUM); curl = curl_easy_init(); if (!curl) {