Using libpcre instead of c++11 regex

src/Makefile.am

@@ -102,6 +102,7 @@ UTILS = \
 	utils/ip_tree.cc \
 	utils/md5.cc \
 	utils/msc_tree.cc \
+	utils/regex.cc \
 	utils/sha1.cc
 
 
@@ -174,12 +175,14 @@ libmodsecurity_la_CPPFLAGS = \
 	-I.. \
 	-g \
 	-O0 \
-	-I ../headers
+	-I ../headers \
+	$(PCRE_CPPFLAGS)
 
 libmodsecurity_la_LIBADD = \
         $(CURL_LDADD) \
         $(GEOIP_LDADD) \
         @LEXLIB@ \
+        $(PCRE_LDADD) \
         $(YAJL_LDADD)
 
 

src/audit_log.cc

@@ -20,10 +20,10 @@
 #include <ctype.h>
 
 #include <fstream>
-#include <regex>
 
 #include "src/audit_log_writer_parallel.h"
 #include "src/audit_log_writer_serial.h"
+#include "utils/regex.h"
 
 #define PARTS_CONSTAINS(a, c) \
     if (new_parts.find(toupper(a)) != std::string::npos \
@@ -134,7 +134,8 @@ bool AuditLog::init() {
 
 bool AuditLog::isRelevant(int status) {
     std::string sstatus = std::to_string(status);
-    return std::regex_search(sstatus, std::regex(this->m_relevant)) != 0;
+    return Utils::regex_search(sstatus,
+        Utils::Regex(this->m_relevant)) != 0;
 }
 
 

src/utils/regex.cc

@@ -0,0 +1,55 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include "utils/regex.h"
+
+#include <pcrecpp.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <string>
+
+#include <fstream>
+#include <iostream>
+
+#include "utils/geo_lookup.h"
+
+namespace ModSecurity {
+namespace Utils {
+
+
+Regex::Regex(const std::string& pattern_)
+    : pattern(pattern_) {
+    if (pattern.empty() == true) {
+        pattern.assign(".*");
+    }
+}
+
+int regex_search(const std::string& s, SMatch *match,
+    const Regex& regex) {
+    pcrecpp::RE re(regex.pattern,
+        pcrecpp::RE_Options(PCRE_DOTALL|PCRE_MULTILINE));
+    match->size_ = re.PartialMatch(s);
+    return match->size_;
+}
+
+int regex_search(const std::string& s, Regex regex) {
+    pcrecpp::RE re(regex.pattern);
+    return re.PartialMatch(s);
+}
+
+}  // namespace Utils
+}  // namespace ModSecurity

src/utils/regex.h

@@ -0,0 +1,53 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#ifndef SRC_UTILS_REGEX_H_
+#define SRC_UTILS_REGEX_H_
+
+
+namespace ModSecurity {
+namespace Utils {
+
+
+class Regex {
+ public:
+    explicit Regex(const std::string& pattern_);
+    std::string pattern;
+};
+
+
+class SMatch {
+ public:
+    SMatch() : size_(0) { }
+    size_t size() { return size_; }
+    int size_;
+};
+
+
+int regex_search(const std::string& s, SMatch *m,
+    const Regex& regex);
+
+int regex_search(const std::string& s, Regex r);
+
+
+
+}  // namespace Utils
+}  // namespace ModSecurity
+
+#endif  // SRC_UTILS_REGEX_H_