send uncompress value and proper set compressed flags when errors

Author: dictcp

php_memcached.c

@@ -107,10 +107,10 @@ int php_memc_list_entry(void)
 #define MEMC_VAL_COMPRESSION_ZLIB    (1<<1)
 #define MEMC_VAL_COMPRESSION_FASTLZ  (1<<2)
 
-#define MEMC_VAL_GET_FLAGS(internal_flags)               ((internal_flags & MEMC_MASK_INTERNAL) >> 4)
-#define MEMC_VAL_SET_FLAG(internal_flags, internal_flag) ((internal_flags) |= ((internal_flag << 4) & MEMC_MASK_INTERNAL))
-#define MEMC_VAL_HAS_FLAG(internal_flags, internal_flag) ((MEMC_VAL_GET_FLAGS(internal_flags) & internal_flag) == internal_flag)
-#define MEMC_VAL_DEL_FLAG(internal_flags, internal_flag) internal_flags &= ~((internal_flag << 4) & MEMC_MASK_INTERNAL)
+#define MEMC_VAL_GET_FLAGS(internal_flags)               (((internal_flags) & MEMC_MASK_INTERNAL) >> 4)
+#define MEMC_VAL_SET_FLAG(internal_flags, internal_flag) ((internal_flags) |= (((internal_flag) << 4) & MEMC_MASK_INTERNAL))
+#define MEMC_VAL_HAS_FLAG(internal_flags, internal_flag) ((MEMC_VAL_GET_FLAGS(internal_flags) & (internal_flag)) == (internal_flag))
+#define MEMC_VAL_DEL_FLAG(internal_flags, internal_flag) (internal_flags &= (~(((internal_flag) << 4) & MEMC_MASK_INTERNAL)))
 
 /****************************************
   User-defined flags
@@ -822,7 +822,7 @@ zend_bool s_compress_value (php_memc_compression_type compression_type, zend_str
 
 			if (compressed_size > 0) {
 				compress_status = 1;
-				MEMC_VAL_SET_FLAG(*flags, MEMC_VAL_COMPRESSION_FASTLZ);
+				MEMC_VAL_SET_FLAG(*flags, MEMC_VAL_COMPRESSED | MEMC_VAL_COMPRESSION_FASTLZ);
 			}
 		}
 			break;
@@ -834,7 +834,7 @@ zend_bool s_compress_value (php_memc_compression_type compression_type, zend_str
 
 			if (status == Z_OK) {
 				compress_status = 1;
-				MEMC_VAL_SET_FLAG(*flags, MEMC_VAL_COMPRESSION_ZLIB);
+				MEMC_VAL_SET_FLAG(*flags, MEMC_VAL_COMPRESSED | MEMC_VAL_COMPRESSION_ZLIB);
 			}
 		}
 			break;
@@ -846,14 +846,14 @@ zend_bool s_compress_value (php_memc_compression_type compression_type, zend_str
 
 	if (!compress_status) {
 		php_error_docref(NULL, E_WARNING, "could not compress value");
-		MEMC_VAL_DEL_FLAG(*flags, MEMC_VAL_COMPRESSED);
+		MEMC_VAL_DEL_FLAG(*flags, MEMC_VAL_COMPRESSED | MEMC_VAL_COMPRESSION_FASTLZ | MEMC_VAL_COMPRESSION_ZLIB);
 		efree (buffer);
 		return 0;
 	}
 
 	/* This means the value was too small to be compressed, still a success */
 	if (payload->len < (compressed_size * MEMC_G(compression_factor))) {
-		MEMC_VAL_DEL_FLAG(*flags, MEMC_VAL_COMPRESSED);
+		MEMC_VAL_DEL_FLAG(*flags, MEMC_VAL_COMPRESSED | MEMC_VAL_COMPRESSION_FASTLZ | MEMC_VAL_COMPRESSION_ZLIB);
 		efree (buffer);
 		return 1;
 	}
@@ -1017,12 +1017,7 @@ zend_string *s_zval_to_payload(php_memc_object_t *intern, zval *value, uint32_t
 
 	/* If we have compression flag, compress the value */
 	if (should_compress) {
-		/* status */
-		if (!s_compress_value (memc_user_data->compression_type, &payload, flags)) {
-			zend_string_release(payload);
-			return NULL;
-		}
-		MEMC_VAL_SET_FLAG(*flags, MEMC_VAL_COMPRESSED);
+		s_compress_value (memc_user_data->compression_type, &payload, flags);
 	}
 
 	if (memc_user_data->set_udf_flags >= 0) {