Merge branch 'PHP-7.2' into PHP-7.3

smalyshev · smalyshev · commit e614b127124e · 2018-12-01T21:48:44.000-08:00
* PHP-7.2:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -3655,7 +3655,7 @@ static void phar_add_file(phar_archive_data **pphar, char *filename, size_t file
 			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
`@@ -3655,7 +3655,7 @@ static void phar_add_file(phar_archive_data *pphar, char filename, size_t file`
`3655`	`3655`	`data->internal_file->compressed_filesize = data->internal_file->uncompressed_filesize = contents_len;`
`3656`	`3656`	`}`
`3657`	`3657`
`3658`		`- if (contents_file != NULL && php_stream_stat(contents_file, &ssb TSRMLS_CC) != -1) {`
	`3658`	`+ if (contents_file != NULL && php_stream_stat(contents_file, &ssb) != -1) {`
`3659`	`3659`	`data->internal_file->flags = ssb.sb.st_mode & PHAR_ENT_PERM_MASK ;`
`3660`	`3660`	`} else {`
`3661`	`3661`	`#ifndef _WIN32`