[Red5devs] [red5 commit] r3062 - in java/server: branches/paulg_mp4/src/org/red5/server/service trunk/src/org/red5/server/...

[codesite-noreply at google.com]

Author: mondain
Date: Tue Sep 16 09:40:27 2008
New Revision: 3062

Modified:
    java/server/branches/paulg_mp4/src/org/red5/server/service/Installer.java
    java/server/trunk/src/org/red5/server/service/Installer.java

Log:
Fix to force "identity" in war file request from repository to prevent  
manipulation (gzipping etc) by the server

Modified:  
java/server/branches/paulg_mp4/src/org/red5/server/service/Installer.java
==============================================================================
---  
java/server/branches/paulg_mp4/src/org/red5/server/service/Installer.java	 
(original)
+++  
java/server/branches/paulg_mp4/src/org/red5/server/service/Installer.java	 
Tue Sep 16 09:40:27 2008
@@ -33,6 +33,8 @@
  import org.apache.commons.httpclient.HttpException;
  import org.apache.commons.httpclient.HttpMethod;
  import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.params.HttpClientParams;
+import org.apache.commons.httpclient.params.HttpMethodParams;
  import org.red5.compatibility.flex.messaging.messages.AcknowledgeMessage;
  import org.red5.compatibility.flex.messaging.messages.AsyncMessage;
  import org.red5.server.LoaderMBean;
@@ -99,8 +101,12 @@
  		HttpClient client = new HttpClient();
  		// establish a connection within 5 seconds
  		client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
+		//get the params for the client
+		HttpClientParams params = client.getParams();
+		params.setParameter(HttpMethodParams.USER_AGENT, "Mozilla/4.0  
(compatible; Red5 Server)");
  		//try the wav version first
  		HttpMethod method = new GetMethod(applicationRepositoryUrl  
+ "registry.xml");
+		//follow any 302's although there shouldnt be any
  		method.setFollowRedirects(true);
  		// execute the method
  		try {
@@ -190,8 +196,16 @@
  				HttpClient client = new HttpClient();
  				// establish a connection within 5 seconds
  				 
client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
+				//get the params for the client
+				HttpClientParams params = client.getParams();
+				params.setParameter(HttpMethodParams.USER_AGENT, "Mozilla/4.0  
(compatible; Red5 Server)");
+				params.setParameter(HttpMethodParams.STRICT_TRANSFER_ENCODING,  
Boolean.TRUE);
+				
  				//try the wav version first
  				HttpMethod method = new GetMethod(applicationRepositoryUrl +  
applicationWarName);
+				//we dont want any transformation - RFC2616
+				method.addRequestHeader("Accept-Encoding", "identity");
+				//follow any 302's although there shouldnt be any
  				method.setFollowRedirects(true);
  				FileOutputStream fos = null;				
  				// execute the method

Modified: java/server/trunk/src/org/red5/server/service/Installer.java
==============================================================================
--- java/server/trunk/src/org/red5/server/service/Installer.java	(original)
+++ java/server/trunk/src/org/red5/server/service/Installer.java	Tue Sep 16  
09:40:27 2008
@@ -33,6 +33,8 @@
  import org.apache.commons.httpclient.HttpException;
  import org.apache.commons.httpclient.HttpMethod;
  import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.params.HttpClientParams;
+import org.apache.commons.httpclient.params.HttpMethodParams;
  import org.red5.compatibility.flex.messaging.messages.AcknowledgeMessage;
  import org.red5.compatibility.flex.messaging.messages.AsyncMessage;
  import org.red5.server.LoaderMBean;
@@ -99,8 +101,12 @@
  		HttpClient client = new HttpClient();
  		// establish a connection within 5 seconds
  		client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
+		//get the params for the client
+		HttpClientParams params = client.getParams();
+		params.setParameter(HttpMethodParams.USER_AGENT, "Mozilla/4.0  
(compatible; Red5 Server)");
  		//try the wav version first
  		HttpMethod method = new GetMethod(applicationRepositoryUrl  
+ "registry.xml");
+		//follow any 302's although there shouldnt be any
  		method.setFollowRedirects(true);
  		// execute the method
  		try {
@@ -190,8 +196,16 @@
  				HttpClient client = new HttpClient();
  				// establish a connection within 5 seconds
  				 
client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);
+				//get the params for the client
+				HttpClientParams params = client.getParams();
+				params.setParameter(HttpMethodParams.USER_AGENT, "Mozilla/4.0  
(compatible; Red5 Server)");
+				params.setParameter(HttpMethodParams.STRICT_TRANSFER_ENCODING,  
Boolean.TRUE);
+				
  				//try the wav version first
  				HttpMethod method = new GetMethod(applicationRepositoryUrl +  
applicationWarName);
+				//we dont want any transformation - RFC2616
+				method.addRequestHeader("Accept-Encoding", "identity");
+				//follow any 302's although there shouldnt be any
  				method.setFollowRedirects(true);
  				FileOutputStream fos = null;				
  				// execute the method