antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Patch from Jürg Lehni to add timeout argument to global getURL() function.

Browse source 
Fixes bug #692 - http://dev.helma.org/bugs/show_bug.cgi?id=692
This commit is contained in:
hns 2009-11-10 08:47:01 +00:00
parent 784e374f78
commit 807cd5c80d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/helma/scripting/rhino/GlobalObject.java
View file

@ -240,11 +240,13 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
* Retrieve a Document from the specified URL. * Retrieve a Document from the specified URL.
* *
* @param location the URL to retrieve * @param location the URL to retrieve
* @param opt either a LastModified date or an ETag string for conditional GETs * @param condition either a LastModified date or an ETag string for conditional GETs
* @param timeout the optional timeout value in milliseconds used for
* connecting to and reading from the given URL.
* *
* @return a wrapped MIME object * @return a wrapped MIME object
*/ */
public Object getURL(String location, Object opt) { public Object getURL(String location, Object condition, Object timeout) {
if (location == null) { if (location == null) {
return null; return null;
} }
@ -254,9 +256,9 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
URLConnection con = url.openConnection(); URLConnection con = url.openConnection();
// do we have if-modified-since or etag headers to set? // do we have if-modified-since or etag headers to set?
if (opt != null && opt != Undefined.instance) { if (condition != null && condition != Undefined.instance) {
if (opt instanceof Scriptable) { if (condition instanceof Scriptable) {
Scriptable scr = (Scriptable) opt; Scriptable scr = (Scriptable) condition;
if ("Date".equals(scr.getClassName())) { if ("Date".equals(scr.getClassName())) {
Date date = new Date((long) ScriptRuntime.toNumber(scr)); Date date = new Date((long) ScriptRuntime.toNumber(scr));
@ -271,7 +273,7 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
con.setRequestProperty("If-None-Match", scr.toString()); con.setRequestProperty("If-None-Match", scr.toString());
} }
} else { } else {
con.setRequestProperty("If-None-Match", opt.toString()); con.setRequestProperty("If-None-Match", condition.toString());
} }
} }
@ -281,6 +283,12 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
con.setRequestProperty("User-Agent", httpUserAgent); con.setRequestProperty("User-Agent", httpUserAgent);
} }
if (timeout != null && timeout != Undefined.instance) {
int time = ScriptRuntime.toInt32(timeout);
con.setConnectTimeout(time);
con.setReadTimeout(time);
}
con.setAllowUserInteraction(false); con.setAllowUserInteraction(false);
String filename = url.getFile(); String filename = url.getFile();