github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 11:16:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Variables resolution results now stored into a std::vector instead of std::list

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-11-04 15:51:22 -03:00
parent 2ee5d4ca8f
commit 5bef19aa4d
40 changed files with 143 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
headers/modsecurity/transaction/collections.h
View File

@@ -60,26 +60,21 @@ class Collections :
std::string* resolveFirst(const std::string& collectionName,
const std::string& var);
void resolve(const std::string& var,
std::list<transaction::Variable *> *l);
std::list<transaction::Variable *> *resolve(const std::string& var);
void resolveSingleMatch(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveSingleMatch(const std::string& var,
const std::string& collection,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveMultiMatches(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveMultiMatches(const std::string& var,
const std::string& collection,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveRegularExpression(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveRegularExpression(const std::string& var,
const std::string& collection,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
/**
* This is a special collection to host the transaction variables.

11
headers/modsecurity/transaction/variables.h
View File

@@ -19,6 +19,7 @@
#include <iostream>
#include <unordered_map>
#include <list>
#include <vector>
#endif
@@ -53,17 +54,13 @@ class Variables :
std::string* resolveFirst(const std::string& collectionName,
const std::string& var);
std::list<transaction::Variable *> resolve(const std::string& key);
std::list<Variable *> resolve(const std::string& var,
std::list<transaction::Variable *> *l);
void resolveSingleMatch(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveMultiMatches(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
void resolveRegularExpression(const std::string& var,
std::list<transaction::Variable *> *l);
std::vector<const transaction::Variable *> *l);
};