dougm 2002/06/18 19:02:24 Modified: src/modules/perl modperl_perl_includes.h modperl_util.c Log: use mg_find to look for ~ magic in modperl_xs_sv2request_rec as there may be other magic in the chain Revision Changes Path 1.15 +4 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h Index: modperl_perl_includes.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- modperl_perl_includes.h 31 May 2002 01:06:39 -0000 1.14 +++ modperl_perl_includes.h 19 Jun 2002 02:02:24 -0000 1.15 @@ -67,6 +67,10 @@ # define PERL_MAGIC_tied 'P' #endif +#ifndef PERL_MAGIC_ext +# define PERL_MAGIC_ext '~' +#endif + #if defined(__APPLE__) && !defined(PERL_CORE) && !defined(environ) # include <crt_externs.h> # define environ (*_NSGetEnviron()) 1.45 +2 -2 modperl-2.0/src/modules/perl/modperl_util.c Index: modperl_util.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- modperl_util.c 31 May 2002 01:06:39 -0000 1.44 +++ modperl_util.c 19 Jun 2002 02:02:24 -0000 1.45 @@ -120,8 +120,8 @@ return r; } - if ((mg = SvMAGIC(sv))) { - return MgTypeExt(mg) ? (request_rec *)mg->mg_ptr : NULL; + if ((mg = mg_find(sv, PERL_MAGIC_ext))) { + return (request_rec *)mg->mg_ptr; } else { if (classname && !sv_derived_from(in, classname)) {