Updates to fix rebase issues

Author: michael-grunder

library.c

@@ -130,28 +130,6 @@ static void redis_error_throw(char *err, size_t err_len TSRMLS_DC) {
     }
 }
 
-PHPAPI void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
-    if (!redis_sock->persistent) {
-        php_stream_close(redis_sock->stream);
-    } else {
-        php_stream_pclose(redis_sock->stream);
-    }
-
-    efree(cmd);
-
-    if ((response = redis_sock_read(redis_sock, &response_len TSRMLS_CC)) == NULL) {
-        return -1;
-    }
-
-    if (strncmp(response, "+OK", 3)) {
-        efree(response);
-        return -1;
-    }
-
-    efree(response);
-    return 0;
-}
-
 PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
 	if (!redis_sock->persistent) {
 		php_stream_close(redis_sock->stream);
@@ -160,7 +138,7 @@ PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
 	}
 }
 
-PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
+PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock, int no_throw TSRMLS_DC)
 {
     int eof;
     int count = 0;
@@ -1406,14 +1384,6 @@ PHPAPI int redis_mbulk_reply_zipped_vals(INTERNAL_FUNCTION_PARAMETERS, RedisSock
         z_tab, UNSERIALIZE_VALS, SCORE_DECODE_NONE);
 }
 
-PHPAPI void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, 
-                             RedisSock *redis_sock, zval *z_tab, void *ctx) 
-{
-    return redis_mbulk_reply_zipped(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
-        z_tab, UNSERIALIZE_VALS, SCORE_DECODE_NONE);
-}
-
-
 PHPAPI void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, 
                              RedisSock *redis_sock, zval *z_tab, void *ctx)
 {
@@ -1875,7 +1845,7 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS,
 PHPAPI int redis_mbulk_reply_raw(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx)
 {
     char inbuf[1024];
-    int numElems;
+    int numElems, err_len;
     zval *z_multi_result;
 
     if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
@@ -1953,7 +1923,6 @@ redis_mbulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         count--;
     }
 }
-*/
 
 /* Specialized multibulk processing for HMGET where we need to pair requested
  * keys with their returned values */

library.h

@@ -63,22 +63,13 @@ PHP_REDIS_API int
 redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC);
 PHP_REDIS_API int
 redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len);
-
 PHP_REDIS_API int
 redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC);
 
-PHP_REDIS_API int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC);
-PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
-PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock TSRMLS_DC);
-/* PHP_REDIS_API int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC); */
 PHP_REDIS_API void redis_free_socket(RedisSock *redis_sock);
 PHP_REDIS_API void redis_send_discard(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock);
 PHP_REDIS_API int redis_sock_set_err(RedisSock *redis_sock, const char *msg, int msg_len);
 
-PHP_REDIS_API int redis_serialize(int serializer, zval *z, char **val, int *val_len TSRMLS_DC);
-PHP_REDIS_API int redis_unserialize(int serializer, const char *val, int val_len, zval **return_value TSRMLS_DC);
-PHP_REDIS_API int redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC);
-
 
 /*
 * Variant Read methods, mostly to implement eval

redis.c

@@ -266,7 +266,6 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, _unserialize, NULL, ZEND_ACC_PUBLIC)
 
      PHP_ME(Redis, client, NULL, ZEND_ACC_PUBLIC)
-     PHP_ME(Redis, rawcommand, NULL, ZEND_ACC_PUBLIC)
 
      /* SCAN and friends */
      PHP_ME(Redis, scan, arginfo_scan, ZEND_ACC_PUBLIC)
@@ -290,7 +289,7 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, slowlog, NULL, ZEND_ACC_PUBLIC)
 
      /* Send a raw command and read raw results */
-     PHP_ME(Redis, rawCommand, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(Redis, rawcommand, NULL, ZEND_ACC_PUBLIC)
 
      /* introspection */
      PHP_ME(Redis, getHost, NULL, ZEND_ACC_PUBLIC)
@@ -3336,12 +3335,20 @@ PHP_METHOD(Redis, script) {
 PHP_METHOD(Redis, dump) {
     REDIS_PROCESS_KW_CMD("DUMP", redis_key_cmd, redis_ping_response);
 }
+/* }}} */
 
 /* {{{ proto Redis::restore(ttl, key, value) */
 PHP_METHOD(Redis, restore) {
     REDIS_PROCESS_KW_CMD("RESTORE", redis_key_long_val_cmd, 
         redis_boolean_response);
 }
+/* }}} */
+
+/* {{{ proto Redis::debug(string key) */
+PHP_METHOD(Redis, debug) {
+    REDIS_PROCESS_KW_CMD("DEBUG", redis_key_cmd, redis_string_response);
+}
+/* }}} */
 
 /* {{{ proto Redis::migrate(host port key dest-db timeout [bool copy, 
  *                          bool replace]) */
@@ -3483,7 +3490,13 @@ PHP_METHOD(Redis, clearLastError) {
         RETURN_FALSE;
     }
 
-    RETVAL_LONG(redis_sock->mode);
+    /* Clear error message if we have one */
+    if (redis_sock->err) {
+        efree(redis_sock->err);
+        redis_sock->err = NULL;
+    }
+
+    RETURN_TRUE;
 }
 
 /*

redis_array_impl.c

@@ -567,7 +567,6 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
 	zval *z_keys, **z_entry_pp;
 	HashPosition pos;
 	MAKE_STD_ZVAL(z_keys);
-    HashPosition pos;
 #if PHP_VERSION_ID > 50300
 	array_init_size(z_keys, zend_hash_num_elements(Z_ARRVAL_P(z_pairs)));
 #else