perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/t TEST
Date Thu, 28 Jan 1999 18:25:09 GMT
dougm       99/01/28 10:25:08

  Modified:    .        Changes
               src/modules/perl mod_perl.c
               t        TEST
  Log:
  ensure mod_perl/x.xx component is not added before Apache/x.x.x
  
  Revision  Changes    Path
  1.261     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.260
  retrieving revision 1.261
  diff -u -r1.260 -r1.261
  --- Changes	1999/01/28 17:55:47	1.260
  +++ Changes	1999/01/28 18:25:06	1.261
  @@ -8,6 +8,8 @@
   
   =item 1.18_01-dev
   
  +ensure mod_perl/x.xx component is not added before Apache/x.x.x
  +
   fix $ENV{MOD_PERL} value
   
   =item 1.18 - January 27, 1999
  
  
  
  1.77      +2 -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.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- mod_perl.c	1999/01/28 01:11:50	1.76
  +++ mod_perl.c	1999/01/28 18:25:07	1.77
  @@ -492,9 +492,10 @@
       dPSRV(s);
       SV *pool_rv, *server_rv;
       GV *gv, *shgv;
  +    char *ap_v = ap_get_server_version();
   
   #if MODULE_MAGIC_NUMBER >= 19980507
  -    if (!strstr(ap_get_server_version(), MOD_PERL_STRING_VERSION)) {
  +    if (!strstr(ap_v, MOD_PERL_STRING_VERSION) && strnEQ(ap_v,"Apache/",7)) {
   	ap_add_version_component(MOD_PERL_STRING_VERSION);
   	if(PERL_RUNNING()) {
   	    if(perl_get_sv("Apache::Server::AddPerlVersion", FALSE)) {
  
  
  
  1.9       +3 -3      modperl/t/TEST
  
  Index: TEST
  ===================================================================
  RCS file: /home/cvs/modperl/t/TEST,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TEST	1999/01/22 02:56:31	1.8
  +++ TEST	1999/01/28 18:25:08	1.9
  @@ -72,7 +72,7 @@
   Apache::test->import('simple_fetch');
   use subs 'simple_fetch';
   
  -unless (simple_fetch "/") {
  +unless (simple_fetch "/test.html") {
       if ($^O eq "solaris" and $Config{myhostname} eq "ramona") {
           print "go hang in the chill room $ENV{USER}, ramona is doggin...";
       }  
  @@ -81,7 +81,7 @@
       }
       for (1..3) {
           sleep 1;
  -        if (simple_fetch "/") {
  +        if (simple_fetch "/test.html") {
               print "ok\n";
           }
           else {
  @@ -90,7 +90,7 @@
       }
   }
   
  -unless (simple_fetch "/") {
  +unless (simple_fetch "/test.html") {
       print "not ok\n"; 
       die "server failed to start!";
   }
  
  
  

Mime
View raw message