merging 5.5.5 bugfixes

This commit is contained in:
JT Smith 2004-03-04 05:56:44 +00:00
parent 3a845e9027
commit cbbb7e8392
15 changed files with 2764 additions and 10 deletions

View file

@ -319,11 +319,16 @@ sub httpHeader {
if ($session{header}{filename} && $session{header}{mimetype} eq "text/html") {
$session{header}{mimetype} = "application/octet-stream";
}
if ($session{setting}{preventProxyCache}) {
$session{header}{expires} = "-1d";
}
return $session{cgi}->header(
-type => $session{header}{mimetype}.'; charset='.$session{header}{charset},
-type => $session{header}{mimetype}
-charset => $session{header}{charset},
-cookie => $session{header}{cookie},
-status => $session{header}{status},
-attachment => $session{header}{filename}
-attachment => $session{header}{filename},
-expires => $session{header}{expires}
);
}