java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 4 ++--
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit dcddd47a5eef7645b5ebe5e7c9ac2ce2d9617fb4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 14 14:22:38 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4621840..c3f8fd8 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.43
+Version: 1.5.44
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 14 2011 Miroslav Suchý 1.5.44-1
+- fix content-length setting (msuchy(a)redhat.com)
+- 711377 - remove confusing 'create schedule' link (tlestach(a)redhat.com)
+
* Mon Jun 13 2011 Jan Pazdziora 1.5.43-1
- content-length should be sent even for HEAD (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d1d9a54..2483a6d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.43-1 java/
+1.5.44-1 java/
commit 6e3c5a36e74d664f69bb29d2647b9a3e31b2783c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 14 14:22:03 2011 +0200
fix content-length setting
setContentLength() require int, so passing Long ends up with:
[javac]
/builddir/build/BUILD/spacewalk-java-1.5.43/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java:587:
setContentLength(int) in javax.servlet.ServletResponse cannot be applied to
(java.lang.Long)
but converting to int is bad thing as we can hit 2GB limit
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
index 70d2f92..f2b254d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -584,7 +584,7 @@ public class DownloadFile extends DownloadAction {
if (rpmPackage != null && rpmPackage.getChecksum() != null &&
rpmPackage.getChecksum().getChecksum() != null) {
checksum = rpmPackage.getChecksum().getChecksum();
- response.setContentLength(rpmPackage.getPackageSize());
+ response.setHeader( "Content-Length",
String.valueOf(rpmPackage.getPackageSize()))
}
else {
File f = new File(diskPath);
@@ -594,7 +594,7 @@ public class DownloadFile extends DownloadAction {
return getStreamForText(new byte[0]);
}
checksum = MD5Sum.getFileMD5Sum(f);
- response.setContentLength(f.length());
+ response.setHeader( "Content-Length", String.valueOf(f.length()))
}
// Create some headers.
response.addHeader("X-RHN-Checksum", checksum);