perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1152635 - in /perl/Apache-SizeLimit/trunk: Changes Makefile.PL lib/Apache/SizeLimit.pm lib/Apache/SizeLimit/Core.pm lib/Apache2/SizeLimit.pm
Date Sun, 31 Jul 2011 21:03:09 GMT
Author: phred
Date: Sun Jul 31 21:03:09 2011
New Revision: 1152635

URL: http://svn.apache.org/viewvc?rev=1152635&view=rev
Log:
RT 66894

Eval Linux::Smaps->new when checking for /proc/self/smaps

Submitted by: Christian Ruppert
Reviewed by: Torsten Foersch, Fred Moyer


Modified:
    perl/Apache-SizeLimit/trunk/Changes
    perl/Apache-SizeLimit/trunk/Makefile.PL
    perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit.pm
    perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit/Core.pm
    perl/Apache-SizeLimit/trunk/lib/Apache2/SizeLimit.pm

Modified: perl/Apache-SizeLimit/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/Changes?rev=1152635&r1=1152634&r2=1152635&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/Changes (original)
+++ perl/Apache-SizeLimit/trunk/Changes Sun Jul 31 21:03:09 2011
@@ -6,7 +6,12 @@ Changes - Apache::SizeLimit change logfi
 
 =over 6
 
-=item 0.96-dev
+=item 0.96-rc1
+
+eval Linux::Smaps->new call when checking for /proc/self/smaps
+[Christian Ruppert <idl0r@qasi.de>]
+
+Require Apache::Test 1.36 [Fred]
 
 Unshared size is now interpreted as RSS - shared instead of VSIZE - shared
 on Linux [Torsten]

Modified: perl/Apache-SizeLimit/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/Makefile.PL?rev=1152635&r1=1152634&r2=1152635&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/Makefile.PL (original)
+++ perl/Apache-SizeLimit/trunk/Makefile.PL Sun Jul 31 21:03:09 2011
@@ -5,7 +5,7 @@ use Config;
 my %prereqs = ();
 my %mp2 = ( mod_perl2 => 1.99022 );
 my %mp1 = ( mod_perl  => 0 );
-my $at_min_ver = 1.34;
+my $at_min_ver = 1.36;
 
 my $mp_gen;
 if ($ENV{MOD_PERL_2_BUILD}) {

Modified: perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit.pm
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit.pm?rev=1152635&r1=1152634&r2=1152635&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit.pm (original)
+++ perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit.pm Sun Jul 31 21:03:09 2011
@@ -26,7 +26,7 @@ use constant IS_WIN32 => $Config{'osname
 
 use vars qw($VERSION);
 
-$VERSION = '0.96';
+$VERSION = '0.96-rc2';
 
 use Apache::SizeLimit::Core qw(
                              $MAX_PROCESS_SIZE

Modified: perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit/Core.pm
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit/Core.pm?rev=1152635&r1=1152634&r2=1152635&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit/Core.pm (original)
+++ perl/Apache-SizeLimit/trunk/lib/Apache/SizeLimit/Core.pm Sun Jul 31 21:03:09 2011
@@ -49,7 +49,7 @@ use vars qw(
                 $START_TIME
                );
 
-$VERSION = '0.96';
+$VERSION = '0.96-rc2';
 
 $REQUEST_COUNT          = 1;
 
@@ -143,7 +143,7 @@ BEGIN {
 
         *_platform_getppid = \&_linux_getppid;
 
-        if (eval { require Linux::Smaps } && Linux::Smaps->new($$)) {
+        if (eval { require Linux::Smaps && Linux::Smaps->new($$) }) {
             $USE_SMAPS = 1;
             *_platform_check_size = \&_linux_smaps_size_check;
         }

Modified: perl/Apache-SizeLimit/trunk/lib/Apache2/SizeLimit.pm
URL: http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/lib/Apache2/SizeLimit.pm?rev=1152635&r1=1152634&r2=1152635&view=diff
==============================================================================
--- perl/Apache-SizeLimit/trunk/lib/Apache2/SizeLimit.pm (original)
+++ perl/Apache-SizeLimit/trunk/lib/Apache2/SizeLimit.pm Sun Jul 31 21:03:09 2011
@@ -34,7 +34,7 @@ die "Apache2::SizeLimit at the moment wo
 use constant IS_WIN32 => $Config{'osname'} eq 'MSWin32' ? 1 : 0;
 
 # 2.x requires 5.6.x+ so 'our' is okay
-our $VERSION = '0.96';
+our $VERSION = '0.96-rc2';
 
 use Apache::SizeLimit::Core qw(
                              $MAX_PROCESS_SIZE



Mime
View raw message