[Pkg-drupal-commits] r2189 - in /branches/drupal6/debian: changelog patches/00list patches/21-ssl-cache-control.dpatch

[luigi at users.alioth.debian.org]

Author: luigi
Date: Sun May 15 22:23:10 2011
New Revision: 2189

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2189
Log:
Added patch to fix Attachment downloads on HTTPS with IE7 (Closes: #624467)

Added:
    branches/drupal6/debian/patches/21-ssl-cache-control.dpatch   (with props)
Modified:
    branches/drupal6/debian/changelog
    branches/drupal6/debian/patches/00list

Modified: branches/drupal6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/changelog?rev=2189&op=diff
==============================================================================
--- branches/drupal6/debian/changelog (original)
+++ branches/drupal6/debian/changelog Sun May 15 22:23:10 2011
@@ -1,6 +1,10 @@
 drupal6 (6.20-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+  * debian/patches/21-ssl-cache-control
+    - Added patch to fix Attachment downloads on HTTPS with IE7
+      (Closes: #624467)
 
  -- Luigi Gangitano <luigi at debian.org>  Mon, 16 May 2011 00:18:13 +0200
 

Modified: branches/drupal6/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/00list?rev=2189&op=diff
==============================================================================
--- branches/drupal6/debian/patches/00list (original)
+++ branches/drupal6/debian/patches/00list Sun May 15 22:23:10 2011
@@ -1,2 +1,3 @@
 10_cronjob
 20_drupal_core_updates
+21-ssl-cache-control

Added: branches/drupal6/debian/patches/21-ssl-cache-control.dpatch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6/debian/patches/21-ssl-cache-control.dpatch?rev=2189&op=file
==============================================================================
--- branches/drupal6/debian/patches/21-ssl-cache-control.dpatch (added)
+++ branches/drupal6/debian/patches/21-ssl-cache-control.dpatch Sun May 15 22:23:10 2011
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21-cache-control.dpatch by Luigi Gangitano <luigi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes download issue with IE7 on HTTPS
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drupal6~/includes/file.inc drupal6/includes/file.inc
+--- drupal6~/includes/file.inc	2011-02-18 19:59:32.000000000 +0100
++++ drupal6/includes/file.inc	2011-05-16 00:17:05.000000000 +0200
+@@ -842,6 +842,14 @@
+     ob_end_clean();
+   }
+ 
++  // IE cannot download private files because it cannot store files downloaded
++  // over https in the browser cache. The problem can be solved by sending
++  // custom headers to IE. See http://support.microsoft.com/kb/323308/en-us
++  if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
++    drupal_set_header('Cache-Control: private');
++    drupal_set_header('Pragma: private');
++  }
++
+   foreach ($headers as $header) {
+     // To prevent HTTP header injection, we delete new lines that are
+     // not followed by a space or a tab.

Propchange: branches/drupal6/debian/patches/21-ssl-cache-control.dpatch
------------------------------------------------------------------------------
    svn:executable = *