AjaxURLConnection Proper reporting of 405 and other status

hansonr · hansonr · commit a2b150e8423d · 2020-12-03T12:04:09.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20201203093348 
+20201203120347 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20201203093348 
+20201203120347 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/AjaxURLConnection.java b/sources/net.sf.j2s.java.core/src/javajs/util/AjaxURLConnection.java
@@ -262,7 +262,7 @@ private int getAJAXStatusError() {
 		@SuppressWarnings("unused")
 		Object info = this.info;
 		// AJAX cannot distinguish among a network connection error, a method (PUT) error, or a file not found
-		return /** @j2sNative !info.xhr.statusText || (info.xhr.statusText+"").indexOf("NetworkError:") == 0 ? 400 : */HTTP_NOT_FOUND;
+		return /** @j2sNative info.xhr.status > 0 ? info.xhr.status : !info.xhr.statusText || (info.xhr.statusText+"").indexOf("NetworkError:") == 0 ? 400 : */HTTP_NOT_FOUND;
 	}
 
 	private String getFileDocumentDir() {
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_HTTP.java b/sources/net.sf.j2s.java.core/src/test/Test_HTTP.java
@@ -36,6 +36,21 @@ public static void main(String[] args) {
 		HttpClient client = HttpClientFactory.getClient(null);
 		HttpRequest req = null;
 
+		System.out.println("Testing httpstat 405");
+		
+		try {
+			URL url = new URL("http://httpstat.us/405");
+			HttpURLConnection c = (HttpURLConnection) url.openConnection();
+			int code = c.getResponseCode();
+			System.out.println("httpstat.us reports " + code);
+			InputStream oi = url.openStream();
+			String s = new String(oi.readAllBytes());
+			System.out.println("httpstat.us reports " + s);
+		} catch (IOException e) {
+			System.out.println(e);
+		}
+
+
 		System.out.println("Testing httpstat 201");
 		
 		try {
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -210,8 +210,12 @@ window.J2S = J2S = (function() {
 				mimeType : "text/plain"
 			});
 		j._ajaxTestSite = j._httpProto + "google.com";
-		var isLocal = (j._isFile || ref.indexOf("http://localhost") == 0 || ref
-				.indexOf("http://127.") == 0);
+		var isLocal = (j._isFile 
+				|| ref.indexOf("http://localhost") == 0 
+				|| ref.indexOf("http://127.") == 0
+				|| ref.indexOf("https://localhost") == 0 
+				|| ref.indexOf("https://127.") == 0)
+				;
 		// this url is used to Google Analytics tracking of Jmol use. You may
 		// remove it or modify it if you wish.
 		j._tracker = (!isLocal && 'https://chemapps.stolaf.edu/jmol/JmolTracker.php?id=UA-45940799-1');
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10881,8 +10881,12 @@ window.J2S = J2S = (function() {
 				mimeType : "text/plain"
 			});
 		j._ajaxTestSite = j._httpProto + "google.com";
-		var isLocal = (j._isFile || ref.indexOf("http://localhost") == 0 || ref
-				.indexOf("http://127.") == 0);
+		var isLocal = (j._isFile 
+				|| ref.indexOf("http://localhost") == 0 
+				|| ref.indexOf("http://127.") == 0
+				|| ref.indexOf("https://localhost") == 0 
+				|| ref.indexOf("https://127.") == 0)
+				;
 		// this url is used to Google Analytics tracking of Jmol use. You may
 		// remove it or modify it if you wish.
 		j._tracker = (!isLocal && 'https://chemapps.stolaf.edu/jmol/JmolTracker.php?id=UA-45940799-1');

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ private int getAJAXStatusError() {`
`262`	`262`	`@SuppressWarnings("unused")`
`263`	`263`	`Object info = this.info;`
`264`	`264`	`// AJAX cannot distinguish among a network connection error, a method (PUT) error, or a file not found`
`265`		`- return /** @j2sNative !info.xhr.statusText \|\| (info.xhr.statusText+"").indexOf("NetworkError:") == 0 ? 400 : */HTTP_NOT_FOUND;`
	`265`	`+ return /** @j2sNative info.xhr.status > 0 ? info.xhr.status : !info.xhr.statusText \|\| (info.xhr.statusText+"").indexOf("NetworkError:") == 0 ? 400 : */HTTP_NOT_FOUND;`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`private String getFileDocumentDir() {`