Support configure user agent and keep alive headers in Simple RPC

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 711b3a71d0ea · 2014-01-03T09:46:29.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java b/sources/net.sf.j2s.ajax/ajaxpipe/net/sf/j2s/ajax/SimplePipeRequest.java
@@ -428,6 +428,16 @@ private static void pipeRequest(final SimplePipeRunnable runnable) {
 			serialize = null;
 		}
 		final HttpRequest request = getRequest();
+		if (!runnable.supportsKeepAlive()) {
+			request.setRequestHeader("Connection", "close");
+		}
+		if (runnable instanceof ISimpleRequestInfo) {
+			ISimpleRequestInfo reqInfo = (ISimpleRequestInfo) runnable;
+			String ua = reqInfo.getRemoteUserAgent();
+			if (ua != null) {
+				request.setRequestHeader("User-Agent", ua);
+			}
+		}
 		request.open(method, url, true);
 		request.registerOnReadyStateChange(new XHRCallbackAdapter() {
 			public void onLoaded() {
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java
@@ -141,6 +141,16 @@ private static void ajaxRequest(final SimpleRPCRunnable runnable) {
 		}
 		
 		final HttpRequest request = getRequest();
+		if (!runnable.supportsKeepAlive()) {
+			request.setRequestHeader("Connection", "close");
+		}
+		if (runnable instanceof ISimpleRequestInfo) {
+			ISimpleRequestInfo reqInfo = (ISimpleRequestInfo) runnable;
+			String ua = reqInfo.getRemoteUserAgent();
+			if (ua != null) {
+				request.setRequestHeader("User-Agent", ua);
+			}
+		}
 		request.open(method, url, true);
 		request.registerOnReadyStateChange(new XHRCallbackAdapter() {
 			public void onLoaded() {
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRunnable.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRunnable.java
@@ -75,4 +75,15 @@ public boolean supportsGZipEncoding() {
 		return true;
 	}
 	
+	/**
+	 * Whether supporting HTTP Keep-Alive feature or not.
+	 *  
+	 * This method will be called by server side.
+	 * 
+	 * @return supported
+	 */
+	public boolean supportsKeepAlive() {
+		return true;
+	}
+	
 }
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimplePipeSWTRequest.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimplePipeSWTRequest.java
@@ -174,6 +174,16 @@ private static void swtPipeRequest(final SimplePipeRunnable runnable) {
 			serialize = null;
 		}
 		final HttpRequest request = getRequest();
+		if (!runnable.supportsKeepAlive()) {
+			request.setRequestHeader("Connection", "close");
+		}
+		if (runnable instanceof ISimpleRequestInfo) {
+			ISimpleRequestInfo reqInfo = (ISimpleRequestInfo) runnable;
+			String ua = reqInfo.getRemoteUserAgent();
+			if (ua != null) {
+				request.setRequestHeader("User-Agent", ua);
+			}
+		}
 		request.open(method, url, true);
 		request.registerOnReadyStateChange(new XHRCallbackSWTAdapter() {
 			public void swtOnLoaded() {
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimpleRPCSWTRequest.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/SimpleRPCSWTRequest.java
@@ -72,6 +72,16 @@ private static void swtAJAXRequest(final SimpleRPCRunnable runnable) {
 			serialize = null;
 		}
 		final HttpRequest request = getRequest();
+		if (!runnable.supportsKeepAlive()) {
+			request.setRequestHeader("Connection", "close");
+		}
+		if (runnable instanceof ISimpleRequestInfo) {
+			ISimpleRequestInfo reqInfo = (ISimpleRequestInfo) runnable;
+			String ua = reqInfo.getRemoteUserAgent();
+			if (ua != null) {
+				request.setRequestHeader("User-Agent", ua);
+			}
+		}
 		request.open(method, url, true);
 		request.registerOnReadyStateChange(new XHRCallbackSWTAdapter() {
 			public void swtOnLoaded() {
