Add VMS' default to the CGI.pm temp list (should update to File::Spec)

p4raw-id: //depot/vmsperl@5750
p4raw-integrated: from //depot/perl@5749 'merge in'
	ext/File/Glob/Glob.pm (@5507..)

diff --git a/ext/File/Glob/Glob.pm b/ext/File/Glob/Glob.pm
index 0678ade..4b7e54b 100644 (file)
--- a/ext/File/Glob/Glob.pm
+++ b/ext/File/Glob/Glob.pm
@@ -60,7 +60,7 @@ sub import {
            $DEFAULT_FLAGS &= ~GLOB_NOCASE() if $1 eq 'case';
            $DEFAULT_FLAGS |= GLOB_NOCASE() if $1 eq 'nocase';
            if ($1 eq 'globally') {
-               local $^W;
+               no warnings;
                *CORE::GLOBAL::glob = \&File::Glob::csh_glob;
            }
            next;
@@ -111,9 +111,6 @@ if ($^O =~ /^(?:MSWin32|VMS|os2|dos|riscos|MacOS)$/) {
 sub glob {
     my ($pat,$flags) = @_;
     $flags = $DEFAULT_FLAGS if @_ < 2;
-    if ($^O =~ /^(?:MSWin32|VMS|os2|dos|riscos|MacOS)$/) {
-        $flags |= GLOB_NOCASE();
-    }
     return doglob($pat,$flags);
 }
 

diff --git a/lib/CGI.pm b/lib/CGI.pm
index a81ac07..3e03257 100644 (file)
--- a/lib/CGI.pm
+++ b/lib/CGI.pm
@@ -3280,7 +3280,7 @@ my ($vol) = $MAC ? MacPerl::Volumes() =~ /:(.*)/ : "";
 unless ($TMPDIRECTORY) {
     @TEMP=("${SL}usr${SL}tmp","${SL}var${SL}tmp",
           "C:${SL}temp","${SL}tmp","${SL}temp",
-          "${vol}${SL}Temporary Items",
+          "${vol}${SL}Temporary Items","${SL}sys\$scratch",
           "${SL}WWW_ROOT");
     unshift(@TEMP,$ENV{'TMPDIR'}) if exists $ENV{'TMPDIR'};