Issue #1746

yatsukhnenko · yatsukhnenko · commit 0879770a82c3 · 2022-04-05T22:56:25.000+03:00
diff --git a/library.c b/library.c
@@ -2527,8 +2527,9 @@ redis_sock_disconnect(RedisSock *redis_sock, int force)
             if (INI_INT("redis.pconnect.pooling_enabled")) {
                 p = redis_sock_get_connection_pool(redis_sock);
             }
-            if (force) {
+            if (force || !IS_ATOMIC(redis_sock)) {
                 php_stream_pclose(redis_sock->stream);
+                free_reply_callbacks(redis_sock);
                 if (p) p->nb_active--;
             } else if (p) {
                 zend_llist_prepend_element(&p->list, &redis_sock->stream);
@@ -2876,6 +2877,19 @@ redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz)
     return -1;
 }
 
+void
+free_reply_callbacks(RedisSock *redis_sock)
+{
+    fold_item *fi;
+
+    while (redis_sock->head != NULL) {
+        fi = redis_sock->head->next;
+        free(redis_sock->head);
+        redis_sock->head = fi;
+    }
+    redis_sock->current = NULL;
+}
+
 /**
  * redis_free_socket
  */
@@ -2897,6 +2911,7 @@ PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock)
         zend_string_release(redis_sock->host);
     }
     redis_sock_free_auth(redis_sock);
+    free_reply_callbacks(redis_sock);
     efree(redis_sock);
 }
 
diff --git a/library.h b/library.h
@@ -37,6 +37,7 @@
 
 
 void redis_register_persistent_resource(zend_string *id, void *ptr, int le_id);
+void free_reply_callbacks(RedisSock *redis_sock);
 
 PHP_REDIS_API int redis_extract_auth_info(zval *ztest, zend_string **user, zend_string **pass);
 
diff --git a/redis.c b/redis.c
@@ -188,20 +188,6 @@ redis_send_discard(RedisSock *redis_sock)
     return result;
 }
 
-static void
-free_reply_callbacks(RedisSock *redis_sock)
-{
-    fold_item *fi;
-
-    for (fi = redis_sock->head; fi; ) {
-        fold_item *fi_next = fi->next;
-        free(fi);
-        fi = fi_next;
-    }
-    redis_sock->head = NULL;
-    redis_sock->current = NULL;
-}
-
 /* Passthru for destroying cluster cache */
 static void cluster_cache_dtor(zend_resource *rsrc) {
     if (rsrc->ptr) {
@@ -2228,7 +2214,6 @@ PHP_METHOD(Redis, multi)
 
         /* Enable PIPELINE if we're not already in one */
         if (IS_ATOMIC(redis_sock)) {
-            free_reply_callbacks(redis_sock);
             REDIS_ENABLE_MODE(redis_sock, PIPELINE);
         }
     } else if (multi_value == MULTI) {
@@ -2467,7 +2452,6 @@ PHP_METHOD(Redis, pipeline)
         /* NB : we keep the function fold, to detect the last function.
          * We need the response format of the n - 1 command. So, we can delete
          * when n > 2, the { 1 .. n - 2} commands */
-        free_reply_callbacks(redis_sock);
         REDIS_ENABLE_MODE(redis_sock, PIPELINE);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`
`38`	`38`
`39`	`39`	`void redis_register_persistent_resource(zend_string id, void ptr, int le_id);`
	`40`	`+void free_reply_callbacks(RedisSock *redis_sock);`
`40`	`41`
`41`	`42`	`PHP_REDIS_API int redis_extract_auth_info(zval ztest, zend_string user, zend_string *pass);`
`42`	`43`