Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-release-src > by-pkgid > 259974990a716111e057a18a0019af1a > files > 6

apache-mod_perl-2.0.7-17.20130221svn1448245.mga5.src.rpm

Index: modperl/src/modules/perl/modperl_perl.c
===================================================================
--- modperl/src/modules/perl/modperl_perl.c	(révision 1457617)
+++ modperl/src/modules/perl/modperl_perl.c	(révision 1457618)
@@ -265,12 +265,17 @@
 {
 #ifdef MP_NEED_HASH_SEED_FIXUP
     if (MP_init_hash_seed_set) {
-#if MP_PERL_VERSION(5, 8, 1)
-        PL_hash_seed       = MP_init_hash_seed;
+#if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
+        memcpy(&PL_hash_seed, &MP_init_hash_seed,
+                sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
+                    sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
         PL_hash_seed_set   = MP_init_hash_seed_set;
-#else
+#elif MP_PERL_VERSION_AT_LEAST(5, 8, 2)
         PL_rehash_seed     = MP_init_hash_seed;
         PL_rehash_seed_set = MP_init_hash_seed_set;
+#else
+        PL_hash_seed       = MP_init_hash_seed;
+        PL_hash_seed_set   = MP_init_hash_seed_set;
 #endif
     }
 #endif
Index: modperl/t/perl/hash_attack.t
===================================================================
--- modperl/t/perl/hash_attack.t	(révision 1457617)
+++ modperl/t/perl/hash_attack.t	(révision 1457618)
@@ -8,7 +8,7 @@
 use Apache::TestRequest 'GET_BODY_ASSERT';
 
 plan tests => 1,
-    need { "relevant only for perl 5.8.2 and higher" => ($] >= 5.008002) };
+    need { "relevant only for perl 5.8.2 and up to 5.17.6" => ($] >= 5.008002 && $] < 5.017006) };
 
 my $expected = "ok";
 my $received = GET_BODY_ASSERT "/TestPerl__hash_attack";