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 do...@hyperreal.org on 1998/09/19 17:57:23 UTC

cvs commit: modperl/t/modules include.t

dougm       98/09/19 08:57:23

  Modified:    .        Changes Makefile.PL
               src/modules/perl mod_perl.c
               t/modules include.t
  Log:
  USE_DSO=1 should work now (fingers crossed)
  
  Revision  Changes    Path
  1.144     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- Changes	1998/09/19 15:31:34	1.143
  +++ Changes	1998/09/19 15:57:16	1.144
  @@ -8,6 +8,8 @@
   
   =item 1.15_01-dev
   
  +USE_DSO=1 should work now
  +
   added Apache::SubRequest->bytes_sent method
   
   added Apache::Server->register_cleanup method
  
  
  
  1.97      +1 -0      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- Makefile.PL	1998/09/18 21:05:27	1.96
  +++ Makefile.PL	1998/09/19 15:57:16	1.97
  @@ -836,6 +836,7 @@
   	    print $apaci_cfg "$k = $yes_no\n" if $apaci_cfg;
   	}
           print $hf "   MMN => $mmn,\n";
  +	print $hf "   USE_DSO => 1,\n" if $USE_DSO;
   	print $hf ");\n1;\n";
   	$hf->close;
   	$apaci_cfg->close if $apaci_cfg;
  
  
  
  1.47      +9 -0      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- mod_perl.c	1998/09/18 21:05:28	1.46
  +++ mod_perl.c	1998/09/19 15:57:19	1.47
  @@ -411,6 +411,11 @@
       if(orig_inc) SvREFCNT_dec(orig_inc); \
       orig_inc = av_copy_array(GvAV(incgv))
   
  +static void mp_dso_unload(void *data) 
  +{ 
  +    perl_is_running = 0; 
  +} 
  +
   void perl_startup (server_rec *s, pool *p)
   {
       char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
  @@ -634,6 +639,10 @@
   
       saveINC;
       Apache__ServerStarting(FALSE);
  +#if MODULE_MAGIC_NUMBER >= MMN_130
  +    if(perl_module.dynamic_load_handle) 
  +	register_cleanup(p, NULL, mp_dso_unload, NULL); 
  +#endif
   }
   
   int mod_perl_sent_header(request_rec *r, int val)
  
  
  
  1.2       +1 -1      modperl/t/modules/include.t
  
  Index: include.t
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/modules/include.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- include.t	1997/12/06 17:57:27	1.1
  +++ include.t	1998/09/19 15:57:21	1.2
  @@ -1,6 +1,6 @@
   
   use Apache::test;
  -
  +skip_test if $net::callback_hooks{USE_DSO}; 
   my $ua = LWP::UserAgent->new;    # create a useragent to test
   
   print fetch($ua, "http://$net::httpserver$net::perldir/io/include.pl");