Author: twerner
Date: 2008-03-17 20:41:16 +0000 (Mon, 17 Mar 2008)
New Revision: 5997
Modified:
trunk/libcobra-java/debian/changelog
trunk/libcobra-java/debian/patches/disable_proxy.diff
Log:
* new upstream release
* Refresh patch disable_proxy.diff.
Modified: trunk/libcobra-java/debian/changelog
===================================================================
--- trunk/libcobra-java/debian/changelog 2008-03-16 00:23:46 UTC (rev
5996)
+++ trunk/libcobra-java/debian/changelog 2008-03-17 20:41:16 UTC (rev
5997)
@@ -1,3 +1,10 @@
+libcobra-java (0.98-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ * Refresh patch disable_proxy.diff.
+
+ -- Torsten Werner <[EMAIL PROTECTED]> Mon, 17 Mar 2008 21:31:25 +0100
+
libcobra-java (0.97.5-1) unstable; urgency=low
* new upstream release
Modified: trunk/libcobra-java/debian/patches/disable_proxy.diff
===================================================================
--- trunk/libcobra-java/debian/patches/disable_proxy.diff 2008-03-16
00:23:46 UTC (rev 5996)
+++ trunk/libcobra-java/debian/patches/disable_proxy.diff 2008-03-17
20:41:16 UTC (rev 5997)
@@ -1,46 +1,69 @@
-Index:
libcobra-java-0.97.5/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
+Index:
libcobra-java-0.98/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
===================================================================
----
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);
-+ // 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) {
-@@ -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.98.orig/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
2008-03-08 17:38:10.000000000 +0100
++++
libcobra-java-0.98/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
2008-03-17 21:37:23.000000000 +0100
+@@ -332,16 +332,17 @@
+ }
+ long time0 = System.currentTimeMillis();
+ // Using potentially different URL for loading.
+- Proxy proxy = SimpleHtmlRendererContext.this.getProxy();
++ //Proxy proxy = SimpleHtmlRendererContext.this.getProxy();
+ boolean isPost = "POST".equals(actualMethod);
+- URLConnection connection = proxy == null || proxy ==
Proxy.NO_PROXY ? urlForLoading.openConnection() :
urlForLoading.openConnection(proxy);
++ //URLConnection connection = proxy == null || proxy ==
Proxy.NO_PROXY ? urlForLoading.openConnection() :
urlForLoading.openConnection(proxy);
++ URLConnection connection = urlForLoading.openConnection();
+
+ connection.setRequestProperty("User-Agent",
getUserAgentContext().getUserAgent());
+ connection.setRequestProperty("Cookie", "");
+- if (connection instanceof HttpURLConnection) {
+- HttpURLConnection hc = (HttpURLConnection) connection;
+- hc.setRequestMethod(actualMethod);
+- hc.setInstanceFollowRedirects(false);
+- }
++ //if (connection instanceof HttpURLConnection) {
++ // HttpURLConnection hc = (HttpURLConnection) connection;
++ // hc.setRequestMethod(actualMethod);
++ // hc.setInstanceFollowRedirects(false);
++ //}
+ if(isPost) {
+ connection.setDoOutput(true);
+ ByteArrayOutputStream bufOut = new ByteArrayOutputStream();
+@@ -372,9 +373,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.98/src/org/lobobrowser/html/test/SimpleHttpRequest.java
===================================================================
----
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 {
- this.abort();
-- Proxy proxy = this.proxy;
-- URLConnection c = proxy == null || proxy ==
Proxy.NO_PROXY ? url.openConnection() : url.openConnection(proxy);
-+ URLConnection c = url.openConnection();
-+ // Proxy proxy = this.proxy;
-+ // URLConnection c = proxy == null || proxy ==
Proxy.NO_PROXY ? url.openConnection() : url.openConnection(proxy);
- synchronized(this) {
- this.connection = c;
- }
+---
libcobra-java-0.98.orig/src/org/lobobrowser/html/test/SimpleHttpRequest.java
2008-03-08 19:16:06.000000000 +0100
++++ libcobra-java-0.98/src/org/lobobrowser/html/test/SimpleHttpRequest.java
2008-03-17 21:37:45.000000000 +0100
+@@ -206,8 +206,9 @@
+ public void open(final String method, final java.net.URL url, boolean
asyncFlag,
+ final String userName, final String password) throws
java.io.IOException {
+ this.abort();
+- Proxy proxy = this.proxy;
+- URLConnection c = proxy == null || proxy == Proxy.NO_PROXY ?
url.openConnection() : url.openConnection(proxy);
++ //Proxy proxy = this.proxy;
++ //URLConnection c = proxy == null || proxy == Proxy.NO_PROXY ?
url.openConnection() : url.openConnection(proxy);
++ URLConnection c = url.openConnection();
+
+ synchronized(this) {
+ this.connection = c;
+ this.isAsync = asyncFlag;
+@@ -287,7 +288,7 @@
+ if("POST".equals(method) && content != null) {
+ hc.setDoOutput(true);
+ byte[] contentBytes =
content.getBytes(this.getPostCharset());
+-
hc.setFixedLengthStreamingMode(contentBytes.length);
++
//hc.setFixedLengthStreamingMode(contentBytes.length);
+ OutputStream out = hc.getOutputStream();
+ try {
+ out.write(contentBytes);
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
