cvs commit: httpd-test/perl-framework/c-modules/random_chunk mod_random_chunk.c

[coar]

coar        2004/03/22 08:56:05

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfigC.pm
               perl-framework/c-modules/random_chunk mod_random_chunk.c
  Log:
        motion forward appears to be paying attention solely to httpd 2,
        with the result that 1.3 support is being broken unknowingly.
        patch in some compatibility changes to let 1.3 be tested on windows.
  
  Revision  Changes    Path
  1.31      +2 -1      
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigC.pm
  
  Index: TestConfigC.pm
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigC.pm,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -u -r1.30 -r1.31
  --- TestConfigC.pm    17 Mar 2004 00:05:18 -0000      1.30
  +++ TestConfigC.pm    22 Mar 2004 16:56:05 -0000      1.31
  @@ -241,9 +241,10 @@
       my $name = $mod->{name};
       my $makefile = "$mod->{dir}/Makefile";
       debug "writing $makefile";
  +    my $extras = '';
   
       my $lib = $self->cmodules_build_so($name);
  -    my $extras = ' -llibhttpd -p ';
  +    $extras = ' -llibhttpd -p ' if ($self->server->{rev} != 1);
       my $goners = join ' ', (map {$name . '.' . $_} qw(exp lib so lo));
   
       my $fh = Symbol::gensym();
  
  
  
  1.11      +8 -0      
httpd-test/perl-framework/c-modules/random_chunk/mod_random_chunk.c
  
  Index: mod_random_chunk.c
  ===================================================================
  RCS file: 
/home/cvs/httpd-test/perl-framework/c-modules/random_chunk/mod_random_chunk.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- mod_random_chunk.c        9 Mar 2004 12:07:19 -0000       1.10
  +++ mod_random_chunk.c        22 Mar 2004 16:56:05 -0000      1.11
  @@ -140,10 +140,18 @@
           return 0;
       }
   
  +#ifdef WIN32
  +    srand(seed); /* XXX: apr-ize */
  +#else
       srandom(seed); /* XXX: apr-ize */
  +#endif
   
       for (i = 0; i < count; ++i) {
  +#ifdef WIN32
  +        len = rand() % (MAX_SEGMENT + ONE_WEIGHT);
  +#else
           len = random() % (MAX_SEGMENT + ONE_WEIGHT);
  +#endif
   
           if (len >= MAX_SEGMENT) {
               ap_rputc((i & 1) ? '0' : '1', r);