Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix syntax and assign new $database because of igbinary_serialize #778

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Fix syntax and assign new $database because of igbinary_serialize #778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb07f65
Fix syntax
EarthlingDavey Nov 7, 2024
8b42224
Use fresh database because of igbinary
EarthlingDavey Nov 7, 2024
fa1b5ba
Merge branch 'main' into fix-syntax
EarthlingDavey Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/app/object-cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// ^ When using Relay, we need to prefix a scheme to `$_SERVER['CACHE_HOST']`
if ( WP_REDIS_USE_RELAY && !empty($_SERVER['CACHE_HOST']) ) {
// Prefix scheme to the host, default to tls.
$_SERVER['CACHE_HOST'] = ($_SERVER['CACHE_SCHEME'] ?: 'tls') . '://' . $_SERVER['CACHE_HOST'];
$_SERVER['CACHE_HOST'] = ($_SERVER['CACHE_SCHEME'] ?? 'tls') . '://' . $_SERVER['CACHE_HOST'];
}

if ( ! defined( 'WP_CACHE_KEY_SALT' ) ) {
Expand Down Expand Up @@ -1271,7 +1271,7 @@ public function build_client_parameters( $redis_server ) {
$port = 6379;
// Default Redis database number.
// ^ Prevent a conflict where data from a previous class is still present in the cluster.
$database = WP_REDIS_USE_RELAY ? 0 : 1;
$database = WP_REDIS_USE_RELAY ? 2 : 1;
// *
// Default timeout in ms.
// I multiplied this by 1000 so we'd have a common measure of ms instead of s and ms, need to make sure this gets divided by 1000.
Expand Down
Loading