Sync trunk from branches/2.1.x (merge in branch fixes).

This commit is contained in:
brectanus
2007-09-14 21:00:56 +00:00
parent 8a54517f0d
commit c8e5c7fcd5
5 changed files with 24 additions and 17 deletions

View File

@@ -54,7 +54,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. */
@@ -624,11 +624,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;
}