Refactoring on rulesProperties class

Among of other things the merge process was improved to detect if
certain properties were set on the origin rule set.
This commit is contained in:
Felipe Zimmerle
2016-10-05 12:01:15 -03:00
parent ae8698d8cf
commit c680ddf2cd
27 changed files with 495 additions and 394 deletions

View File

@@ -28,9 +28,9 @@
#ifndef HEADERS_MODSECURITY_RULES_H_
#define HEADERS_MODSECURITY_RULES_H_
#include "modsecurity/rules_properties.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/transaction.h"
#include "modsecurity/rules_properties.h"
#ifdef __cplusplus
@@ -42,7 +42,7 @@ class Driver;
}
/** @ingroup ModSecurity_CPP_API */
class Rules : public RulesProperties {
class Rules : public RulesProperties {
public:
Rules()
: RulesProperties(new DebugLog()),