From 0df7688177620c656bfa451710040e8a50c43371 Mon Sep 17 00:00:00 2001 From: ivanr Date: Thu, 8 Mar 2007 18:44:14 +0000 Subject: [PATCH] --- apache2/modsecurity.h | 2 +- apache2/msc_reqbody.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h index 97ba2b6c..18174809 100644 --- a/apache2/modsecurity.h +++ b/apache2/modsecurity.h @@ -50,7 +50,7 @@ typedef struct msc_string msc_string; #include "http_protocol.h" #define MODULE_NAME "ModSecurity" -#define MODULE_RELEASE "2.1.1-dev3" +#define MODULE_RELEASE "2.1.1-dev4" #define MODULE_NAME_FULL (MODULE_NAME " v" MODULE_RELEASE " (Apache 2.x)") #define PHASE_REQUEST_HEADERS 1 diff --git a/apache2/msc_reqbody.c b/apache2/msc_reqbody.c index f0f40530..171c6783 100644 --- a/apache2/msc_reqbody.c +++ b/apache2/msc_reqbody.c @@ -56,7 +56,7 @@ apr_status_t modsecurity_request_body_start(modsec_rec *msr) { * to allocate structures from (not data, which is allocated * via malloc). */ - apr_pool_create(&msr->msc_reqbody_mp, msr->mp); + apr_pool_create(&msr->msc_reqbody_mp, NULL); /* Initialise request body processors, if any. */ @@ -626,11 +626,10 @@ apr_status_t modsecurity_request_body_clear(modsec_rec *msr) { } } - /* NOTE No need to clear the pool as it has already been destroyed - * if (msr->msc_reqbody_mp != NULL) { - * apr_pool_clear(msr->msc_reqbody_mp); - * } - */ + if (msr->msc_reqbody_mp != NULL) { + apr_pool_destroy(msr->msc_reqbody_mp); + msr->msc_reqbody_mp = NULL; + } return 1; }