Log Message:
-----------
Corrected premature commit which contained a code hack for the macbook.
Modified Files:
--------------
pg/macros:
dangerousMacros.pl
Revision Data
-------------
Index: dangerousMacros.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/dangerousMacros.pl,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lmacros/dangerousMacros.pl -Lmacros/dangerousMacros.pl -u -r1.54 -r1.55
--- macros/dangerousMacros.pl
+++ macros/dangerousMacros.pl
@@ -387,12 +387,10 @@
$appletLocation = "$server_root_url$appletLocation";
}
my $url = "$appletLocation/$fileName";
- return $appletLocation; # --hack workaround -- just pick the first location and use that -- no checks
-#hack to workaround conflict between lwp-request and apache2
-# if (check_url($url)) {
-# $appletCodebaseLocations{$fileName} = $appletLocation; #update cache
-# return $appletLocation # return codebase part of url
-# }
+ if (check_url($url)) {
+ $appletCodebaseLocations{$fileName} = $appletLocation; #update cache
+ return $appletLocation # return codebase part of url
+ }
}
return "Error: $fileName not found at ". join(", ", @{$appletPath} ); # no file found
}
|
