You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/03/25 08:51:08 UTC
cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_cmd.c modperl_interp.c
stas 2003/03/24 23:51:08
Modified: src/modules/perl mod_perl.c modperl_cmd.c modperl_interp.c
Log:
move the modperl_interp_init() trace inside the function itself
Revision Changes Path
1.161 +0 -2 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.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- mod_perl.c 25 Mar 2003 07:49:57 -0000 1.160
+++ mod_perl.c 25 Mar 2003 07:51:08 -0000 1.161
@@ -193,8 +193,6 @@
* virtual host gets its own mip
*/
if (MpSrvPARENT(scfg) || MpSrvCLONE(scfg)) {
- MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
- modperl_server_desc(s, p));
modperl_interp_init(s, p, perl);
}
1.42 +6 -1 modperl-2.0/src/modules/perl/modperl_cmd.c
Index: modperl_cmd.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- modperl_cmd.c 17 Mar 2003 06:46:55 -0000 1.41
+++ modperl_cmd.c 25 Mar 2003 07:51:08 -0000 1.42
@@ -346,7 +346,12 @@
if (modperl_init_vhost(s, p, NULL) != OK) {
return "init mod_perl vhost failed";
}
-
+
+ {
+ modperl_config_srv_t *base_scfg = modperl_config_srv_get(modperl_global_get_server_rec());
+ }
+
+
#ifdef USE_ITHREADS
/* XXX: .htaccess support cannot use this perl with threaded MPMs */
aTHX = scfg->mip->parent->perl;
1.56 +3 -0 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- modperl_interp.c 20 Mar 2003 00:04:53 -0000 1.55
+++ modperl_interp.c 25 Mar 2003 07:51:08 -0000 1.56
@@ -226,6 +226,9 @@
pTHX;
MP_dSCFG(s);
+ MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
+ modperl_server_desc(s, p));
+
modperl_interp_pool_t *mip =
(modperl_interp_pool_t *)apr_pcalloc(p, sizeof(*mip));
Re: cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_cmd.c
modperl_interp.c
Posted by Stas Bekman <st...@stason.org>.
Geoffrey Young wrote:
>
>
> stas@apache.org wrote:
>
>> stas 2003/03/24 23:51:08
>>
>> Modified: src/modules/perl mod_perl.c modperl_cmd.c modperl_interp.c
>> Log:
>> move the modperl_interp_init() trace inside the function itself
>
>
> this change throws the following error for me
>
> modperl_interp.c: In function `modperl_interp_init':
> modperl_interp.c:232: parse error before `*'
> modperl_interp.c:236: `mip' undeclared (first use in this function)
Oops, I did it again. The only problem is that I have inserted in between
declarations.
I still haven't figured out what CC flags I have to use to catch this for me,
as it works just fine on gcc-3.2
I've fixed that in cvs. Thanks Geoff.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_cmd.c
modperl_interp.c
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
stas@apache.org wrote:
> stas 2003/03/24 23:51:08
>
> Modified: src/modules/perl mod_perl.c modperl_cmd.c modperl_interp.c
> Log:
> move the modperl_interp_init() trace inside the function itself
this change throws the following error for me
modperl_interp.c: In function `modperl_interp_init':
modperl_interp.c:232: parse error before `*'
modperl_interp.c:236: `mip' undeclared (first use in this function)
moving the trace back fixes the problem. I tried to track it down, but I
couldn't figure it out - any call to MP_TRACE_i, even a string, seemed to
throw the same error.
--Geoff
Index: src/modules/perl/mod_perl.c
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.162
diff -u -r1.162 mod_perl.c
--- src/modules/perl/mod_perl.c 25 Mar 2003 07:52:22 -0000 1.162
+++ src/modules/perl/mod_perl.c 27 Mar 2003 14:00:37 -0000
@@ -193,6 +193,8 @@
* virtual host gets its own mip
*/
if (MpSrvPARENT(scfg) || MpSrvCLONE(scfg)) {
+ MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
+ modperl_server_desc(s, p));
modperl_interp_init(s, p, perl);
}
Index: src/modules/perl/modperl_interp.c
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.56
diff -u -r1.56 modperl_interp.c
--- src/modules/perl/modperl_interp.c 25 Mar 2003 07:51:08 -0000 1.56
+++ src/modules/perl/modperl_interp.c 27 Mar 2003 14:00:37 -0000
@@ -226,9 +226,6 @@
pTHX;
MP_dSCFG(s);
- MP_TRACE_i(MP_FUNC, "modperl_interp_init() server=%s\n",
- modperl_server_desc(s, p));
-
modperl_interp_pool_t *mip =
(modperl_interp_pool_t *)apr_pcalloc(p, sizeof(*mip));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org