Indefero Commit Details

Date:

2011-06-06 16:24:00 (13 years 6 months ago)

Author:

Thomas Keller

Branch:

develop, feature.content-md5, feature.diff-whitespace, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.2, release-1.3

Commit:

2a33510c96f37ea4f56ccf937f22fc15e1237e25

Parents:

d1f79d906dc8a596bfb6cf812911b89eaf02b8ec

Message:

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

Changes:

File differences

-76
77 77
78 78
79 
79
80 80
81 81
82 82
+        $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
        $ret = array();␊
        foreach ($single_conns as $conn) {␊
            preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches);␊
            preg_match('/\(([^)]+)\)([^:]+):(\d+)/', $conn, $matches);␊
            $ret[$matches[1]][] = (object)array(␊
                'server'    => $matches[1],␊
                'address'   => $matches[2],␊
         $single_conns = preg_split('/[ ]/', $conn, -1, PREG_SPLIT_NO_EMPTY);␊
         $ret = array();␊
         foreach ($single_conns as $conn) {␊
-            preg_match('/\((\w+)\)([^:]+):(\d+)/', $conn, $matches);␊
+            preg_match('/\(([^)]+)\)([^:]+):(\d+)/', $conn, $matches);␊
             $ret[$matches[1]][] = (object)array(␊
                 'server'    => $matches[1],␊
                 'address'   => $matches[2],␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags