Skip to content

Commit 87df482

Browse files
committed
Print YAJL version on startup. Closing issue: #703
1 parent 79639b5 commit 87df482

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

apache2/mod_security2.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@
3939

4040
#include "msc_status_engine.h"
4141

42+
43+
#ifdef WITH_YAJL
44+
#include <yajl/yajl_version.h>
45+
#endif /* WITH_YAJL */
46+
4247
/* ModSecurity structure */
4348

4449
msc_engine DSOLOCAL *modsecurity = NULL;
@@ -97,7 +102,7 @@ static void version(apr_pool_t *mp) {
97102
"ModSecurity: APR compiled version=\"%s\"; "
98103
"loaded version=\"%s\"", APR_VERSION_STRING, apr_version_string());
99104

100-
if (strstr(apr_version_string(),APR_VERSION_STRING) == NULL) {
105+
if (strstr(apr_version_string(), APR_VERSION_STRING) == NULL) {
101106
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Loaded APR do not match with compiled!");
102107
}
103108

@@ -114,11 +119,16 @@ static void version(apr_pool_t *mp) {
114119
/* Lua version function was removed in current 5.1. Need to check in future versions if it's back */
115120
#if defined(WITH_LUA)
116121
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
117-
"ModSecurity: LUA compiled version=\"%s\"",LUA_VERSION);
122+
"ModSecurity: LUA compiled version=\"%s\"", LUA_VERSION);
118123
#endif /* WITH_LUA */
119124

125+
#ifdef WITH_YAJL
126+
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
127+
"ModSecurity: YAJL compiled version=\"%d.%d.%d\"", YAJL_MAJOR, YAJL_MINOR, YAJL_MICRO);
128+
#endif /* WITH_YAJL */
129+
120130
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
121-
"ModSecurity: LIBXML compiled version=\"%s\"",LIBXML_DOTTED_VERSION);
131+
"ModSecurity: LIBXML compiled version=\"%s\"", LIBXML_DOTTED_VERSION);
122132
}
123133

124134

0 commit comments

Comments
 (0)