From 2e024dd4583c256eca588ba6d16ad7a451676711 Mon Sep 17 00:00:00 2001 From: brenosilva Date: Mon, 19 Dec 2011 15:09:38 +0000 Subject: [PATCH] Fixed AP_SERVER_MINOR instead of AP_SERVER_MAJOR --- apache2/apache2_util.c | 2 +- apache2/mod_security2.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c index 760fbdc6..c3fd10cc 100644 --- a/apache2/apache2_util.c +++ b/apache2/apache2_util.c @@ -263,7 +263,7 @@ static void internal_log_ex(request_rec *r, directory_config *dcfg, modsec_rec * } 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, "[client %s] ModSecurity: %s%s [uri \"%s\"]%s", r->connection->client_ip, str1, hostname, log_escape(msr->mp, r->uri), unique_id); diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c index 17cede3c..bcf7d44d 100644 --- a/apache2/mod_security2.c +++ b/apache2/mod_security2.c @@ -409,7 +409,7 @@ static modsec_rec *create_tx_context(request_rec *r) { msr->local_addr = r->connection->local_ip; 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_port = r->connection->client_addr->port; #else @@ -1234,7 +1234,7 @@ static int hook_connection_early(conn_rec *conn) int i, j; unsigned long int ip_count = 0, ip_count_w = 0; 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; #endif @@ -1244,7 +1244,7 @@ static int hook_connection_early(conn_rec *conn) if(ws_record == NULL) 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)); #else apr_cpystrn(ws_record->client, conn->remote_ip, sizeof(ws_record->client)); @@ -1252,7 +1252,7 @@ static int hook_connection_early(conn_rec *conn) for (i = 0; i < server_limit; ++i) { 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; if (sbh == NULL) { return DECLINED; @@ -1268,7 +1268,7 @@ static int hook_connection_early(conn_rec *conn) switch (ws_record->status) { 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) ip_count++; #else @@ -1277,7 +1277,7 @@ static int hook_connection_early(conn_rec *conn) #endif break; 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) ip_count_w++; #else @@ -1292,14 +1292,14 @@ static int hook_connection_early(conn_rec *conn) } 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); #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); #endif return OK; } 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); #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);