dougm 02/02/26 11:01:38
Modified: src/modules/perl mod_perl.c
Log:
remove remaining special cases for subrequests
Revision Changes Path
1.108 +7 -15 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mod_perl.c 26 Feb 2002 18:00:58 -0000 1.107
+++ mod_perl.c 26 Feb 2002 19:01:38 -0000 1.108
@@ -447,18 +447,6 @@
modperl_config_req_init(r, rcfg);
- if (r->main) {
- modperl_config_req_t *main_rcfg =
- modperl_config_req_get(r->main);
-
- rcfg->wbucket = main_rcfg->wbucket;
- }
- else {
- rcfg->wbucket =
- (modperl_wbucket_t *)apr_palloc(r->pool,
- sizeof(*rcfg->wbucket));
- }
-
return OK;
}
@@ -588,11 +576,15 @@
{
MP_dRCFG;
MP_dDCFG;
- modperl_wbucket_t *wb = rcfg->wbucket;
+ modperl_wbucket_t *wb;
- if (r->main && wb->pool) {
- return; /* using bucket from main request */
+ if (!rcfg->wbucket) {
+ rcfg->wbucket =
+ (modperl_wbucket_t *)apr_palloc(r->pool,
+ sizeof(*rcfg->wbucket));
}
+
+ wb = rcfg->wbucket;
/* setup buffer for output */
wb->pool = r->pool;