As soon as a got in bed last night i realized the conditional logic in
the original patches was wrong, corrected versions are attached.
Adam
Adam Prime wrote:
> There was a thread today on the users list where a guy was running into
> problems with SizeLimit on Solaris update 10 [1]. Attached are 2
> patches, one against the version of Apache2::SizeLimit in the 2.04
> distribution, and the other against the version in SVN. the SVN version
> still tests fine on linux, but I can't test it on solaris at home, and
> the solaris boxes I do have access to don't have update 10 on them.
>
> I'm also not sure if what I did is acceptable or not, but it should
> work, I think. I also didn't make the change in the 1.3 tree.
>
> Adam
>
> [1] http://marc.info/?t=123630641100001&r=1&w=2
>
>
> ------------------------------------------------------------------------
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@perl.apache.org
> For additional commands, e-mail: dev-h...@perl.apache.org
Index: Core.pm
===================================================================
--- Core.pm (revision 750777)
+++ Core.pm (working copy)
@@ -131,7 +131,8 @@
}
BEGIN {
- if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) {
+ my ($major,$minor) = split('.',$Config{'osvers'});
+ if ($Config{'osname'} eq 'solaris' && ($major > 2 || $major == 2 && $minor
>= 6)) {
*_platform_check_size = \&_solaris_2_6_size_check;
*_platform_getppid = \&_perl_getppid;
}
--- SizeLimit.pm.orig 2009-03-06 01:19:31.000000000 -0500
+++ SizeLimit.pm 2009-03-06 08:54:24.000000000 -0500
@@ -52,7 +52,8 @@
if Apache2::MPM->is_threaded();
# decide at compile time how to check for a process' memory size.
- if (SOLARIS && $Config{'osvers'} >= 2.6) {
+ my ($major,$minor) = split('.',$Config{'osvers'});
+ if (SOLARIS && ($major > 2 || $major == 2 && $minor >= 6)) {
$HOW_BIG_IS_IT = \&solaris_2_6_size_check;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@perl.apache.org
For additional commands, e-mail: dev-h...@perl.apache.org
