Fix bug of HttpRequest for "Set-Cookie" header, enlarge reading buffer

zhourenjian · zhourenjian · commit 5d1d6355a9ae · 2009-12-18T06:18:26.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java
@@ -22,6 +22,7 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -281,7 +282,27 @@ public String getAllResponseHeaders() {
 	 * @return String the response header value.
 	 */
 	public String getResponseHeader(String key) {
-		return connection.getHeaderField(key);
+		Map<String, List<String>> headerFields = connection.getHeaderFields();
+		List<String> list = headerFields.get(key);
+		if (list == null) {
+			return null;
+		}
+		if (list.size() == 0) {
+			return "";
+		}
+		String headerValue = null;
+		for (Iterator<String> itr = list.iterator(); itr.hasNext();) {
+			String value = (String) itr.next();
+	 		if (value != null) {
+	 			if (headerValue == null) {
+	 				headerValue = value;
+	 			} else {
+	 				headerValue = value + "\r\n" + headerValue;
+	 			}
+	 		}
+		}
+		return headerValue; // may have multiple Set-Cookie headers 
+		// return connection.getHeaderField(key);
 	}
 	/**
 	 * Open connection for HTTP request with given method and URL 
@@ -407,10 +428,12 @@ private void request() {
 			} else {
 				connection.setReadTimeout(30000); // 30s
 			}
+			connection.setInstanceFollowRedirects(false);
 			connection.setDoInput(true);
 			connection.setRequestMethod(method);
 			connection.setRequestProperty("User-Agent",
-					"Mozilla/5.0 (compatible; Java2Script/2.0.0)");
+					// "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5 GTB5 (Java2Script/2.0.0)");
+					"Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5 GTB5");
 			if ("post".equalsIgnoreCase(method)) {
 				connection.setDoOutput(true);
 				connection.setRequestProperty("Content-Type",
@@ -471,8 +494,8 @@ private void request() {
 			
 			receiving = initializeReceivingMonitor();
 			
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			byte[] buffer = new byte[1024];
+			ByteArrayOutputStream baos = new ByteArrayOutputStream(10240);
+			byte[] buffer = new byte[10240];
 			int read;
 			while (!toAbort && (read = is.read(buffer)) != -1) {
 				if (checkAbort()) return; // stop receiving anything
diff --git a/sources/net.sf.j2s.ajax/j2sajax/HttpRequest.js b/sources/net.sf.j2s.ajax/j2sajax/HttpRequest.js
@@ -70,12 +70,12 @@ c$.prototype.open = function (method, url, async, user) {
 */
 c$.prototype.open = function (method, url, async, user, password) {
 	this.transport.open (method, url, async, user, password);
-	try {
-		if (ClassLoader != null && ClassLoader.isGecko) {
-			this.transport.setRequestHeader ("User-Agent", "Java2Script/2.0.0");
-		}
-	} catch (e) {
-	}
+	//try {
+	//	if (ClassLoader != null && ClassLoader.isGecko) {
+	//		this.transport.setRequestHeader ("User-Agent", "Java2Script/2.0.0");
+	//	}
+	//} catch (e) {
+	//}
 	try {
 		var l = window.location;
 		this.transport.setRequestHeader ("Referer",
