github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AP_SERVER_MINOR instead of AP_SERVER_MAJOR

Browse Source
This commit is contained in:
brenosilva 2011-12-19 15:09:38 +00:00
parent e1e43cfa15
commit 2046a43bf4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache2/apache2_util.c
View File

@ -263,7 +263,7 @@ static void internal_log_ex(request_rec *r, directory_config *dcfg, modsec_rec *
} }
else hostname = ""; else hostname = "";
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r->server, ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r->server,
"[client %s] ModSecurity: %s%s [uri \"%s\"]%s", r->connection->client_ip, str1, "[client %s] ModSecurity: %s%s [uri \"%s\"]%s", r->connection->client_ip, str1,
hostname, log_escape(msr->mp, r->uri), unique_id); hostname, log_escape(msr->mp, r->uri), unique_id);

16
apache2/mod_security2.c
View File

@ -409,7 +409,7 @@ static modsec_rec *create_tx_context(request_rec *r) {
msr->local_addr = r->connection->local_ip; msr->local_addr = r->connection->local_ip;
msr->local_port = r->connection->local_addr->port; msr->local_port = r->connection->local_addr->port;
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
msr->remote_addr = r->connection->client_ip; msr->remote_addr = r->connection->client_ip;
msr->remote_port = r->connection->client_addr->port; msr->remote_port = r->connection->client_addr->port;
#else #else
@ -1233,7 +1233,7 @@ static int hook_connection_early(conn_rec *conn)
int i, j; int i, j;
unsigned long int ip_count = 0, ip_count_w = 0; unsigned long int ip_count = 0, ip_count_w = 0;
worker_score *ws_record = NULL; worker_score *ws_record = NULL;
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
ap_sb_handle_t *sbh = NULL; ap_sb_handle_t *sbh = NULL;
#endif #endif
@ -1243,7 +1243,7 @@ static int hook_connection_early(conn_rec *conn)
if(ws_record == NULL) if(ws_record == NULL)
return DECLINED; return DECLINED;
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
apr_cpystrn(ws_record->client, conn->client_ip, sizeof(ws_record->client)); apr_cpystrn(ws_record->client, conn->client_ip, sizeof(ws_record->client));
#else #else
apr_cpystrn(ws_record->client, conn->remote_ip, sizeof(ws_record->client)); apr_cpystrn(ws_record->client, conn->remote_ip, sizeof(ws_record->client));
@ -1251,7 +1251,7 @@ static int hook_connection_early(conn_rec *conn)
for (i = 0; i < server_limit; ++i) { for (i = 0; i < server_limit; ++i) {
for (j = 0; j < thread_limit; ++j) { for (j = 0; j < thread_limit; ++j) {
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
sbh = conn->sbh; sbh = conn->sbh;
if (sbh == NULL) { if (sbh == NULL) {
return DECLINED; return DECLINED;
@ -1267,7 +1267,7 @@ static int hook_connection_early(conn_rec *conn)
switch (ws_record->status) { switch (ws_record->status) {
case SERVER_BUSY_READ: case SERVER_BUSY_READ:
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
if (strcmp(conn->client_ip, ws_record->client) == 0) if (strcmp(conn->client_ip, ws_record->client) == 0)
ip_count++; ip_count++;
#else #else
@ -1276,7 +1276,7 @@ static int hook_connection_early(conn_rec *conn)
#endif #endif
break; break;
case SERVER_BUSY_WRITE: case SERVER_BUSY_WRITE:
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
if (strcmp(conn->client_ip, ws_record->client) == 0) if (strcmp(conn->client_ip, ws_record->client) == 0)
ip_count_w++; ip_count_w++;
#else #else
@ -1291,14 +1291,14 @@ static int hook_connection_early(conn_rec *conn)
} }
if ((conn_read_state_limit > 0) && (ip_count > conn_read_state_limit)) { if ((conn_read_state_limit > 0) && (ip_count > conn_read_state_limit)) {
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in READ state from %s - Possible DoS Consumption Attack [Rejected]", ip_count,conn_read_state_limit,conn->client_ip); ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in READ state from %s - Possible DoS Consumption Attack [Rejected]", ip_count,conn_read_state_limit,conn->client_ip);
#else #else
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in READ state from %s - Possible DoS Consumption Attack [Rejected]", ip_count,conn_read_state_limit,conn->remote_ip); ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in READ state from %s - Possible DoS Consumption Attack [Rejected]", ip_count,conn_read_state_limit,conn->remote_ip);
#endif #endif
return OK; return OK;
} else if ((conn_write_state_limit > 0) && (ip_count_w > conn_write_state_limit)) { } else if ((conn_write_state_limit > 0) && (ip_count_w > conn_write_state_limit)) {
#if AP_SERVER_MINORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2 #if AP_SERVER_MAJORVERSION_NUMBER > 1 && AP_SERVER_MINORVERSION_NUMBER > 2
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in WRITE state from %s - Possible DoS Consumption Attack [Rejected]", ip_count_w,conn_write_state_limit,conn->client_ip); ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in WRITE state from %s - Possible DoS Consumption Attack [Rejected]", ip_count_w,conn_write_state_limit,conn->client_ip);
#else #else
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in WRITE state from %s - Possible DoS Consumption Attack [Rejected]", ip_count_w,conn_write_state_limit,conn->remote_ip); ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "ModSecurity: Access denied with code 400. Too many threads [%ld] of %ld allowed in WRITE state from %s - Possible DoS Consumption Attack [Rejected]", ip_count_w,conn_write_state_limit,conn->remote_ip);