Merge branch 'master' into fix/spartacusSourceforge

Author: onli

docs/NEWS

@@ -4,6 +4,9 @@ Version 2.6-beta2 ()
    * Removed Sourceforge from Spartacus' mirror list, as it caused HTML
      to be written to the plugin files instead of the wanted PHP code.
 
+   * Removed obsolete Pragma header from some responses, controlling
+     brwoser cache behaviour. Alternative headers were already set.
+
    * Fix: clean blog's sticky header (that appears when scrolling up)
           was positioned with a gap, when it contained too many
           navigation links

include/functions_routing.inc.php

@@ -131,7 +131,6 @@ function serveJS($js_mode) {
         header('Cache-Control: no-cache');
     } else {
         header('Cache-Control:');
-        header('Pragma:');
         header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()+3600));
     }
 

index.php

@@ -20,7 +20,6 @@
         header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
     }
     header('Expires: 0');
-    header('Pragma: no-cache');
 }
 $uri = $_SERVER['REQUEST_URI'];
 

plugins/serendipity_event_gravatar/ChangeLog

@@ -1,11 +1,15 @@
+Version 2.0.1:
+------------------------------------------------------------------------
+    * Remove obsolete Pragma http header
+
 Version 2.0:
 ------------------------------------------------------------------------
     * Fix gravatar: Avatars could not be fetched
     * Remove the defunct avatar options identica and twitter
     * Reimplement favatar and pavatar options for better reliability
     * Update wavatar generator
     * Update documentation and translation
-    * Additional fixes for PH 8 compatibility
+    * Additional fixes for PHP 8 compatibility
 
 Version 1.63.1:
 ------------------------------------------------------------------------

plugins/serendipity_event_gravatar/serendipity_event_gravatar.php

@@ -8,7 +8,7 @@
 @serendipity_plugin_api::load_language(dirname(__FILE__));
 
 // Actual version of this plugin
-@define('PLUGIN_EVENT_GRAVATAR_VERSION', '2.0');
+@define('PLUGIN_EVENT_GRAVATAR_VERSION', '2.0.1');
 
 // Defines the maximum available method  slots in the configuration.
 @define('PLUGIN_EVENT_GRAVATAR_METHOD_MAX', 6);
@@ -1207,7 +1207,6 @@ function show($filename)
                 // HTTP 1.1
                 $max_age_seconds = $filemtime + $this->cache_seconds - time();
                 header("Cache-Control: public, max-age=" . $max_age_seconds, true); // delta seconds
-                header("Pragma:", true);
             }
             fpassthru($fp);
             fclose($fp);

serendipity.css.php

@@ -59,7 +59,6 @@ function serendipity_printStylesheet($file, $dir = '') {
     header('Cache-Control: no-cache');
 } else {
     header('Cache-Control:');
-    header('Pragma:');
     header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()+3600));
 }
 header('Content-type: text/css; charset=' . LANG_CHARSET);