Merge branch 'PHP-7.0' into PHP-7.1

smalyshev · smalyshev · commit 09885f78c6c1 · 2018-12-01T21:48:35.000-08:00
* PHP-7.0:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3678,7 +3678,7 @@ static void phar_add_file(phar_archive_data **pphar, char *filename, int filenam
 			data->internal_file->compressed_filesize = data->internal_file->uncompressed_filesize = contents_len;
 		}
 
-		if (contents_file != NULL && php_stream_stat(contents_file, &ssb TSRMLS_CC) != -1) {
+		if (contents_file != NULL && php_stream_stat(contents_file, &ssb) != -1) {
 			data->internal_file->flags = ssb.sb.st_mode & PHAR_ENT_PERM_MASK ;
 		} else {
 #ifndef _WIN32

Original file line number	Diff line number	Diff line change
`@@ -3678,7 +3678,7 @@ static void phar_add_file(phar_archive_data *pphar, char filename, int filenam`
`3678`	`3678`	`data->internal_file->compressed_filesize = data->internal_file->uncompressed_filesize = contents_len;`
`3679`	`3679`	`}`
`3680`	`3680`
`3681`		`- if (contents_file != NULL && php_stream_stat(contents_file, &ssb TSRMLS_CC) != -1) {`
	`3681`	`+ if (contents_file != NULL && php_stream_stat(contents_file, &ssb) != -1) {`
`3682`	`3682`	`data->internal_file->flags = ssb.sb.st_mode & PHAR_ENT_PERM_MASK ;`
`3683`	`3683`	`} else {`
`3684`	`3684`	`#ifndef _WIN32`