Merge branch 'PHP-5.5' into PHP-5.6

m6w6 · m6w6 · commit 3c22449649a2 · 2015-03-30T15:41:03.000+02:00
* PHP-5.5:
  Fixed Bug #65467
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
@@ -397,7 +397,7 @@ class PharCommand extends CLICommand
 	 */
 	static function cli_arg_typ_privkey($arg, $cfg, $key)
 	{
-		$arg = self::cli_arg_typ_string($arg, $cfg, $key);
+		$arg = self::cli_arg_typ_filecont($arg, $cfg, $key);
 
 		$hash_avail = Phar::getSupportedSignatures();
 		if ($arg && !in_array('OpenSSL', $hash_avail))

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ class PharCommand extends CLICommand`
`397`	`397`	`*/`
`398`	`398`	`static function cli_arg_typ_privkey($arg, $cfg, $key)`
`399`	`399`	`{`
`400`		`- $arg = self::cli_arg_typ_string($arg, $cfg, $key);`
	`400`	`+ $arg = self::cli_arg_typ_filecont($arg, $cfg, $key);`
`401`	`401`
`402`	`402`	`$hash_avail = Phar::getSupportedSignatures();`
`403`	`403`	`if ($arg && !in_array('OpenSSL', $hash_avail))`