svn commit: r398366 - head/www/helma/files
Steve Wills
swills at FreeBSD.org
Thu Oct 1 16:10:07 UTC 2015
Author: swills
Date: Thu Oct 1 16:10:05 2015
New Revision: 398366
URL: https://svnweb.freebsd.org/changeset/ports/398366
Log:
www/helma: fix build with OpenJDK8
PR: 203143
Approved by: decke (maintainer)
Added:
head/www/helma/files/patch-src_helma_framework_RequestTrans.java (contents, props changed)
head/www/helma/files/patch-src_helma_framework_ResponseTrans.java (contents, props changed)
head/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java (contents, props changed)
Added: head/www/helma/files/patch-src_helma_framework_RequestTrans.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/helma/files/patch-src_helma_framework_RequestTrans.java Thu Oct 1 16:10:05 2015 (r398366)
@@ -0,0 +1,15 @@
+--- src/helma/framework/RequestTrans.java.orig 2015-09-16 00:39:16 UTC
++++ src/helma/framework/RequestTrans.java
+@@ -602,10 +602,10 @@ public class RequestTrans implements Ser
+ StringTokenizer tok;
+
+ if (auth.startsWith("Basic ")) {
+- tok = new StringTokenizer(new String(Base64.decode((auth.substring(6)).toCharArray())),
++ tok = new StringTokenizer(new String(helma.util.Base64.decode((auth.substring(6)).toCharArray())),
+ ":");
+ } else {
+- tok = new StringTokenizer(new String(Base64.decode(auth.toCharArray())), ":");
++ tok = new StringTokenizer(new String(helma.util.Base64.decode(auth.toCharArray())), ":");
+ }
+
+ try {
Added: head/www/helma/files/patch-src_helma_framework_ResponseTrans.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/helma/files/patch-src_helma_framework_ResponseTrans.java Thu Oct 1 16:10:05 2015 (r398366)
@@ -0,0 +1,27 @@
+--- src/helma/framework/ResponseTrans.java.orig 2015-09-16 00:39:16 UTC
++++ src/helma/framework/ResponseTrans.java
+@@ -714,7 +714,7 @@ public final class ResponseTrans extends
+ // if (contentType != null)
+ // digest.update (contentType.getBytes());
+ byte[] b = digest.digest(response);
+- etag = "\"" + new String(Base64.encode(b)) + "\"";
++ etag = "\"" + new String(helma.util.Base64.encode(b)) + "\"";
+ // only set response to 304 not modified if no cookies were set
+ if (reqtrans.hasETag(etag) && countCookies() == 0) {
+ response = new byte[0];
+@@ -891,7 +891,7 @@ public final class ResponseTrans extends
+ // generation sensitive to changes in the app
+ byte[] b = digest.digest(MD5Encoder.toBytes(app.getChecksum()));
+
+- setETag(new String(Base64.encode(b)));
++ setETag(new String(helma.util.Base64.encode(b)));
+ }
+
+ /**
+@@ -1164,4 +1164,4 @@ public final class ResponseTrans extends
+ public void setRealm(String realm) {
+ this.realm = realm;
+ }
+-}
+\ No newline at end of file
++}
Added: head/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/helma/files/patch-src_helma_servlet_AbstractServletClient.java Thu Oct 1 16:10:05 2015 (r398366)
@@ -0,0 +1,11 @@
+--- src/helma/servlet/AbstractServletClient.java.orig 2015-09-16 00:39:16 UTC
++++ src/helma/servlet/AbstractServletClient.java
+@@ -510,7 +510,7 @@ public abstract class AbstractServletCli
+ checksum[i] = (byte) (n);
+ n >>>= 8;
+ }
+- String etag = "\"" + new String(Base64.encode(checksum)) + "\"";
++ String etag = "\"" + new String(helma.util.Base64.encode(checksum)) + "\"";
+ res.setHeader("ETag", etag);
+ String etagHeader = req.getHeader("If-None-Match");
+ if (etagHeader != null) {
More information about the svn-ports-head
mailing list