Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  remove set but not used variables

Author: smalyshev

ext/zlib/zlib_filter.c

@@ -62,20 +62,16 @@ static php_stream_filter_status_t php_zlib_inflate_filter(
 {
 	php_zlib_filter_data *data;
 	php_stream_bucket *bucket;
-	size_t consumed = 0, original_out, original_in;
+	size_t consumed = 0;
 	int status;
 	php_stream_filter_status_t exit_status = PSFS_FEED_ME;
-	z_stream *streamp;
 
 	if (!thisfilter || !thisfilter->abstract) {
 		/* Should never happen */
 		return PSFS_ERR_FATAL;
 	}
 
 	data = (php_zlib_filter_data *)(thisfilter->abstract);
-	streamp = &(data->strm);
-	original_in = data->strm.total_in;
-	original_out = data->strm.total_out;
 
 	while (buckets_in->head) {
 		size_t bin = 0, desired;
@@ -191,20 +187,16 @@ static php_stream_filter_status_t php_zlib_deflate_filter(
 {
 	php_zlib_filter_data *data;
 	php_stream_bucket *bucket;
-	size_t consumed = 0, original_out, original_in;
+	size_t consumed = 0;
 	int status;
 	php_stream_filter_status_t exit_status = PSFS_FEED_ME;
-	z_stream *streamp;
 
 	if (!thisfilter || !thisfilter->abstract) {
 		/* Should never happen */
 		return PSFS_ERR_FATAL;
 	}
 
 	data = (php_zlib_filter_data *)(thisfilter->abstract);
-	streamp = &(data->strm);
-	original_in = data->strm.total_in;
-	original_out = data->strm.total_out;
 
 	while (buckets_in->head) {
 		size_t bin = 0, desired;