cvs commit: modperl-2.0/t/protocol/TestProtocol echo_filter.pm echo_timeout.pm

[stas]

stas2004/05/06 20:46:27

  Modified:t/filter/TestFilter both_str_con_add.pm
   t/protocol/TestProtocol echo_filter.pm echo_timeout.pm
  Log:
  workaround to a problem on some platforms (solaris, bsd,
  etc), where Apache 2.0.49+ forgets to set the blocking mode on
  the socket
  
  Revision  ChangesPath
  1.11  +7 -0  modperl-2.0/t/filter/TestFilter/both_str_con_add.pm
  
  Index: both_str_con_add.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_con_add.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- both_str_con_add.pm   4 May 2004 06:19:11 -   1.10
  +++ both_str_con_add.pm   7 May 2004 03:46:27 -   1.11
  @@ -53,6 +53,13 @@
   sub handler {
   my Apache::Connection $c = shift;
   
  +# XXX: workaround to a problem on some platforms (solaris, bsd,
  +# etc), where Apache 2.0.49+ forgets to set the blocking mode on
  +# the socket
  +require APR::Socket;
  +BEGIN { use APR::Const -compile = qw(SO_NONBLOCK); }
  +$c-client_socket-opt_set(APR::SO_NONBLOCK = 0);
  +
   my $bb = APR::Brigade-new($c-pool, $c-bucket_alloc);
   
   for (;;) {
  
  
  
  1.10  +7 -0  modperl-2.0/t/protocol/TestProtocol/echo_filter.pm
  
  Index: echo_filter.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/echo_filter.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- echo_filter.pm4 May 2004 06:14:44 -   1.9
  +++ echo_filter.pm7 May 2004 03:46:27 -   1.10
  @@ -16,6 +16,13 @@
   sub handler {
   my Apache::Connection $c = shift;
   
  +# XXX: workaround to a problem on some platforms (solaris, bsd,
  +# etc), where Apache 2.0.49+ forgets to set the blocking mode on
  +# the socket
  +require APR::Socket;
  +BEGIN { use APR::Const -compile = qw(SO_NONBLOCK); }
  +$c-client_socket-opt_set(APR::SO_NONBLOCK = 0);
  +
   my $bb = APR::Brigade-new($c-pool, $c-bucket_alloc);
   
   for (;;) {
  
  
  
  1.3   +6 -0  modperl-2.0/t/protocol/TestProtocol/echo_timeout.pm
  
  Index: echo_timeout.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/echo_timeout.pm,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- echo_timeout.pm   4 May 2004 06:14:44 -   1.2
  +++ echo_timeout.pm   7 May 2004 03:46:27 -   1.3
  @@ -20,6 +20,12 @@
   my Apache::Connection $c = shift;
   my APR::Socket $socket = $c-client_socket;
   
  +# XXX: workaround to a problem on some platforms (solaris, bsd,
  +# etc), where Apache 2.0.49+ forgets to set the blocking mode on
  +# the socket
  +BEGIN { use APR::Const -compile = qw(SO_NONBLOCK) }
  +$c-client_socket-opt_set(APR::SO_NONBLOCK = 0);
  +
   # set timeout (20 sec) so later we can do error checking on
   # read/write timeouts
   $socket-timeout_set(20_000_000);
  
  
  

cvs commit: modperl-2.0/t/response/TestAPI module.pm

[gozer]

gozer   2004/05/06 15:23:09

  Modified:t/response/TestAPI module.pm
  Log:
  Make sure t/api/module will not fail when mod_perl is statically compiled
  in httpd (upcoming feature)
  
  Revision  ChangesPath
  1.10  +6 -2  modperl-2.0/t/response/TestAPI/module.pm
  
  Index: module.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- module.pm 8 Apr 2004 01:56:31 -   1.9
  +++ module.pm 6 May 2004 22:23:09 -   1.10
  @@ -7,6 +7,7 @@
   use Apache::Test;
   use Apache::TestConfig;
   use Apache::TestUtil;
  +use Apache::BuildConfig;
   
   use Apache::Module ();
   use DynaLoader ();
  @@ -84,9 +85,12 @@
Apache::Module::loaded('Apache__Module_foo.c'));
   
   #.so
  -ok t_cmp(1, Apache::Module::loaded('mod_perl.so'),
  +{
  +my $expect = Apache::BuildConfig-new-{MP_USE_STATIC} ? 0 : 1;
  +ok t_cmp($expect, Apache::Module::loaded('mod_perl.so'),
Apache::Module::loaded('mod_perl.so'));
  -
  +}
  +
   ok t_cmp(0, Apache::Module::loaded('Apache__Module__foo.so'),
Apache::Module::loaded('Apache__Module_foo.so'));
   
  
  
  

cvs commit: modperl-2.0/t/protocol/TestProtocol echo_block.pm

[stas]

stas2004/05/06 18:13:57

  Modified:t/protocol/TestProtocol echo_block.pm
  Log:
  comment fix
  
  Revision  ChangesPath
  1.4   +2 -2  modperl-2.0/t/protocol/TestProtocol/echo_block.pm
  
  Index: echo_block.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/echo_block.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- echo_block.pm 7 May 2004 01:13:05 -   1.3
  +++ echo_block.pm 7 May 2004 01:13:57 -   1.4
  @@ -27,9 +27,9 @@
   if ($nonblocking) {
   $socket-opt_set(APR::SO_NONBLOCK = 0);
   
  -# test that we really are in the blocking mode
  +# test that we really *are* in the blocking mode
   !$socket-opt_get(APR::SO_NONBLOCK)
  -or die failed to set non-blocking mode;
  +or die failed to set blocking mode;
   }
   
   while (1) {