Fixed #04304: IE has problems with downloads over HTTPS

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8671 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 3, 2010 · 98f173d · 98f173d
1 parent 29ca242
commit 98f173d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/admin/export_data_r.php b/admin/export_data_r.php
@@ -97,12 +97,10 @@
 
 
 if  ($subaction=='dldata') {
-    header("Content-Disposition: attachment; filename=survey_".$surveyid."_data_file.csv");
+    header("Content-Disposition: attachment; filename=survey_".$surveyid."_data_file.dat");
     header("Content-type: text/comma-separated-values; charset=UTF-8");
-    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Pragma: no-cache');
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+    header("Pragma: public");
 
     $na="";	//change to empty string instead of two double quotes to fix warnings on NA
     spss_export_data($na);
@@ -113,11 +111,9 @@
 
 if  ($subaction=='dlstructure') {
     header("Content-Disposition: attachment; filename=Surveydata_syntax.R");
-    header("Content-Type: application/download; charset=utf-8");
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Pragma: no-cache');
+    header("Content-type: application/download; charset=UTF-8");
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+    header("Pragma: public");
 
     // Build array that has to be returned
     $fields = spss_fieldmap();

diff --git a/admin/export_data_spss.php b/admin/export_data_spss.php
@@ -155,12 +155,10 @@
 
 
 if  ($subaction=='dldata') {
-    header("Content-Type: application/download; charset=utf-8");
     header("Content-Disposition: attachment; filename=survey_".$surveyid."_SPSS_data_file.dat");
-    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Pragma: no-cache');
+    header("Content-type: text/comma-separated-values; charset=UTF-8");
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+    header("Pragma: public");
 
     $na = "";
     spss_export_data($na);
@@ -170,12 +168,10 @@
 
 
 if  ($subaction=='dlstructure') {
-    header("Content-Type: application/download; charset=utf-8");
     header("Content-Disposition: attachment; filename=survey_".$surveyid."_SPSS_syntax_file.sps");
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Pragma: no-cache');
+    header("Content-type: application/download; charset=UTF-8");
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+    header("Pragma: public");
 
     // Build array that has to be returned
     $fields = spss_fieldmap();

diff --git a/admin/exportresults.php b/admin/exportresults.php
@@ -333,7 +333,8 @@
         $separator=",";
         break;
 }
-Header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+header("Pragma: public");
 
 // Export Language is set by default to surveybaselang
 // * the explang language code is used in SQL queries