From: Andrew Dunstan <andrew@dunslane.net>
Date: Tue, 22 Jan 2008 20:41:39 +0000 (+0000)
Subject: Work around for perl 5.10 bug - fix due to perl hacker Simon Cozens.
X-Git-Tag: REL8_1_12~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08cf8603cf88b53ae125cb410395ff02e5100c97;p=thirdparty%2Fpostgresql.git

Work around for perl 5.10 bug - fix due to perl hacker Simon Cozens.
---

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index fe7fa0bd216..b8d23fd4c4e 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.94.2.9 2007/12/01 17:58:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.94.2.10 2008/01/22 20:41:39 adunstan Exp $
  *
  **********************************************************************/
 
@@ -257,8 +257,8 @@ plperl_init_all(void)
 	"sub ::mksafefunc {" \
 	"      my $ret = $PLContainer->reval(qq[sub { $_[0] $_[1] }]); " \
 	"      $@ =~ s/\\(eval \\d+\\) //g if $@; return $ret; }" \
-	"$PLContainer->permit('require'); $PLContainer->reval('use strict;');" \
-	"$PLContainer->deny('require');" \
+	"$PLContainer->permit(qw[require caller]); $PLContainer->reval('use strict;');" \
+	"$PLContainer->deny(qw[require caller]); " \
 	"sub ::mk_strict_safefunc {" \
 	"      my $ret = $PLContainer->reval(qq[sub { BEGIN { strict->import(); } $_[0] $_[1] }]); " \
 	"      $@ =~ s/\\(eval \\d+\\) //g if $@; return $ret; }"