From a0781edba2d8936f76dab6899f27afbb712b67ae Mon Sep 17 00:00:00 2001
From: Mihai Pitu <mihaitpitu@gmail.com>
Date: Wed, 4 Sep 2013 22:49:57 +0300
Subject: [PATCH] log messages fix

---
 apache2/msc_release.h              | 8 ++++++--
 java/Makefile.am                   | 4 ++--
 java/org_modsecurity_ModSecurity.c | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apache2/msc_release.h b/apache2/msc_release.h
index a34578b6..00f53939 100644
--- a/apache2/msc_release.h
+++ b/apache2/msc_release.h
@@ -1,4 +1,4 @@
-/*
+/*
 * ModSecurity for Apache 2.x, http://www.modsecurity.org/
 * Copyright (c) 2004-2013 Trustwave Holdings, Inc. (http://www.trustwave.com/)
 *
@@ -52,6 +52,9 @@
 #ifdef	VERSION_IIS
 #define MODSEC_MODULE_NAME "ModSecurity for IIS (STABLE)"
 #else
+#ifdef	VERSION_JAVA
+#define MODSEC_MODULE_NAME "ModSecurity for Java (STABLE)"
+#else
 #ifdef	VERSION_NGINX
 #define MODSEC_MODULE_NAME "ModSecurity for nginx (STABLE)"
 #else
@@ -62,9 +65,10 @@
 #endif
 #endif
 #endif
+#endif
 #define MODSEC_MODULE_VERSION MODSEC_VERSION
 #define MODSEC_MODULE_NAME_FULL MODSEC_MODULE_NAME "/" MODSEC_MODULE_VERSION " (http://www.modsecurity.org/)"
 
 int DSOLOCAL get_modsec_build_type(const char *name);
 
-#endif /* _MSC_RELEASE_H_ */
+#endif /* _MSC_RELEASE_H_ */
\ No newline at end of file
diff --git a/java/Makefile.am b/java/Makefile.am
index 9868044a..ec272a71 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -20,7 +20,7 @@ libModSecurityJNI_la_SOURCES = ../apache2/mod_security2.c \
       org_modsecurity_ModSecurity.c
 
 libModSecurityJNI_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-                          @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@  @CURL_CFLAGS@ -DVERSION_NGINX
+                          @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@  @CURL_CFLAGS@ -DVERSION_NGINX -DVERSION_JAVA
 #libModSecurityJNI_la_CXXFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
 #                          @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@  @CURL_CFLAGS@
 libModSecurityJNI_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @JNI_CPPFLAGS@ @STANDALONE_CPPFLAGS@
@@ -91,4 +91,4 @@ install-exec-hook: $(pkglib_LTLIBRARIES)
 	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \
 	  cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \
 	done
-endif
+endif
\ No newline at end of file
diff --git a/java/org_modsecurity_ModSecurity.c b/java/org_modsecurity_ModSecurity.c
index 4ef9932a..227a988c 100644
--- a/java/org_modsecurity_ModSecurity.c
+++ b/java/org_modsecurity_ModSecurity.c
@@ -544,6 +544,8 @@ JNIEXPORT jint JNICALL Java_org_modsecurity_ModSecurity_onRequest(JNIEnv *env, j
 	r = modsecNewRequest(c, config);
 
 	r->server->server_hostname = serverHostname;
+	r->handler = "Java";
+	
 	httpTransactionClass = (*env)->GetObjectClass(env, httpTransaction);
 	getHttpRequest = (*env)->GetMethodID(env, httpTransactionClass, HTTPTRANSACTION_MSHTTPREQUEST_MET, HTTPTRANSACTION_MSHTTPREQUEST_SIG);