Skip to content

Commit da995bb

Browse files
author
Felipe Zimmerle
committed
Adds sb_handle structure to specific versions of apache
Fix issue #1407
1 parent aa1a56f commit da995bb

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

apache2/mod_security2.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@
2525
#include "apr_optional.h"
2626
#include "mod_log_config.h"
2727

28-
#ifdef APLOG_USE_MODULE
29-
APLOG_USE_MODULE(security2);
30-
#endif
28+
/*
29+
* #ifdef APLOG_USE_MODULE
30+
* APLOG_USE_MODULE(security2);
31+
* #endif
32+
*/
3133

3234
#include "msc_logging.h"
3335
#include "msc_util.h"
@@ -1437,6 +1439,14 @@ static void modsec_register_operator(const char *name, void *fn_init, void *fn_e
14371439
}
14381440
}
14391441

1442+
#if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
1443+
#else
1444+
typedef struct {
1445+
int child_num;
1446+
int thread_num;
1447+
} sb_handle;
1448+
#endif
1449+
14401450
/**
14411451
* \brief Connetion hook to limit the number of
14421452
* connections in BUSY state
@@ -1484,7 +1494,7 @@ static int hook_connection_early(conn_rec *conn)
14841494
}
14851495
}
14861496

1487-
ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, conn,
1497+
ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, conn,
14881498
"ModSecurity: going to loop through %d servers with %d threads",
14891499
server_limit, thread_limit);
14901500
for (i = 0; i < server_limit; ++i) {
@@ -1516,7 +1526,7 @@ static int hook_connection_early(conn_rec *conn)
15161526
}
15171527
}
15181528

1519-
ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, conn,
1529+
ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, conn,
15201530
"ModSecurity: threads in READ: %ld of %ld, WRITE: %ld of %ld, IP: %s",
15211531
ip_count_r, conn_read_state_limit, ip_count_w, conn_write_state_limit, client_ip);
15221532

0 commit comments

Comments
 (0)