[pkg-java] r5970 - in trunk/libcobra-java/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-03-08 10:54:22 +0000 (Sat, 08 Mar 2008)
New Revision: 5970

Modified:
   trunk/libcobra-java/debian/changelog
   trunk/libcobra-java/debian/patches/disable_proxy.diff
Log:
* new upstream release
* Update patch disable_proxy.diff.

Modified: trunk/libcobra-java/debian/changelog
===================================================================
--- trunk/libcobra-java/debian/changelog	2008-03-08 09:40:55 UTC (rev 5969)
+++ trunk/libcobra-java/debian/changelog	2008-03-08 10:54:22 UTC (rev 5970)
@@ -1,3 +1,10 @@
+libcobra-java (0.97.5-1) unstable; urgency=low
+
+  * new upstream release
+  * Update patch disable_proxy.diff.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 08 Mar 2008 11:32:48 +0100
+
 libcobra-java (0.97.4-2) unstable; urgency=low
 
   * Add patches/disable_proxy.diff patch as a temporary fix to build test/*

Modified: trunk/libcobra-java/debian/patches/disable_proxy.diff
===================================================================
--- trunk/libcobra-java/debian/patches/disable_proxy.diff	2008-03-08 09:40:55 UTC (rev 5969)
+++ trunk/libcobra-java/debian/patches/disable_proxy.diff	2008-03-08 10:54:22 UTC (rev 5970)
@@ -1,23 +1,37 @@
-Index: libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
+Index: libcobra-java-0.97.5/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
 ===================================================================
---- libcobra-java-0.97.4.orig/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java	2008-01-09 20:41:25.000000000 +0530
-+++ libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java	2008-01-09 20:41:28.000000000 +0530
-@@ -242,8 +242,9 @@
+--- libcobra-java-0.97.5.orig/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java	2008-01-13 12:41:08.000000000 +0100
++++ libcobra-java-0.97.5/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java	2008-03-08 11:51:29.000000000 +0100
+@@ -228,9 +228,10 @@
  					logger.info("process(): Loading URI=[" + uri + "].");
  					long time0 = System.currentTimeMillis();
  					// Using potentially different URL for loading.
 -					Proxy proxy = SimpleHtmlRendererContext.this.getProxy();
++					// Proxy proxy = SimpleHtmlRendererContext.this.getProxy();
+ 					boolean isPost = "post".equalsIgnoreCase(method);
 -					URLConnection connection = proxy == null || proxy == Proxy.NO_PROXY ? finalURLForLoading.openConnection() : finalURLForLoading.openConnection(proxy);
-+					// Proxy proxy = SimpleHtmlRendererContext.this.getProxy();
 +					// URLConnection connection = proxy == null || proxy == Proxy.NO_PROXY ? finalURLForLoading.openConnection() : finalURLForLoading.openConnection(proxy);
 +					URLConnection connection = finalURLForLoading.openConnection();
  					connection.setRequestProperty("User-Agent", getUserAgentContext().getUserAgent());
  					connection.setRequestProperty("Cookie", "");
  					if (connection instanceof HttpURLConnection) {
-Index: libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHttpRequest.java
+@@ -268,9 +269,9 @@
+ 				    	// Do not add a line break to post content. Some servers
+ 				    	// can be picky about that (namely, java.net).
+ 						byte[] postContent = bufOut.toByteArray();
+-						if(connection instanceof HttpURLConnection) {
+-							((HttpURLConnection) connection).setFixedLengthStreamingMode(postContent.length);
+-						}
++						//if(connection instanceof HttpURLConnection) {
++						//	((HttpURLConnection) connection).setFixedLengthStreamingMode(postContent.length);
++						//}
+ 						connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ 						//connection.setRequestProperty("Content-Length", String.valueOf(postContent.length));
+ 				    	OutputStream postOut = connection.getOutputStream();
+Index: libcobra-java-0.97.5/src/org/lobobrowser/html/test/SimpleHttpRequest.java
 ===================================================================
---- libcobra-java-0.97.4.orig/src/org/lobobrowser/html/test/SimpleHttpRequest.java	2008-01-09 20:41:36.000000000 +0530
-+++ libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHttpRequest.java	2008-01-09 20:42:29.000000000 +0530
+--- libcobra-java-0.97.5.orig/src/org/lobobrowser/html/test/SimpleHttpRequest.java	2007-12-08 11:51:50.000000000 +0100
++++ libcobra-java-0.97.5/src/org/lobobrowser/html/test/SimpleHttpRequest.java	2008-03-08 11:50:33.000000000 +0100
 @@ -249,8 +249,9 @@
  			String userName, String password) {
  		try {