mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-09-28 07:09:01 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
333d2f9ffd
@ -5058,7 +5058,7 @@ class X509
|
|||||||
$temp = $str;
|
$temp = $str;
|
||||||
} else {
|
} else {
|
||||||
$temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
|
$temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
|
||||||
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $str, 1);
|
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
|
||||||
}
|
}
|
||||||
// remove new lines
|
// remove new lines
|
||||||
$temp = str_replace(array("\r", "\n", ' '), '', $temp);
|
$temp = str_replace(array("\r", "\n", ' '), '', $temp);
|
||||||
|
Loading…
Reference in New Issue
Block a user