Skip to content
Snippets Groups Projects
Commit 4fa0fc49 authored by ale's avatar ale
Browse files

Remove wp-super-cache patches

These patches only touch configuration files, and we have those
shipped as part of the container in ai3/docker/noblogs!6.

Fixes issue #2.
parent 4f1d1427
Branches
Tags
No related merge requests found
From 4d5249e00a44136e78fcae78455589f92c9a4c2a Mon Sep 17 00:00:00 2001
From: root <root@rivolta.investici.org>
Date: Tue, 7 Dec 2010 18:09:12 +0000
Subject: [PATCH 098/229] Add cruft needed by wp-super-cache
---
wp-content/advanced-cache.php | 12 ++++
wp-content/wp-cache-config.php | 108 +++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+)
create mode 100644 wp-content/advanced-cache.php
create mode 100644 wp-content/wp-cache-config.php
diff --git a/wp-content/advanced-cache.php b/wp-content/advanced-cache.php
new file mode 100644
index 00000000..f7d5df83
--- /dev/null
+++ b/wp-content/advanced-cache.php
@@ -0,0 +1,12 @@
+<?php
+# WP SUPER CACHE 0.8.9.1
+function wpcache_broken_message() {
+ if ( false == strpos( $_SERVER[ 'REQUEST_URI' ], 'wp-admin' ) )
+ echo "<!-- WP Super Cache is installed but broken. The path to wp-cache-phase1.php in wp-content/advanced-cache.php must be fixed! -->";
+}
+
+if ( !include_once( WP_CONTENT_DIR . '/plugins/wp-super-cache/wp-cache-phase1.php' ) ) {
+ if ( !@is_file( WP_CONTENT_DIR . '/plugins/wp-super-cache/wp-cache-phase1.php' ) )
+ register_shutdown_function( 'wpcache_broken_message' );
+}
+?>
diff --git a/wp-content/wp-cache-config.php b/wp-content/wp-cache-config.php
new file mode 100644
index 00000000..800dc33a
--- /dev/null
+++ b/wp-content/wp-cache-config.php
@@ -0,0 +1,108 @@
+<?php
+/*
+WP-Cache Config Sample File
+
+See wp-cache.php for author details.
+*/
+
+$wp_cache_mobile_groups = ''; //Added by WP-Cache Manager
+$wp_cache_mobile_prefixes = 'w3c , w3c-, acs-, alav, alca, amoi, audi, avan, benq, bird, blac, blaz, brew, cell, cldc, cmd-, dang, doco, eric, hipt, htc_, inno, ipaq, ipod, jigs, kddi, keji, leno, lg-c, lg-d, lg-g, lge-, lg/u, maui, maxo, midp, mits, mmef, mobi, mot-, moto, mwbp, nec-, newt, noki, palm, pana, pant, phil, play, port, prox, qwap, sage, sams, sany, sch-, sec-, send, seri, sgh-, shar, sie-, siem, smal, smar, sony, sph-, symb, t-mo, teli, tim-, tosh, tsm-, upg1, upsi, vk-v, voda, wap-, wapa, wapi, wapp, wapr, webc, winw, winw, xda , xda-'; //Added by WP-Cache Manager
+$wp_cache_refresh_single_only = '0'; //Added by WP-Cache Manager
+$wp_cache_slash_check = 1; //Added by WP-Cache Manager
+if ( ! defined('WPCACHEHOME') )
+ define( 'WPCACHEHOME', WP_CONTENT_DIR . "/plugins/wp-super-cache/" ); //Added by WP-Cache Manager
+
+$cache_compression = 0; // Super cache compression
+$cache_enabled = true; //Added by WP-Cache Manager
+$super_cache_enabled = true; //Added by WP-Cache Manager
+$cache_max_time = 300; //Added by WP-Cache Manager
+//$use_flock = true; // Set it true or false if you know what to use
+$cache_path = WP_CONTENT_DIR . '/cache/';
+$file_prefix = 'wp-cache-';
+
+// We want to be able to identify each blog in a WordPress MU install
+$blogcacheid = '';
+if( defined( 'VHOST' ) ) {
+ $blogcacheid = 'blog'; // main blog
+ if( constant( 'VHOST' ) == 'yes' ) {
+ $blogcacheid = $_SERVER['HTTP_HOST'];
+ } else {
+ $request_uri = preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', str_replace( '..', '', $_SERVER['REQUEST_URI'] ) );
+ if( strpos( $request_uri, '/', 1 ) ) {
+ if( $base == '/' ) {
+ $blogcacheid = substr( $request_uri, 1, strpos( $request_uri, '/', 1 ) - 1 );
+ } else {
+ $blogcacheid = str_replace( $base, '', $request_uri );
+ $blogcacheid = substr( $blogcacheid, 0, strpos( $blogcacheid, '/', 1 ) );
+ }
+ if ( '/' == substr($blogcacheid, -1))
+ $blogcacheid = substr($blogcacheid, 0, -1);
+ }
+ $blogcacheid = str_replace( '/', '', $blogcacheid );
+ }
+}
+
+// Array of files that have 'wp-' but should still be cached
+$cache_acceptable_files = array( 'wp-comments-popup.php', 'wp-links-opml.php', 'wp-locations.php' );
+
+$cache_rejected_uri = array('wp-.*\\.php', 'index\\.php');
+$cache_rejected_user_agent = array ( 0 => 'bot', 1 => 'ia_archive', 2 => 'slurp', 3 => 'crawl', 4 => 'spider', 5 => 'Yandex' );
+
+$cache_rebuild_files = 1; //Added by WP-Cache Manager
+
+// Disable the file locking system.
+// If you are experiencing problems with clearing or creating cache files
+// uncommenting this may help.
+$wp_cache_mutex_disabled = 1; //Added by WP-Cache Manager
+
+// Just modify it if you have conflicts with semaphores
+$sem_id = 942817292; //Added by WP-Cache Manager
+
+if ( '/' != substr($cache_path, -1)) {
+ $cache_path .= '/';
+}
+
+$wp_cache_mobile = 0;
+$wp_cache_mobile_whitelist = 'Stand Alone/QNws';
+$wp_cache_mobile_browsers = '2.0 MMP, 240x320, 400X240, AvantGo, BlackBerry, Blazer, Cellphone, Danger, DoCoMo, Elaine/3.0, EudoraWeb, Googlebot-Mobile, hiptop, IEMobile, KYOCERA/WX310K, LG/U990, MIDP-2., MMEF20, MOT-V, NetFront, Newt, Nintendo Wii, Nitro, Nokia, Opera Mini, Palm, PlayStation Portable, portalmmm, Proxinet, ProxiNet, SHARP-TQ-GX10, SHG-i900, Small, SonyEricsson, Symbian OS, SymbianOS, TS21i-10, UP.Browser, UP.Link, webOS, Windows CE, WinWAP, YahooSeeker/M1A1-R2D2, iPhone, iPod, Android, BlackBerry9530, LG-TU915 Obigo, LGE VX, webOS, Nokia5800'; //Added by WP-Cache Manager
+
+// gzip the first page generated for clients that support it.
+$wp_cache_gzip_first = 0;
+// change to relocate the supercache plugins directory
+$wp_cache_plugins_dir = WPCACHEHOME . 'plugins';
+// set to 1 to do garbage collection during normal process shutdown instead of wp-cron
+$wp_cache_shutdown_gc = 0;
+$wp_super_cache_late_init = 0;
+
+// uncomment the next line to enable advanced debugging features
+$wp_super_cache_advanced_debug = 0;
+$wp_super_cache_front_page_text = '';
+$wp_super_cache_front_page_clear = 0;
+$wp_super_cache_front_page_check = 0;
+$wp_super_cache_front_page_notification = '0';
+
+$wp_cache_object_cache = 0; //Added by WP-Cache Manager
+$wp_cache_anon_only = 0;
+$wp_supercache_cache_list = 0; //Added by WP-Cache Manager
+$wp_cache_debug_to_file = 0;
+$wp_super_cache_debug = 0;
+$wp_cache_debug_level = 5;
+$wp_cache_debug_ip = '';
+$wp_cache_debug_log = '';
+$wp_cache_debug_email = '';
+$wp_cache_pages[ "search" ] = 0;
+$wp_cache_pages[ "feed" ] = 0;
+$wp_cache_pages[ "category" ] = 0;
+$wp_cache_pages[ "home" ] = 0;
+$wp_cache_pages[ "frontpage" ] = 0;
+$wp_cache_pages[ "tag" ] = 0;
+$wp_cache_pages[ "archives" ] = 0;
+$wp_cache_pages[ "pages" ] = 0;
+$wp_cache_pages[ "single" ] = 0;
+$wp_cache_hide_donation = 1; //Added by WP-Cache Manager
+$wp_cache_not_logged_in = 1; //Added by WP-Cache Manager
+$wp_cache_clear_on_post_edit = 0; //Added by WP-Cache Manager
+$wp_cache_hello_world = 0; //Added by WP-Cache Manager
+$wp_cache_mobile_enabled = 1; //Added by WP-Cache Manager
+$wp_cache_cron_check = 1; //Added by WP-Cache Manager
+?>
--
2.17.1
From f1ca58840399f34c58cc7d3b65f97c12ed884af4 Mon Sep 17 00:00:00 2001
From: Joe <joe@incal.net>
Date: Thu, 8 Dec 2011 10:37:54 +0100
Subject: [PATCH 135/229] enabling the cdn
---
wp-content/wp-cache-config.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/wp-content/wp-cache-config.php b/wp-content/wp-cache-config.php
index 568057e3..00e94306 100644
--- a/wp-content/wp-cache-config.php
+++ b/wp-content/wp-cache-config.php
@@ -5,6 +5,7 @@ WP-Cache Config Sample File
See wp-cache.php for author details.
*/
+$ossdlcdn = 1; //Added by WP-Cache Manager
$wp_cache_mobile_groups = ''; //Added by WP-Cache Manager
$wp_cache_mobile_prefixes = 'w3c , w3c-, acs-, alav, alca, amoi, audi, avan, benq, bird, blac, blaz, brew, cell, cldc, cmd-, dang, doco, eric, hipt, htc_, inno, ipaq, ipod, jigs, kddi, keji, leno, lg-c, lg-d, lg-g, lge-, lg/u, maui, maxo, midp, mits, mmef, mobi, mot-, moto, mwbp, nec-, newt, noki, palm, pana, pant, phil, play, port, prox, qwap, sage, sams, sany, sch-, sec-, send, seri, sgh-, shar, sie-, siem, smal, smar, sony, sph-, symb, t-mo, teli, tim-, tosh, tsm-, upg1, upsi, vk-v, voda, wap-, wapa, wapi, wapp, wapr, webc, winw, winw, xda , xda-'; //Added by WP-Cache Manager
$wp_cache_refresh_single_only = '0'; //Added by WP-Cache Manager
--
2.17.1
From ee30102510bebc417b7c6dc2ddcff6272998827a Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Wed, 14 Nov 2018 22:26:33 -0800
Subject: [PATCH 209/229] updated wp-super-cache config based on the sample
from more recent versions
---
wp-content/advanced-cache.php | 32 +++++++++---
wp-content/wp-cache-config.php | 90 ++++++++++++++++------------------
2 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/wp-content/advanced-cache.php b/wp-content/advanced-cache.php
index f7d5df83..611f57bf 100644
--- a/wp-content/advanced-cache.php
+++ b/wp-content/advanced-cache.php
@@ -1,12 +1,30 @@
<?php
-# WP SUPER CACHE 0.8.9.1
+// WP SUPER CACHE 1.2
function wpcache_broken_message() {
- if ( false == strpos( $_SERVER[ 'REQUEST_URI' ], 'wp-admin' ) )
- echo "<!-- WP Super Cache is installed but broken. The path to wp-cache-phase1.php in wp-content/advanced-cache.php must be fixed! -->";
+ global $wp_cache_config_file;
+ if ( isset( $wp_cache_config_file ) == false ) {
+ return '';
+ }
+
+ $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+ $xmlrpc_request = defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST;
+ $rest_request = defined( 'REST_REQUEST' ) && REST_REQUEST;
+ $robots_request = strpos( $_SERVER['REQUEST_URI'], 'robots.txt' ) != false;
+
+ $skip_output = ( $doing_ajax || $xmlrpc_request || $rest_request || $robots_request );
+ if ( false == strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) && ! $skip_output ) {
+ echo '<!-- WP Super Cache is installed but broken. The constant WPCACHEHOME must be set in the file wp-config.php and point at the WP Super Cache plugin directory. -->';
+ }
}
-if ( !include_once( WP_CONTENT_DIR . '/plugins/wp-super-cache/wp-cache-phase1.php' ) ) {
- if ( !@is_file( WP_CONTENT_DIR . '/plugins/wp-super-cache/wp-cache-phase1.php' ) )
- register_shutdown_function( 'wpcache_broken_message' );
+if ( false == defined( 'WPCACHEHOME' ) ) {
+ define( 'ADVANCEDCACHEPROBLEM', 1 );
+} elseif ( ! include_once WPCACHEHOME . 'wp-cache-phase1.php' ) {
+ if ( ! @is_file( WPCACHEHOME . 'wp-cache-phase1.php' ) ) {
+ define( 'ADVANCEDCACHEPROBLEM', 1 );
+ }
}
-?>
+if ( defined( 'ADVANCEDCACHEPROBLEM' ) ) {
+ register_shutdown_function( 'wpcache_broken_message' );
+}
+
diff --git a/wp-content/wp-cache-config.php b/wp-content/wp-cache-config.php
index 00e94306..0fa40480 100644
--- a/wp-content/wp-cache-config.php
+++ b/wp-content/wp-cache-config.php
@@ -5,59 +5,33 @@ WP-Cache Config Sample File
See wp-cache.php for author details.
*/
-$ossdlcdn = 1; //Added by WP-Cache Manager
-$wp_cache_mobile_groups = ''; //Added by WP-Cache Manager
-$wp_cache_mobile_prefixes = 'w3c , w3c-, acs-, alav, alca, amoi, audi, avan, benq, bird, blac, blaz, brew, cell, cldc, cmd-, dang, doco, eric, hipt, htc_, inno, ipaq, ipod, jigs, kddi, keji, leno, lg-c, lg-d, lg-g, lge-, lg/u, maui, maxo, midp, mits, mmef, mobi, mot-, moto, mwbp, nec-, newt, noki, palm, pana, pant, phil, play, port, prox, qwap, sage, sams, sany, sch-, sec-, send, seri, sgh-, shar, sie-, siem, smal, smar, sony, sph-, symb, t-mo, teli, tim-, tosh, tsm-, upg1, upsi, vk-v, voda, wap-, wapa, wapi, wapp, wapr, webc, winw, winw, xda , xda-'; //Added by WP-Cache Manager
-$wp_cache_refresh_single_only = '0'; //Added by WP-Cache Manager
-$wp_cache_slash_check = 1; //Added by WP-Cache Manager
if ( ! defined('WPCACHEHOME') )
- define( 'WPCACHEHOME', WP_CONTENT_DIR . "/plugins/wp-super-cache/" ); //Added by WP-Cache Manager
+ define( 'WPCACHEHOME', WP_PLUGIN_DIR . '/wp-super-cache/' );
$cache_compression = 0; // Super cache compression
-$cache_enabled = true; //Added by WP-Cache Manager
-$super_cache_enabled = true; //Added by WP-Cache Manager
-$cache_max_time = 1801; //Added by WP-Cache Manager
+$cache_enabled = true;
+$super_cache_enabled = true;
+$cache_max_time = 3600; //in seconds
//$use_flock = true; // Set it true or false if you know what to use
$cache_path = WP_CONTENT_DIR . '/cache/';
$file_prefix = 'wp-cache-';
+$ossdlcdn = 1;
-// We want to be able to identify each blog in a WordPress MU install
-$blogcacheid = '';
-if( defined( 'VHOST' ) ) {
- $blogcacheid = 'blog'; // main blog
- if( constant( 'VHOST' ) == 'yes' ) {
- $blogcacheid = $_SERVER['HTTP_HOST'];
- } else {
- $request_uri = preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', str_replace( '..', '', $_SERVER['REQUEST_URI'] ) );
- if( strpos( $request_uri, '/', 1 ) ) {
- if( $base == '/' ) {
- $blogcacheid = substr( $request_uri, 1, strpos( $request_uri, '/', 1 ) - 1 );
- } else {
- $blogcacheid = str_replace( $base, '', $request_uri );
- $blogcacheid = substr( $blogcacheid, 0, strpos( $blogcacheid, '/', 1 ) );
- }
- if ( '/' == substr($blogcacheid, -1))
- $blogcacheid = substr($blogcacheid, 0, -1);
- }
- $blogcacheid = str_replace( '/', '', $blogcacheid );
- }
-}
-
-// Array of files that have 'wp-' but should still be cached
+// Array of files that have 'wp-' but should still be cached
$cache_acceptable_files = array( 'wp-comments-popup.php', 'wp-links-opml.php', 'wp-locations.php' );
$cache_rejected_uri = array('wp-.*\\.php', 'index\\.php');
$cache_rejected_user_agent = array ( 0 => 'bot', 1 => 'ia_archive', 2 => 'slurp', 3 => 'crawl', 4 => 'spider', 5 => 'Yandex' );
-$cache_rebuild_files = 1; //Added by WP-Cache Manager
+$cache_rebuild_files = 1;
// Disable the file locking system.
// If you are experiencing problems with clearing or creating cache files
// uncommenting this may help.
-$wp_cache_mutex_disabled = 1; //Added by WP-Cache Manager
+$wp_cache_mutex_disabled = 1;
// Just modify it if you have conflicts with semaphores
-$sem_id = 942817292; //Added by WP-Cache Manager
+$sem_id = 942817292;
if ( '/' != substr($cache_path, -1)) {
$cache_path .= '/';
@@ -65,14 +39,12 @@ if ( '/' != substr($cache_path, -1)) {
$wp_cache_mobile = 0;
$wp_cache_mobile_whitelist = 'Stand Alone/QNws';
-$wp_cache_mobile_browsers = '2.0 MMP, 240x320, 400X240, AvantGo, BlackBerry, Blazer, Cellphone, Danger, DoCoMo, Elaine/3.0, EudoraWeb, Googlebot-Mobile, hiptop, IEMobile, KYOCERA/WX310K, LG/U990, MIDP-2., MMEF20, MOT-V, NetFront, Newt, Nintendo Wii, Nitro, Nokia, Opera Mini, Palm, PlayStation Portable, portalmmm, Proxinet, ProxiNet, SHARP-TQ-GX10, SHG-i900, Small, SonyEricsson, Symbian OS, SymbianOS, TS21i-10, UP.Browser, UP.Link, webOS, Windows CE, WinWAP, YahooSeeker/M1A1-R2D2, iPhone, iPod, Android, BlackBerry9530, LG-TU915 Obigo, LGE VX, webOS, Nokia5800'; //Added by WP-Cache Manager
+$wp_cache_mobile_browsers = 'Android, 2.0 MMP, 240x320, AvantGo, BlackBerry, Blazer, Cellphone, Danger, DoCoMo, Elaine/3.0, EudoraWeb, hiptop, IEMobile, iPhone, iPod, KYOCERA/WX310K, LG/U990, MIDP-2.0, MMEF20, MOT-V, NetFront, Newt, Nintendo Wii, Nitro, Nokia, Opera Mini, Palm, Playstation Portable, portalmmm, Proxinet, ProxiNet, SHARP-TQ-GX10, Small, SonyEricsson, Symbian OS, SymbianOS, TS21i-10, UP.Browser, UP.Link, Windows CE, WinWAP';
-// gzip the first page generated for clients that support it.
-$wp_cache_gzip_first = 0;
// change to relocate the supercache plugins directory
$wp_cache_plugins_dir = WPCACHEHOME . 'plugins';
// set to 1 to do garbage collection during normal process shutdown instead of wp-cron
-$wp_cache_shutdown_gc = 0;
+$wp_cache_shutdown_gc = 0;
$wp_super_cache_late_init = 0;
// uncomment the next line to enable advanced debugging features
@@ -82,9 +54,9 @@ $wp_super_cache_front_page_clear = 0;
$wp_super_cache_front_page_check = 0;
$wp_super_cache_front_page_notification = '0';
-$wp_cache_object_cache = 0; //Added by WP-Cache Manager
+$wp_cache_object_cache = 0;
$wp_cache_anon_only = 0;
-$wp_supercache_cache_list = 0; //Added by WP-Cache Manager
+$wp_supercache_cache_list = 0;
$wp_cache_debug_to_file = 0;
$wp_super_cache_debug = 0;
$wp_cache_debug_level = 5;
@@ -100,10 +72,34 @@ $wp_cache_pages[ "tag" ] = 0;
$wp_cache_pages[ "archives" ] = 0;
$wp_cache_pages[ "pages" ] = 0;
$wp_cache_pages[ "single" ] = 0;
-$wp_cache_hide_donation = 1; //Added by WP-Cache Manager
-$wp_cache_not_logged_in = 1; //Added by WP-Cache Manager
-$wp_cache_clear_on_post_edit = 0; //Added by WP-Cache Manager
-$wp_cache_hello_world = 0; //Added by WP-Cache Manager
-$wp_cache_mobile_enabled = 1; //Added by WP-Cache Manager
-$wp_cache_cron_check = 1; //Added by WP-Cache Manager
+$wp_cache_pages[ "author" ] = 0;
+$wp_cache_hide_donation = 1;
+$wp_cache_not_logged_in = 1;
+$wp_cache_clear_on_post_edit = 0;
+$wp_cache_hello_world = 0;
+$wp_cache_mobile_enabled = 1;
+$wp_cache_cron_check = 0;
+$wp_cache_mfunc_enabled = 0;
+$wp_cache_make_known_anon = 0;
+$wp_cache_refresh_single_only = 0;
+$wp_cache_mod_rewrite = 0;
+$wp_supercache_304 = 0;
+$wp_cache_front_page_checks = 0;
+$wp_cache_disable_utf8 = 0;
+$wp_cache_no_cache_for_get = 0;
+$cache_scheduled_time = "00:00";
+$wp_cache_preload_interval = 600;
+$cache_schedule_type = 'interval';
+$wp_cache_preload_posts = 0;
+$wp_cache_preload_on = 0;
+$wp_cache_preload_taxonomies = 0;
+$wp_cache_preload_email_me = 0;
+$wp_cache_preload_email_volume = 'none';
+$wp_cache_mobile_prefixes = '';
+$cached_direct_pages = array();
+$wpsc_served_header = false;
+$cache_gc_email_me = 0;
+$wpsc_save_headers = 0;
+$cache_schedule_interval = 'daily';
+$wp_super_cache_comments = 1;
?>
--
2.17.1
From c6f4848e85679ff9e4ad635d20a5647a4513dfe0 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Sun, 9 Dec 2018 12:54:14 -0800
Subject: [PATCH 211/229] moved wp-cache home config to the right place (in
wp-config.php)
---
wp-content/wp-cache-config.php | 3 ---
1 file changed, 3 deletions(-)
diff --git a/wp-content/wp-cache-config.php b/wp-content/wp-cache-config.php
index 0fa40480..4413bd25 100644
--- a/wp-content/wp-cache-config.php
+++ b/wp-content/wp-cache-config.php
@@ -5,9 +5,6 @@ WP-Cache Config Sample File
See wp-cache.php for author details.
*/
-if ( ! defined('WPCACHEHOME') )
- define( 'WPCACHEHOME', WP_PLUGIN_DIR . '/wp-super-cache/' );
-
$cache_compression = 0; // Super cache compression
$cache_enabled = true;
$super_cache_enabled = true;
--
2.17.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment