Small changes to CONFIG contribution.

Code cleanup, removed serialize and key prefix, added extra checks.
Now returning an associative array on GET, bool on SET.

Author: nicolasff

redis.c

@@ -5271,47 +5271,55 @@ PHP_METHOD(Redis, setOption) {
 }
 /* }}} */
 
-/* {{{ proto boolean Redis::config(string operation, string key [, mixed value])
+/* {{{ proto boolean Redis::config(string op, string key [, mixed value])
  */
 PHP_METHOD(Redis, config)
 {
     zval *object;
     RedisSock *redis_sock;
-    char *key = NULL, *val = NULL, *cmd, *operation = NULL;
-    int key_len, val_len, cmd_len, operation_len;
-    int val_free = 0, key_free = 0;
-    zval *z_value = NULL;
-    long expire = -1;
+    char *key = NULL, *val = NULL, *cmd, *op = NULL;
+    int key_len, val_len, cmd_len, op_len;
+	enum {CFG_GET, CFG_SET} mode;
 
-    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss|z",
-                                     &object, redis_ce, &operation, &operation_len, &key, &key_len,
-                                     &z_value) == FAILURE) {
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss|s",
+                                     &object, redis_ce, &op, &op_len, &key, &key_len,
+                                     &val, &val_len) == FAILURE) {
         RETURN_FALSE;
     }
 
+	/* op must be GET or SET */
+	if(strncasecmp(op, "GET", 3) == 0) {
+		mode = CFG_GET;
+	} else if(strncasecmp(op, "SET", 3) == 0) {
+		mode = CFG_SET;
+	} else {
+		RETURN_FALSE;
+	}
+
     if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) {
         RETURN_FALSE;
     }
 
-    key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC);
-
-    if (z_value == NULL) {  
-        cmd_len = redis_cmd_format_static(&cmd, "CONFIG", "ss", operation, operation_len, key, key_len);
-    }
-    else {
-        val_free = redis_serialize(redis_sock, z_value, &val, &val_len TSRMLS_CC);
-        cmd_len = redis_cmd_format_static(&cmd, "CONFIG", "sss", operation, operation_len, key, key_len, val, val_len);
-        if(val_free) efree(val);
-    }
+    if (mode == CFG_GET && val == NULL) {
+        cmd_len = redis_cmd_format_static(&cmd, "CONFIG", "ss", op, op_len, key, key_len);
 
-    if(key_free) efree(key);
+		REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len)
+		IF_ATOMIC() {
+			redis_sock_read_multibulk_reply_zipped_strings(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+		}
+		REDIS_PROCESS_RESPONSE(redis_sock_read_multibulk_reply_zipped_strings);
 
-    REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len)
+    } else if(mode == CFG_SET && val != NULL) {
+        cmd_len = redis_cmd_format_static(&cmd, "CONFIG", "sss", op, op_len, key, key_len, val, val_len);
 
-    IF_ATOMIC() {
-        redis_boolean_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
-    }
-    REDIS_PROCESS_RESPONSE(redis_boolean_response);
+		REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len)
+		IF_ATOMIC() {
+			redis_boolean_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+		}
+		REDIS_PROCESS_RESPONSE(redis_boolean_response);
+    } else {
+		RETURN_FALSE;
+	}
 }
 /* }}} */