From 1215b0b9790582564e9fba21b3349e0f1df046d9 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 11 Feb 2006 05:46:39 +0000
Subject: [PATCH] merge of http attachment and expires header bugfix

---
 docs/changelog/6.x.x.txt   | 1 +
 lib/WebGUI/Session/Http.pm | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 3d047d01d..9f942f9c4 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -42,6 +42,7 @@
    file (Martin Kamerbeek / Procolix)
  - fix [ 1429349 ] Invalid HTML returned by func=manageAssets
  - fix [ 1429348 ] Textboxes need to filter CR/LF
+ - fix [ 1428481 ] WebGUI::HTTP::setFilename not working correctly in 6.8.5
 
 6.8.5
  - fix [ 1396957 ] Insufficient privileges check on the DataForm
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 561c43a85..058dbb356 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -105,13 +105,13 @@ sub getHeader {
 	} else {
 		$self->session->request->content_type($self->{_http}{mimetype} || "text/html") if ($self->session->request);
 		if ($self->session->setting->get("preventProxyCache")) {
-			$params{"-expires"} = "-1d";
+			$self->session->request->headers_out->set(Expires => "-1d");
 		}
 		if ($self->{_http}{filename}) {
-			$params{"-attachment"} = $self->{_http}{filename};
+                        $self->session->request->headers_out->set('Content-Disposition' => qq!attachment; filename="$self->{_http}{filename}"!);
 		}
 	}
-	$params{"-cookie"} = $self->{_http}{cookie};
+	#$params{"-cookie"} = $self->{_http}{cookie};
 	$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription}) if $self->session->request;
 	return;
 }