perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Geoffrey Young <gyo...@laserlink.net>
Subject RE: cvs commit: modperl/src/modules/perl mod_perl.c
Date Fri, 01 Sep 2000 17:03:49 GMT
the mod_perl.c update is causing conficts with the set_handlers patch...  

the patch works, albit with lots of fuzz, but make yields:

mod_perl.c: In function `perl_run_stacked_handlers':
mod_perl.c:1342: parse error before `register'
make[3]: *** [mod_perl.o] Error 1
make[2]: *** [all] Error 1
make[1]: *** [subdirs] Error 1
make[1]: Leaving directory `/usr/src/apache_1.3.12/src'
make: *** [apache_httpd] Error 2

just in case you want to issue a new patch :)

--Geoff

> -----Original Message-----
> From: dougm@locus.apache.org [mailto:dougm@locus.apache.org]
> Sent: Friday, September 01, 2000 1:16 AM
> To: modperl-cvs@apache.org
> Subject: cvs commit: modperl/src/modules/perl mod_perl.c
> 
> 
> dougm       00/08/31 22:15:42
> 
>   Modified:    .        Changes
>                Leak     Leak.xs
>                src/modules/perl mod_perl.c
>   Log:
>   fixes for ActivePerl
>   
>   Revision  Changes    Path
>   1.513     +2 -0      modperl/Changes
>   
>   Index: Changes
>   ===================================================================
>   RCS file: /home/cvs/modperl/Changes,v
>   retrieving revision 1.512
>   retrieving revision 1.513
>   diff -u -r1.512 -r1.513
>   --- Changes	2000/09/01 05:10:09	1.512
>   +++ Changes	2000/09/01 05:15:37	1.513
>   @@ -10,6 +10,8 @@
>    
>    =item 1.24_01-dev
>    
>   +fixes for ActivePerl [Gurusamy Sarathy <gsar@ActiveState.com>]
>   +
>    change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's
>    include path comes before /usr/local/include, e.g. to make 
> sure Perl's 
>    patchlevel.h is used, thanks to Ryan Morgan for the spot
>   
>   
>   
>   1.4       +1 -1      modperl/Leak/Leak.xs
>   
>   Index: Leak.xs
>   ===================================================================
>   RCS file: /home/cvs/modperl/Leak/Leak.xs,v
>   retrieving revision 1.3
>   retrieving revision 1.4
>   diff -u -r1.3 -r1.4
>   --- Leak.xs	1999/11/15 20:05:27	1.3
>   +++ Leak.xs	2000/09/01 05:15:40	1.4
>   @@ -121,7 +121,7 @@
>    {
>        char *state = lookup((struct hash_s **)p, sv, t_new); 
>        if (state != t_old) { 
>   -	fprintf(stderr, "%s %p : ", state ? state : t_new, sv); 
>   +	PerlIO_printf(PerlIO_stderr(), "%s %p : ", state ? 
> state : t_new, sv); 
>    	sv_dump(sv);
>        }
>        return hwm+1;
>   
>   
>   
>   1.125     +21 -2     modperl/src/modules/perl/mod_perl.c
>   
>   Index: mod_perl.c
>   ===================================================================
>   RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
>   retrieving revision 1.124
>   retrieving revision 1.125
>   diff -u -r1.124 -r1.125
>   --- mod_perl.c	2000/08/15 19:36:33	1.124
>   +++ mod_perl.c	2000/09/01 05:15:41	1.125
>   @@ -850,10 +850,21 @@
>        dPPDIR;
>        dPPREQ;
>        dTHR;
>   -    GV *gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
>   +    GV *gv;
>   +
>   +#ifdef USE_ITHREADS
>   +    dTHX;
>   +
>   +    if (!aTHX) {
>   +	PERL_SET_CONTEXT(perl);
>   +    }
>   +#endif
>    
>        (void)acquire_mutex(mod_perl_mutex);
>   -    
>   +
>   +    gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
>   +
>   +   
>    #if 0
>        /* force 'PerlSendHeader On' for sub-requests
>         * e.g. Apache::Sandwich 
>   @@ -1299,6 +1310,14 @@
>        I32 i, do_clear=FALSE;
>        SV *sub, **svp; 
>        int hook_len = strlen(hook);
>   +
>   +#ifdef USE_ITHREADS
>   +    dTHX;
>   +
>   +    if (!aTHX) {
>   +	PERL_SET_CONTEXT(perl);
>   +    }
>   +#endif
>    
>        if(handlers == Nullav) {
>    	if(hv_exists(stacked_handlers, hook, hook_len)) {
>   
>   
>   
> 

Mime
View raw message