Merge branch 'master' of git.php.net:php-src

# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff

1 files changed, 4 insertions, 6 deletions

diff --git a/ext/zip/lib/zip_source_buffer.c b/ext/zip/lib/zip_source_buffer.c
index 8c9154ce3c..8a13e7602d 100644
--- a/ext/zip/lib/zip_source_buffer.c
+++ b/ext/zip/lib/zip_source_buffer.c
@@ -48,7 +48,7 @@ static zip_int64_t read_data(void *, void *, zip_uint64_t, enum zip_source_cmd);
 
 
 
-ZIP_EXTERN(struct zip_source *)
+ZIP_EXTERN struct zip_source *
 zip_source_buffer(struct zip *za, const void *data, zip_uint64_t len, int freep)
 {
     struct read_data *f;
@@ -98,9 +98,7 @@ read_data(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd)
 	return 0;
 	
     case ZIP_SOURCE_READ:
-	/* XXX: return error if (len > ZIP_INT64_MAX) */
-
-	n = z->end - z->buf;
+	n = (zip_uint64_t)(z->end - z->buf);
 	if (n > len)
 	    n = len;
 
@@ -109,7 +107,7 @@ read_data(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd)
 	    z->buf += n;
 	}
 
-	return n;
+	return (zip_int64_t)n;
 	
     case ZIP_SOURCE_CLOSE:
 	return 0;
@@ -125,7 +123,7 @@ read_data(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd)
 
 	    zip_stat_init(st);
 	    st->mtime = z->mtime;
-	    st->size = z->end - z->data;
+	    st->size = (zip_uint64_t)(z->end - z->data);
 	    st->comp_size = st->size;
 	    st->comp_method = ZIP_CM_STORE;
 	    st->encryption_method = ZIP_EM_NONE;