\w doesn't match -, so better use [^)] to match server names

This commit is contained in:
Thomas Keller 2011-06-06 23:24:00 +02:00
parent d1f79d906d
commit 2a33510c96

View File

@ -76,7 +76,7 @@ class IDF_Scm_Monotone_Usher
$single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY); $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);
$ret = array(); $ret = array();
foreach ($single_conns as $conn) { foreach ($single_conns as $conn) {
preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches); preg_match('/\(([^)]+)\)([^:]+):(\d+)/', $conn, $matches);
$ret[$matches[1]][] = (object)array( $ret[$matches[1]][] = (object)array(
'server' => $matches[1], 'server' => $matches[1],
'address' => $matches[2], 'address' => $matches[2],