From 94dac7ac5aa7ff637e27d6e920d11d751a0499e2 Mon Sep 17 00:00:00 2001
From: martinhsv <55407942+martinhsv@users.noreply.github.com>
Date: Wed, 23 Oct 2019 07:47:35 -0700
Subject: [PATCH 1/4] Fix test issue-1974

---
 src/actions/transformations/transformation.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/transformations/transformation.cc b/src/actions/transformations/transformation.cc
index e7a1191df6..77cbf7e4c5 100644
--- a/src/actions/transformations/transformation.cc
+++ b/src/actions/transformations/transformation.cc
@@ -114,7 +114,7 @@ Transformation* Transformation::instantiate(std::string a) {
     IF_MATCH(urlDecodeUni) { return new UrlDecodeUni(a); }
     IF_MATCH(urlDecode) { return new UrlDecode(a); }
     IF_MATCH(urlEncode) { return new UrlEncode(a); }
-    IF_MATCH(utf8ToUnicode) { return new Utf8ToUnicode(a); }
+    IF_MATCH(utf8toUnicode) { return new Utf8ToUnicode(a); }
 
     return new Transformation(a);
 }

From a24aed40e516bb260c8475ca66b2bd322420c21c Mon Sep 17 00:00:00 2001
From: martinhsv <55407942+martinhsv@users.noreply.github.com>
Date: Thu, 24 Oct 2019 13:19:48 -0700
Subject: [PATCH 2/4] Fix: audit log part for response body for JSON format to
 be E

---
 CHANGES            | 2 ++
 src/transaction.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 58cf75cb3c..c5c6b09bd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.4 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Fix: audit log part for response body for JSON format to be E
+   [Issue #2066 - @martinhsv, @zimmerle]
  - Make sure m_rulesMessages is filled after successfull match
    [Issue #2000, #2048 - @victorhora, @defanator]
  - Fix @pm lookup for possible matches on offset zero.
diff --git a/src/transaction.cc b/src/transaction.cc
index e2d5190c98..a237496cbc 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -1593,7 +1593,7 @@ std::string Transaction::toJSON(int parts) {
         strlen("response"));
     yajl_gen_map_open(g);
 
-    if (parts & audit_log::AuditLog::GAuditLogPart) {
+    if (parts & audit_log::AuditLog::EAuditLogPart) {
         LOGFY_ADD("body", this->m_responseBody.str().c_str());
     }
     LOGFY_ADD_NUM("http_code", m_httpCodeReturned);

From 07635fa6e4a09b0ac9dbf06c14c8460658bc50f4 Mon Sep 17 00:00:00 2001
From: martinhsv <55407942+martinhsv@users.noreply.github.com>
Date: Thu, 24 Oct 2019 13:45:42 -0700
Subject: [PATCH 3/4] Revert "Fix: audit log part for response body for JSON
 format to be E"

This reverts commit a24aed40e516bb260c8475ca66b2bd322420c21c.
---
 CHANGES            | 2 --
 src/transaction.cc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index c5c6b09bd4..58cf75cb3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,6 @@
 v3.0.4 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
- - Fix: audit log part for response body for JSON format to be E
-   [Issue #2066 - @martinhsv, @zimmerle]
  - Make sure m_rulesMessages is filled after successfull match
    [Issue #2000, #2048 - @victorhora, @defanator]
  - Fix @pm lookup for possible matches on offset zero.
diff --git a/src/transaction.cc b/src/transaction.cc
index a237496cbc..e2d5190c98 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -1593,7 +1593,7 @@ std::string Transaction::toJSON(int parts) {
         strlen("response"));
     yajl_gen_map_open(g);
 
-    if (parts & audit_log::AuditLog::EAuditLogPart) {
+    if (parts & audit_log::AuditLog::GAuditLogPart) {
         LOGFY_ADD("body", this->m_responseBody.str().c_str());
     }
     LOGFY_ADD_NUM("http_code", m_httpCodeReturned);

From a916636e9d9a007a61a51dd1582bc49ea685c870 Mon Sep 17 00:00:00 2001
From: martinhsv <55407942+martinhsv@users.noreply.github.com>
Date: Thu, 24 Oct 2019 14:18:46 -0700
Subject: [PATCH 4/4] Fix: audit log part for response body for JSON format to
 be E

---
 CHANGES            | 2 ++
 src/transaction.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 58cf75cb3c..c5c6b09bd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.4 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Fix: audit log part for response body for JSON format to be E
+   [Issue #2066 - @martinhsv, @zimmerle]
  - Make sure m_rulesMessages is filled after successfull match
    [Issue #2000, #2048 - @victorhora, @defanator]
  - Fix @pm lookup for possible matches on offset zero.
diff --git a/src/transaction.cc b/src/transaction.cc
index e2d5190c98..a237496cbc 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -1593,7 +1593,7 @@ std::string Transaction::toJSON(int parts) {
         strlen("response"));
     yajl_gen_map_open(g);
 
-    if (parts & audit_log::AuditLog::GAuditLogPart) {
+    if (parts & audit_log::AuditLog::EAuditLogPart) {
         LOGFY_ADD("body", this->m_responseBody.str().c_str());
     }
     LOGFY_ADD_NUM("http_code", m_httpCodeReturned);