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

[dougm]

dougm       00/03/30 21:16:06

  Modified:    .        Changes
               apaci    mod_perl.config.sh
               src/modules/perl mod_perl.c
  Log:
  $Apache::Server::AddPerlVersion uses $^V for Perl/v5.6.0+
  
  Revision  Changes    Path
  1.448     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.447
  retrieving revision 1.448
  diff -u -r1.447 -r1.448
  --- Changes   2000/03/30 19:59:16     1.447
  +++ Changes   2000/03/31 05:16:04     1.448
  @@ -10,6 +10,8 @@
   
   =item 1.22_01-dev
   
  +$Apache::Server::AddPerlVersion uses $^V for Perl/v5.6.0+
  +
   update mod_ssl config for 'make test'
   [Stas Bekman <[EMAIL PROTECTED]>]
   
  
  
  
  1.18      +1 -1      modperl/apaci/mod_perl.config.sh
  
  Index: mod_perl.config.sh
  ===================================================================
  RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_perl.config.sh        2000/03/03 22:20:18     1.17
  +++ mod_perl.config.sh        2000/03/31 05:16:05     1.18
  @@ -95,7 +95,7 @@
       IFS="$OIFS"
       perl_interp="`echo $perl_interp | sed -e 's://:/:'`"
   fi
  -perl_version="`$perl_interp -e 'print $];'`"
  +perl_version="`$perl_interp -e '$^V ? printf("v%vd", $^V) : print($]);'`"
   os_version="`$perl_interp -e 'print $^O;'`"
   
   #
  
  
  
  1.112     +7 -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.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- mod_perl.c        2000/03/30 19:41:25     1.111
  +++ mod_perl.c        2000/03/31 05:16:05     1.112
  @@ -539,7 +539,7 @@
       if(strEQ(SvPV(version,n_a), MP_APACHE_VERSION)) /*no worries*/
        return;
   
  -    fprintf(stderr, "Apache.pm version %.02f required!\n", 
  +    fprintf(stderr, "Apache.pm version %s required!\n", 
            MP_APACHE_VERSION);
       fprintf(stderr, "%s", form("%_ is version %_\n", 
                               *hv_fetch(GvHV(incgv), "Apache.pm", 9, FALSE),
  @@ -577,8 +577,13 @@
   #if HAS_MMN_130
       ap_add_version_component(MOD_PERL_STRING_VERSION);
       if(PERL_RUNNING()) {
  +#ifdef PERL_IS_5_6
  +     char *version = form("Perl/v%vd", PL_patchlevel);
  +#else
  +     char *version = form("Perl/%_", perl_get_sv("]", TRUE));
  +#endif
        if(perl_get_sv("Apache::Server::AddPerlVersion", FALSE)) {
  -         ap_add_version_component(form("Perl/%_", perl_get_sv("]",TRUE)));
  +         ap_add_version_component(version);
        }
       }
   #endif