From ce3cf00a2c11c1dc0b79fba0eed2eb4782cbe168 Mon Sep 17 00:00:00 2001
From: Breno Silva <breno.silva@gmail.com>
Date: Wed, 31 Oct 2012 17:05:41 -0400
Subject: [PATCH] Fixed byte conversion issue during logging under zlinux

---
 CHANGES               | 2 ++
 apache2/msc_logging.c | 4 ++++
 apache2/msc_util.c    | 9 +++++++++
 apache2/msc_util.h    | 5 +++++
 configure.ac          | 8 +++++++-
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 459a5707..b293d106 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,8 @@
   * Added a better random bytes generator using apr_generate_random_bytes() to create
     the HMAC key.
 
+  * Fixed byte conversion issue during logging under Linux s390x platform.
+
   * Fixed compilation bug with LibXML2 2.9.0 (Thanks Athmane Madjoudj).
 
   * Fixed parsing error with modsecurity-recommended.conf and Apache 2.4.
diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c
index 8b560d4b..b2f2e445 100644
--- a/apache2/msc_logging.c
+++ b/apache2/msc_logging.c
@@ -229,7 +229,11 @@ static char *construct_auditlog_filename(apr_pool_t *mp, const char *uniqueid) {
  * as an audit log boundary.
  */
 static char *create_auditlog_boundary(request_rec *r) {
+#ifdef LINUX_S390
+    int data = swap_int32(rand());
+#else
     unsigned long data = rand();
+#endif
     /* Do note that I tried using apr_generate_random_bytes but it turned
      * out to be terribly slow for some reason. Needs further investigation.
      */
diff --git a/apache2/msc_util.c b/apache2/msc_util.c
index bb2d3457..8f9d3d0e 100644
--- a/apache2/msc_util.c
+++ b/apache2/msc_util.c
@@ -74,6 +74,15 @@ static unsigned char *c2x(unsigned what, unsigned char *where);
 static unsigned char x2c(unsigned char *what);
 static unsigned char xsingle2c(unsigned char *what);
 
+#ifdef LINUX_S390
+int swap_int32(int x) {
+    int swap = ((x>>24)&0xff) | ((x<<8)&0xff0000) |
+                ((x>>8)&0xff00) | ((x<<24)&0xff000000);
+    return swap;
+}
+#endif
+
+
 /** \brief Decode utf-8 to unicode format.
  *
  * \param mp Pointer to memory pool
diff --git a/apache2/msc_util.h b/apache2/msc_util.h
index 76227df8..06fa26c5 100644
--- a/apache2/msc_util.h
+++ b/apache2/msc_util.h
@@ -46,6 +46,11 @@ int DSOLOCAL inet_pton(int family, const char *src, void *dst);
 #define UNICODE_ERROR_RESTRICTED_CHARACTER  -4
 #define UNICODE_ERROR_DECODING_ERROR        -5
 
+#ifdef LINUX_S390
+int DSOLOCAL swap_int32(int x);
+#endif
+
+
 char DSOLOCAL *utf8_unicode_inplace_ex(apr_pool_t *mp, unsigned char *input, long int input_len, int *changed);
 
 char DSOLOCAL *m_strcasestr(const char *haystack, const char *needle);
diff --git a/configure.ac b/configure.ac
index 703a57e9..05283b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,11 @@ case $host in
   *-*-linux*)
     echo "Checking plataform... Identified as Linux"
     linuxos=true
+        case "${host_cpu}" in
+            s390x)
+            cpu_type="-DLINUX_S390"
+        ;;
+        esac
     ;;
   *-*-solaris*)
     echo "Checking plataform... Identified as Solaris"
@@ -135,6 +140,7 @@ AM_CONDITIONAL([AIX], [test x$aixos = xtrue])
 AM_CONDITIONAL([HPUX], [test x$hpuxos = xtrue])
 AM_CONDITIONAL([MACOSX], [test x$macos = xtrue])
 AM_CONDITIONAL([LINUX], [test x$linuxos = xtrue])
+AM_CONDITIONAL([LINUX390], [test x$linuxos390 = xtrue])
 AM_CONDITIONAL([SOLARIS], [test x$solarisos = xtrue])
 AM_CONDITIONAL([FREEBSD], [test x$freebsdos = xtrue])
 AM_CONDITIONAL([OPENBSD], [test x$openbsdos = xtrue])
@@ -627,7 +633,7 @@ else
   fi
 fi
 
-MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api"
+MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type"
 
 APXS_WRAPPER=build/apxs-wrapper
 APXS_EXTRA_CFLAGS=""