Merge branch 'PHP-5.4'

felipensp · felipensp · commit cd18e20101c1 · 2012-08-19T15:09:20.000-03:00
* PHP-5.4:
  - Value stored to var is never used
diff --git a/ext/phar/util.c b/ext/phar/util.c
@@ -210,8 +210,6 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
 		return FAILURE;
 	}
 #endif
-
-	filename_len = strlen(entry.tmp);
 	filename = entry.tmp;
 
 	/* only check openbasedir for files, not for phar streams */

Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,6 @@ int phar_mount_entry(phar_archive_data phar, char filename, int filename_len,`
`210`	`210`	`return FAILURE;`
`211`	`211`	`}`
`212`	`212`	`#endif`
`213`		`-`
`214`		`- filename_len = strlen(entry.tmp);`
`215`	`213`	`filename = entry.tmp;`
`216`	`214`
`217`	`215`	`/* only check openbasedir for files, not for phar streams */`