update to 9.0.0-rc3

hiredis replaced by libvalkey

1 files changed, 41 insertions, 27 deletions

diff --git a/valkey-loadmod.patch b/valkey-loadmod.patch
index 3341863..dad9cb9 100644
--- a/valkey-loadmod.patch
+++ b/valkey-loadmod.patch
@@ -1,19 +1,31 @@
-Adapted for 8.1.4 from
-https://github.com/valkey-io/valkey/pull/2689
+From b40ab88996d0bbe9bdd366af9426f7400b21e19c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Sat, 4 Oct 2025 07:23:52 +0200
+Subject: [PATCH] Fix #2678 don't add loadmodule when from config
 
-diff -up ./src/config.c.loadmod ./src/config.c
---- ./src/config.c.loadmod	2025-10-03 21:17:43.000000000 +0200
-+++ ./src/config.c	2025-10-06 03:06:41.774448336 +0200
-@@ -438,6 +438,8 @@ static int updateClientOutputBufferLimit
+only protect loadmodule from include files
+
+Signed-off-by: Remi Collet <remi@remirepo.net>
+---
+ src/config.c |  8 ++++++--
+ src/module.c | 17 ++++++++++++-----
+ src/module.h |  4 ++--
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index d0158b2c4d..ab453056df 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -448,6 +448,8 @@ static int updateClientOutputBufferLimit(sds *args, int arg_len, const char **er
   * within conf file parsing. This is only needed to support the deprecated
   * abnormal aggregate `save T C` functionality. Remove in the future. */
  static int reading_config_file;
 +/* support detecting include vs main config file */
 +static int reading_include_file = 0;
  
- void loadServerConfigFromString(char *config) {
+ void loadServerConfigFromString(sds config) {
      deprecatedConfig deprecated_configs[] = {
-@@ -529,7 +531,9 @@ void loadServerConfigFromString(char *co
+@@ -539,7 +541,9 @@ void loadServerConfigFromString(sds config) {
  
          /* Execute config directives */
          if (!strcasecmp(argv[0], "include") && argc == 2) {
@@ -23,7 +35,7 @@ diff -up ./src/config.c.loadmod ./src/config.c
          } else if (!strcasecmp(argv[0], "rename-command") && argc == 3) {
              struct serverCommand *cmd = lookupCommandBySds(argv[1]);
  
-@@ -562,7 +566,7 @@ void loadServerConfigFromString(char *co
+@@ -572,7 +576,7 @@ void loadServerConfigFromString(sds config) {
                  goto loaderr;
              }
          } else if (!strcasecmp(argv[0], "loadmodule") && argc >= 2) {
@@ -32,7 +44,7 @@ diff -up ./src/config.c.loadmod ./src/config.c
          } else if (strchr(argv[0], '.')) {
              if (argc < 2) {
                  err = "Module config specified without value";
-@@ -1579,7 +1583,7 @@ void rewriteConfigLoadmoduleOption(struc
+@@ -1605,7 +1609,7 @@ void rewriteConfigLoadmoduleOption(struct rewriteConfigState *state) {
      while ((de = dictNext(di)) != NULL) {
          struct ValkeyModule *module = dictGetVal(de);
          line = moduleLoadQueueEntryToLoadmoduleOptionStr(module, "loadmodule");
@@ -41,10 +53,11 @@ diff -up ./src/config.c.loadmod ./src/config.c
      }
      dictReleaseIterator(di);
      /* Mark "loadmodule" as processed in case modules is empty. */
-diff -up ./src/module.c.loadmod ./src/module.c
---- ./src/module.c.loadmod	2025-10-03 21:17:43.000000000 +0200
-+++ ./src/module.c	2025-10-06 03:05:36.498290506 +0200
-@@ -83,6 +83,7 @@
+diff --git a/src/module.c b/src/module.c
+index e5afa952fa..f18bc3c6bf 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -84,6 +84,7 @@
  
  struct moduleLoadQueueEntry {
      sds path;
@@ -52,7 +65,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      int argc;
      robj **argv;
  };
-@@ -669,7 +670,7 @@ void freeClientModuleData(client *c) {
+@@ -670,7 +671,7 @@ void freeClientModuleData(client *c) {
      c->module_data = NULL;
  }
  
@@ -61,7 +74,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      int i;
      struct moduleLoadQueueEntry *loadmod;
  
-@@ -677,6 +678,7 @@ void moduleEnqueueLoadModule(sds path, s
+@@ -678,6 +679,7 @@ void moduleEnqueueLoadModule(sds path, sds *argv, int argc) {
      loadmod->argv = argc ? zmalloc(sizeof(robj *) * argc) : NULL;
      loadmod->path = sdsnew(path);
      loadmod->argc = argc;
@@ -69,7 +82,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      for (i = 0; i < argc; i++) {
          loadmod->argv[i] = createRawStringObject(argv[i], sdslen(argv[i]));
      }
-@@ -687,6 +689,10 @@ sds moduleLoadQueueEntryToLoadmoduleOpti
+@@ -688,6 +690,10 @@ sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module,
                                                const char *config_option_str) {
      sds line;
  
@@ -80,7 +93,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      line = sdsnew(config_option_str);
      line = sdscatlen(line, " ", 1);
      line = sdscatsds(line, module->loadmod->path);
-@@ -12188,7 +12194,7 @@ void moduleLoadFromQueue(void) {
+@@ -12350,7 +12356,7 @@ void moduleLoadFromQueue(void) {
      listRewind(server.loadmodule_queue, &li);
      while ((ln = listNext(&li))) {
          struct moduleLoadQueueEntry *loadmod = ln->value;
@@ -89,7 +102,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
              serverLog(LL_WARNING, "Can't load module from %s: server aborting", loadmod->path);
              exit(1);
          }
-@@ -12369,7 +12375,7 @@ void moduleUnregisterCleanup(ValkeyModul
+@@ -12531,7 +12537,7 @@ void moduleUnregisterCleanup(ValkeyModule *module) {
  
  /* Load a module and initialize it. On success C_OK is returned, otherwise
   * C_ERR is returned. */
@@ -98,7 +111,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      int (*onload)(void *, void **, int);
      void *handle;
  
-@@ -12444,6 +12450,7 @@ int moduleLoad(const char *path, void **
+@@ -12606,6 +12612,7 @@ int moduleLoad(const char *path, void **module_argv, int module_argc, int is_loa
      ctx.module->loadmod->path = sdsnew(path);
      ctx.module->loadmod->argv = module_argc ? zmalloc(sizeof(robj *) * module_argc) : NULL;
      ctx.module->loadmod->argc = module_argc;
@@ -106,7 +119,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
      for (int i = 0; i < module_argc; i++) {
          ctx.module->loadmod->argv[i] = module_argv[i];
          incrRefCount(ctx.module->loadmod->argv[i]);
-@@ -13361,7 +13368,7 @@ void moduleCommand(client *c) {
+@@ -13529,7 +13536,7 @@ void moduleCommand(client *c) {
              argv = &c->argv[3];
          }
  
@@ -115,7 +128,7 @@ diff -up ./src/module.c.loadmod ./src/module.c
              addReply(c, shared.ok);
          else
              addReplyError(c, "Error loading the extension. Please check the server logs.");
-@@ -13376,7 +13383,7 @@ void moduleCommand(client *c) {
+@@ -13544,7 +13551,7 @@ void moduleCommand(client *c) {
          /* If this is a loadex command we want to populate server.module_configs_queue with
           * sds NAME VALUE pairs. We also want to increment argv to just after ARGS, if supplied. */
          if (parseLoadexArguments((ValkeyModuleString ***)&argv, &argc) == VALKEYMODULE_OK &&
@@ -124,10 +137,11 @@ diff -up ./src/module.c.loadmod ./src/module.c
              addReply(c, shared.ok);
          else {
              dictEmpty(server.module_configs_queue, NULL);
-diff -up ./src/module.h.loadmod ./src/module.h
---- ./src/module.h.loadmod	2025-10-03 21:17:43.000000000 +0200
-+++ ./src/module.h	2025-10-06 03:05:36.498698194 +0200
-@@ -169,7 +169,7 @@ static inline void moduleInitDigestConte
+diff --git a/src/module.h b/src/module.h
+index f6c266b592..1f9e729e56 100644
+--- a/src/module.h
++++ b/src/module.h
+@@ -169,7 +169,7 @@ static inline void moduleInitDigestContext(ValkeyModuleDigest *mdvar) {
      memset(mdvar->x, 0, sizeof(mdvar->x));
  }
  
@@ -136,7 +150,7 @@ diff -up ./src/module.h.loadmod ./src/module.h
  sds moduleLoadQueueEntryToLoadmoduleOptionStr(ValkeyModule *module,
                                                const char *config_option_str);
  ValkeyModuleCtx *moduleAllocateContext(void);
-@@ -180,7 +180,7 @@ void moduleFreeContext(ValkeyModuleCtx *
+@@ -180,7 +180,7 @@ void moduleFreeContext(ValkeyModuleCtx *ctx);
  void moduleInitModulesSystem(void);
  void moduleInitModulesSystemLast(void);
  void modulesCron(void);