dougm 01/12/05 11:11:34
Modified: lib/Apache compat.pm
Log:
some whitespace style nits
remove redundant use of Apache::{Response,RequestRec}
Revision Changes Path
1.28 +4 -3 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- compat.pm 2001/12/05 19:09:37 1.27
+++ compat.pm 2001/12/05 19:11:34 1.28
@@ -290,7 +290,6 @@
close $self;
}
-
my $TMPNAM = 'aaaaaa';
my $TMPDIR = $ENV{'TMPDIR'} || $ENV{'TEMP'} || '/tmp';
($TMPDIR) = $TMPDIR =~ /^([^<>|;*]+)$/; #untaint
@@ -301,15 +300,19 @@
my $class = shift;
my $limit = 100;
my $r = Apache->request;
+
unless ($r) {
die "cannot use Apache::File->tmpfile ".
"without 'SetHandler perl-script' or 'PerlOptions +GlobalRequest'";
}
+
while ($limit--) {
my $tmpfile = "$TMPDIR/${$}" . $TMPNAM++;
my $fh = $class->new;
+
sysopen($fh, $tmpfile, $Mode, $Perms);
$r->pool->cleanup_register(sub { unlink $tmpfile });
+
if ($fh) {
return wantarray ? ($tmpfile, $fh) : $fh;
}
@@ -317,7 +320,6 @@
}
# the following functions now live in Apache::Response
-use Apache::Response;
# * discard_request_body
# * meets_conditions
# * set_content_length
@@ -326,7 +328,6 @@
# * update_mtime
# the following functions now live in Apache::RequestRec
-use Apache::RequestRec;
# * mtime
