mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-05-29 06:30:51 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
529fcae7f6
|
@ -2930,7 +2930,7 @@ class X509
|
|||
}
|
||||
$output.= $desc . '=' . $value;
|
||||
$result[$desc] = isset($result[$desc]) ?
|
||||
array_merge((array) $dn[$prop], array($value)) :
|
||||
array_merge((array) $result[$desc], array($value)) :
|
||||
$value;
|
||||
$start = false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user