Allow hostnames that do not contain a dot

phergie · May 9, 2015 · ea3633f · ea3633f
1 parent 60bea2e
commit ea3633f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Parser.php b/src/Parser.php
@@ -207,10 +207,10 @@ public function __construct()
         $trailing = "(?: :?[^$null$crlf]*)";
         $params = "(?P<params>$trailing?|(?:$middle{0,14}$trailing))";
         $name = "[$letter$number](?:[$letter$number\\-]*[$letter$number])?";
-        $host = "$name(?:\\.(?:$name)*)+";
+        $host = "$name(?:\\.(?:$name)*)*";
         $nick = "(?:[$letter$special][$letter$number$special-]*)";
         $user = "(?:[^ $null$crlf@]+)";
-        $prefix = "(?:(?P<servername>$host)|(?:(?P<nick>$nick)(?:!(?P<user>$user))?(?:@(?P<host>$host))?))";
+        $prefix = "(?:(?:(?P<nick>$nick)(?:!(?P<user>$user))?(?:@(?P<host>$host))?)|(?P<servername>$host))";
         $message = "(?P<prefix>:$prefix )?$command$params$crlf";
         $this->message = "/^$message/SU";
 

diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -2768,7 +2768,7 @@ public function dataProviderTestParse()
                 ),
             ),
 
-            // Hostnames/idents
+            // Hostname/ident patterns
             array(
                 ":[email protected] PRIVMSG target :message\r\n",
                 array(
@@ -2806,6 +2806,23 @@ public function dataProviderTestParse()
                 ":nick!ident@- PRIVMSG target :message\r\n",
                 null,
             ),
+
+            array(
+                ":nick!ident@localhost PRIVMSG target :message\r\n",
+                array(
+                    'prefix' => ':nick!ident@localhost',
+                    'nick' => 'nick',
+                    'user' => 'ident',
+                    'host' => 'localhost',
+                    'command' => 'PRIVMSG',
+                    'params' => array(
+                        'all' => 'target :message',
+                        'receivers' => 'target',
+                        'text' => 'message',
+                    ),
+                    'targets' => array('target'),
+                ),
+            ),
         );
 
         foreach ($data as $key => $value) {