Return-Path: <dougm@apache.org>
Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Delivered-To: mailing list modperl-cvs@apache.org
Received: (qmail 63650 invoked by uid 1066); 25 Jan 2001 07:10:44 -0000
Date: 25 Jan 2001 07:10:44 -0000
Message-ID: <20010125071044.63649.qmail@apache.org>
From: dougm@apache.org
To: modperl-cvs@apache.org
Subject: cvs commit: modperl/t/net/perl api.pl

dougm       01/01/24 23:10:44

  Modified:    .        Changes ToDo
               src/modules/perl Server.xs
               t/net/perl api.pl
  Log:
  use unsigned short rather than short for Apache::Server->port
  
  Revision  Changes    Path
  1.571     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.570
  retrieving revision 1.571
  diff -u -r1.570 -r1.571
  --- Changes	2001/01/12 07:10:13	1.570
  +++ Changes	2001/01/25 07:10:33	1.571
  @@ -10,6 +10,9 @@
   
   =item 1.24_02-dev
   
  +use unsigned short rather than short for Apache::Server->port
  +thanks to Richard L. Goerwitz for the spot
  +
   fix $r subclassing mechanism when value of `r' or `_r' key is a hashref
   thanks to Dave LaMacchia for the spot
   
  
  
  
  1.267     +0 -3      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.266
  retrieving revision 1.267
  diff -u -r1.266 -r1.267
  --- ToDo	2001/01/25 06:42:29	1.266
  +++ ToDo	2001/01/25 07:10:35	1.267
  @@ -19,9 +19,6 @@
   - From: Perrin Harkins <perrin@primenet.com>
     Subject: Re: How to recognize server shutdown?
   
  -- From: Richard L. Goerwitz <richard@catlin.cis.brown.edu>
  -  Subject: Re: Bug (easily fixable) in Apache::Server
  -
   - From: Wenzhong Tang <Tang@appliant.com>
     Subject: RE: Prototype mismatch in Apache::PerlRun line 343
   
  
  
  
  1.8       +2 -2      modperl/src/modules/perl/Server.xs
  
  Index: Server.xs
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/Server.xs,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Server.xs	2000/09/26 17:34:32	1.7
  +++ Server.xs	2001/01/25 07:10:39	1.8
  @@ -96,7 +96,7 @@
       OUTPUT:
       RETVAL
   
  -short
  +unsigned short
   port(server, ...)
       Apache::Server	server
   
  @@ -104,7 +104,7 @@
       RETVAL = server->port;
   
       if(items > 1)
  -        server->port = (short)SvIV(ST(1));
  +        server->port = (unsigned short)SvIV(ST(1));
   
       OUTPUT:
       RETVAL
  
  
  
  1.43      +9 -1      modperl/t/net/perl/api.pl
  
  Index: api.pl
  ===================================================================
  RCS file: /home/cvs/modperl/t/net/perl/api.pl,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- api.pl	2000/04/03 21:41:53	1.42
  +++ api.pl	2001/01/25 07:10:42	1.43
  @@ -16,7 +16,7 @@
   
   my $is_xs = ($r->uri =~ /_xs/);
   
  -my $tests = 68;
  +my $tests = 71;
   my $is_win32 = WIN32;
   $tests += 2 unless $is_win32;
   my $test_get_set = Apache->can('set_handlers') && ($tests += 4);
  @@ -177,6 +177,14 @@
   test ++$i, $s->server_admin;
   test ++$i, $s->server_hostname;
   test ++$i, $s->port;
  +my $port = $s->port;
  +for (32768, 65535) {
  +    $s->port($_);
  +    test ++$i, $s->port == $_;
  +}
  +$s->port($port);
  +test ++$i, $s->port == $port;
  +
   test ++$i, $s->timeout;
   
   for (my $srv = $r->server; $srv; $srv = $srv->next) {