Author: pgollucci Date: Wed Aug 23 00:15:15 2006 New Revision: 433957 URL: http://svn.apache.org/viewvc?rev=433957&view=rev Log: s/Apache::SizeLimit/Apache2::SizeLimit/g
Modified: perl/Apache-SizeLimit/trunk/t/response/TestApache2/basic.pm perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests.pm perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests2.pm perl/Apache-SizeLimit/trunk/t/response/TestApache2/deprecated.pm Modified: perl/Apache-SizeLimit/trunk/t/response/TestApache2/basic.pm URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/t/response/TestApache2/basic.pm?rev=433957&r1=433956&r2=433957&view=diff ============================================================================== --- perl/Apache-SizeLimit/trunk/t/response/TestApache2/basic.pm (original) +++ perl/Apache-SizeLimit/trunk/t/response/TestApache2/basic.pm Wed Aug 23 00:15:15 2006 @@ -1,4 +1,4 @@ -package TestApache::basic; +package TestApache2::basic; use strict; use warnings; @@ -6,7 +6,7 @@ use Apache::Test qw(-withtestmore); use Apache::Constants qw(OK); -use Apache::SizeLimit; +use Apache2::SizeLimit; use Config; use constant ONE_MB => 1024; @@ -17,11 +17,11 @@ plan $r, tests => 12; - ok( ! Apache::SizeLimit->_limits_are_exceeded(), + ok( ! Apache2::SizeLimit->_limits_are_exceeded(), 'check that _limits_are_exceeded() returns false without any limits set' ); { - my ( $size, $shared ) = Apache::SizeLimit->_check_size(); + my ( $size, $shared ) = Apache2::SizeLimit->_check_size(); cmp_ok( $size, '>', 0, 'proc size is reported > 0' ); SKIP: @@ -29,7 +29,7 @@ skip 'I have no idea what getppid() on Win32 might return', 1 if $Config{'osname'} eq 'MSWin32'; - cmp_ok( Apache::SizeLimit->_platform_getppid(), '>', 1, + cmp_ok( Apache2::SizeLimit->_platform_getppid(), '>', 1, 'real_getppid() > 1' ); } } @@ -39,12 +39,12 @@ # assuming a scalar consumes >= 1K. my @big = ('x') x TEN_MB; - my ( $size, $shared ) = Apache::SizeLimit->_check_size(); + my ( $size, $shared ) = Apache2::SizeLimit->_check_size(); cmp_ok( $size, '>', TEN_MB, 'proc size is reported > ' . TEN_MB ); - Apache::SizeLimit->set_max_process_size(ONE_MB); + Apache2::SizeLimit->set_max_process_size(ONE_MB); - ok( Apache::SizeLimit->_limits_are_exceeded(), + ok( Apache2::SizeLimit->_limits_are_exceeded(), 'check that _limits_are_exceeded() returns true based on max process size' ); SKIP: @@ -54,16 +54,16 @@ cmp_ok( $size, '>', $shared, 'proc size is greater than shared size' ); - Apache::SizeLimit->set_max_process_size(0); - Apache::SizeLimit->set_min_shared_size( ONE_MB * 100 ); + Apache2::SizeLimit->set_max_process_size(0); + Apache2::SizeLimit->set_min_shared_size( ONE_MB * 100 ); - ok( Apache::SizeLimit->_limits_are_exceeded(), + ok( Apache2::SizeLimit->_limits_are_exceeded(), 'check that _limits_are_exceeded() returns true based on min share size' ); - Apache::SizeLimit->set_min_shared_size(0); - Apache::SizeLimit->set_max_unshared_size(1); + Apache2::SizeLimit->set_min_shared_size(0); + Apache2::SizeLimit->set_max_unshared_size(1); - ok( Apache::SizeLimit->_limits_are_exceeded(), + ok( Apache2::SizeLimit->_limits_are_exceeded(), 'check that _limits_are_exceeded() returns true based on max unshared size' ); } } @@ -71,27 +71,27 @@ { # Lame test - A way to check that setting this _does_ # something would be welcome ;) - Apache::SizeLimit->set_check_interval(10); - is( $Apache::SizeLimit::CHECK_EVERY_N_REQUESTS, 10, + Apache2::SizeLimit->set_check_interval(10); + is( $Apache2::SizeLimit::CHECK_EVERY_N_REQUESTS, 10, 'set_check_interval set global' ); } { - Apache::SizeLimit->set_max_process_size(0); - Apache::SizeLimit->set_min_shared_size(0); - Apache::SizeLimit->set_max_unshared_size(0); + Apache2::SizeLimit->set_max_process_size(0); + Apache2::SizeLimit->set_min_shared_size(0); + Apache2::SizeLimit->set_max_unshared_size(0); my $handlers = $r->get_handlers('PerlCleanupHandler'); is( scalar @$handlers, 0, 'there is no PerlCleanupHandler before add_cleanup_handler()' ); - Apache::SizeLimit->add_cleanup_handler($r); + Apache2::SizeLimit->add_cleanup_handler($r); $handlers = $r->get_handlers('PerlCleanupHandler'); is( scalar @$handlers, 1, 'there is one PerlCleanupHandler after add_cleanup_handler()' ); - Apache::SizeLimit->add_cleanup_handler($r); + Apache2::SizeLimit->add_cleanup_handler($r); $handlers = $r->get_handlers('PerlCleanupHandler'); is( scalar @$handlers, 1, Modified: perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests.pm URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests.pm?rev=433957&r1=433956&r2=433957&view=diff ============================================================================== --- perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests.pm (original) +++ perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests.pm Wed Aug 23 00:15:15 2006 @@ -8,7 +8,7 @@ use Apache::Test qw(-withtestmore); use Apache::TestUtil; -use Apache::SizeLimit; +use Apache2::SizeLimit; use constant ONE_MB => 1024; use constant TEN_MB => ONE_MB * 10; @@ -22,10 +22,10 @@ plan $r, tests => 11; - Apache::SizeLimit->add_cleanup_handler($r); - Apache::SizeLimit->set_max_process_size(TEN_MB); + Apache2::SizeLimit->add_cleanup_handler($r); + Apache2::SizeLimit->set_max_process_size(TEN_MB); ## this should cause us to fire - Apache::SizeLimit->set_check_interval(); + Apache2::SizeLimit->set_check_interval(); # We can assume this will use _at least_ 1MB of memory, based on # assuming a scalar consumes >= 1K. @@ -42,7 +42,7 @@ is( 1, - Apache::SizeLimit->_limits_are_exceeded(), + Apache2::SizeLimit->_limits_are_exceeded(), "we passed the limits and _WILL_ kill the child" ); Modified: perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests2.pm URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests2.pm?rev=433957&r1=433956&r2=433957&view=diff ============================================================================== --- perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests2.pm (original) +++ perl/Apache-SizeLimit/trunk/t/response/TestApache2/check_n_requests2.pm Wed Aug 23 00:15:15 2006 @@ -8,7 +8,7 @@ use Apache::Test qw(-withtestmore); -use Apache::SizeLimit; +use Apache2::SizeLimit; use constant ONE_MB => 1024; use constant TEN_MB => ONE_MB * 10; @@ -22,10 +22,10 @@ plan $r, tests => 11; - Apache::SizeLimit->add_cleanup_handler($r); - Apache::SizeLimit->set_max_process_size(TEN_MB); + Apache2::SizeLimit->add_cleanup_handler($r); + Apache2::SizeLimit->set_max_process_size(TEN_MB); ## this should cause us _NOT_ to fire - Apache::SizeLimit->set_check_interval(5); + Apache2::SizeLimit->set_check_interval(5); # We can assume this will use _at least_ 1MB of memory, based on # assuming a scalar consumes >= 1K. @@ -39,7 +39,7 @@ is( 1, - Apache::SizeLimit->_limits_are_exceeded(), + Apache2::SizeLimit->_limits_are_exceeded(), "we passed the limits and will _NOT_ kill the child" ); Modified: perl/Apache-SizeLimit/trunk/t/response/TestApache2/deprecated.pm URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/t/response/TestApache2/deprecated.pm?rev=433957&r1=433956&r2=433957&view=diff ============================================================================== --- perl/Apache-SizeLimit/trunk/t/response/TestApache2/deprecated.pm (original) +++ perl/Apache-SizeLimit/trunk/t/response/TestApache2/deprecated.pm Wed Aug 23 00:15:15 2006 @@ -6,7 +6,7 @@ use Apache::Test qw(-withtestmore); use Apache::Constants qw(OK); -use Apache::SizeLimit; +use Apache2::SizeLimit; sub handler { @@ -18,16 +18,16 @@ is( scalar @$handlers, 0, 'there is no PerlCleanupHandler before add_cleanup_handler()' ); - Apache::SizeLimit::setmax( 100_000 ); - is( $Apache::SizeLimit::MAX_PROCESS_SIZE, 100_000, + Apache2::SizeLimit::setmax( 100_000 ); + is( $Apache2::SizeLimit::MAX_PROCESS_SIZE, 100_000, 'setmax changes $MAX_PROCESS_SIZE' ); - Apache::SizeLimit::setmin( 1 ); - is( $Apache::SizeLimit::MIN_SHARE_SIZE, 1, + Apache2::SizeLimit::setmin( 1 ); + is( $Apache2::SizeLimit::MIN_SHARE_SIZE, 1, 'setmax changes $MIN_SHARE_SIZE' ); - Apache::SizeLimit::setmax_unshared( 1 ); - is( $Apache::SizeLimit::MIN_SHARE_SIZE, 1, + Apache2::SizeLimit::setmax_unshared( 1 ); + is( $Apache2::SizeLimit::MIN_SHARE_SIZE, 1, 'setmax_unshared changes $MAX_UNSHARED_SIZE' ); $handlers = $r->get_handlers('PerlCleanupHandler');