cvs commit: modperl/src/modules/perl mod_perl.c

[dougm]

dougm       00/05/16 14:52:22

  Modified:    .        Changes
               src/modules/perl mod_perl.c
  Log:
  'sub handler : method {}' is now treated as a method handler
  
  Revision  Changes    Path
  1.484     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.483
  retrieving revision 1.484
  diff -u -r1.483 -r1.484
  --- Changes   2000/05/16 13:53:00     1.483
  +++ Changes   2000/05/16 21:52:20     1.484
  @@ -10,6 +10,8 @@
   
   =item 1.23_01-dev
   
  +'sub handler : method {}' is now treated as a method handler
  +
   variable $Apache::Server::ConfigTestOnly is set to 1 if Apache
   is running in configuration test mode (httpd -t)
   [Eric Cholet <[EMAIL PROTECTED]>]
  
  
  
  1.119     +8 -1      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.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- mod_perl.c        2000/05/16 13:53:01     1.118
  +++ mod_perl.c        2000/05/16 21:52:21     1.119
  @@ -1220,8 +1220,15 @@
        if (gvp) cv = GvCV(gvp);
       }
   
  -    if (cv && SvPOK(cv)) 
  +#ifdef CVf_METHOD
  +    if (CvFLAGS(cv) & CVf_METHOD) {
  +        is_method = 1;
  +    }
  +#endif
  +    if (!is_method && (cv && SvPOK(cv))) {
        is_method = strnEQ(SvPVX(cv), "$$", 2);
  +    }
  +
       MP_TRACE_h(fprintf(stderr, "checking if `%s' is a method...%s\n", 
           sub, (is_method ? "yes" : "no")));
       SvREFCNT_dec(sv);