explicit timeouts for URL access

ylafon · ylafon · commit 9325825c6bfd · 2024-08-26T11:53:36.000+02:00
diff --git a/org/w3c/css/util/ApplContext.java b/org/w3c/css/util/ApplContext.java
@@ -54,12 +54,15 @@ private BomEncoding(Charset c, boolean fb) {
             uriCharset = c;
             fromBom = fb;
         }
+
         private BomEncoding(Charset c) {
             this(c, false);
         }
+
         private BomEncoding() {
         }
     }
+
     // charset definition of traversed URLs
     private HashMap<URL, BomEncoding> uricharsets = null;
 
@@ -72,6 +75,9 @@ private BomEncoding() {
 
     private ArrayList<URL> linkedmedia = new ArrayList<URL>();
 
+    int readTimeout = 60000; // ms
+    int connectTimeout = 5000; // ms
+
     String credential = null;
     String lang;
     Messages msgs;
@@ -322,7 +328,6 @@ public boolean getTreatVendorExtensionsAsWarnings() {
      * Change the behaviour of error reporting for vendor extensions.
      *
      * @param treatVendorExtensionsAsWarnings
-     *
      */
     public void setTreatVendorExtensionsAsWarnings(
             boolean treatVendorExtensionsAsWarnings) {
@@ -620,4 +625,20 @@ public void setReferrer(URL referrer) {
     public URL getReferrer() {
         return referrer;
     }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int timeout) {
+        readTimeout = timeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int timeout) {
+        connectTimeout = timeout;
+    }
 }
diff --git a/org/w3c/css/util/HTTPURL.java b/org/w3c/css/util/HTTPURL.java
@@ -226,6 +226,10 @@ private static URLConnection getConnection(URL url, URL referrer, int count,
                 System.err.println("with [" + ac.getCredential() + ']');
             }
         }
+        // setting timeouts
+        urlC.setConnectTimeout(ac.getConnectTimeout());
+        urlC.setReadTimeout(ac.getReadTimeout());
+
         // avoid all kind of caches
         urlC.setRequestProperty("Pragma", "no-cache");
         urlC.setRequestProperty("Cache-Control", "no-cache, no-store");
@@ -289,7 +293,7 @@ private static URLConnection getConnection(URL url, URL referrer, int count,
                     } catch (Exception ex) {
                         // usually a NPE when Location is absent on a redirect.
                         // in any case, we will count this as non existent result.
-                        throw new FileNotFoundException(url + ":" + " Error in "+status);
+                        throw new FileNotFoundException(url + ":" + " Error in " + status);
                     } finally {
                         httpURL.disconnect();
                     }

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,10 @@ private static URLConnection getConnection(URL url, URL referrer, int count,`
`226`	`226`	`System.err.println("with [" + ac.getCredential() + ']');`
`227`	`227`	`}`
`228`	`228`	`}`
	`229`	`+ // setting timeouts`
	`230`	`+ urlC.setConnectTimeout(ac.getConnectTimeout());`
	`231`	`+ urlC.setReadTimeout(ac.getReadTimeout());`
	`232`	`+`
`229`	`233`	`// avoid all kind of caches`
`230`	`234`	`urlC.setRequestProperty("Pragma", "no-cache");`
`231`	`235`	`urlC.setRequestProperty("Cache-Control", "no-cache, no-store");`
`@@ -289,7 +293,7 @@ private static URLConnection getConnection(URL url, URL referrer, int count,`
`289`	`293`	`} catch (Exception ex) {`
`290`	`294`	`// usually a NPE when Location is absent on a redirect.`
`291`	`295`	`// in any case, we will count this as non existent result.`
`292`		`- throw new FileNotFoundException(url + ":" + " Error in "+status);`
	`296`	`+ throw new FileNotFoundException(url + ":" + " Error in " + status);`
`293`	`297`	`} finally {`
`294`	`298`	`httpURL.disconnect();`
`295`	`299`	`}`