[svn-commits] twilson: trunk r331660 - in /trunk: ./ tests/test_netsock2.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Fri Aug 12 11:32:24 2011
New Revision: 331660

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331660
Log:
Merged revisions 331659 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331659 | twilson | 2011-08-12 11:31:21 -0500 (Fri, 12 Aug 2011) | 11 lines
  
  Merged revisions 331658 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331658 | twilson | 2011-08-12 11:30:26 -0500 (Fri, 12 Aug 2011) | 4 lines
    
    Fix netsock2 multiple zero-expansion test
    
    Remove erroneous single bracket.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/tests/test_netsock2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/tests/test_netsock2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_netsock2.c?view=diff&rev=331660&r1=331659&r2=331660
==============================================================================
--- trunk/tests/test_netsock2.c (original)
+++ trunk/tests/test_netsock2.c Fri Aug 12 11:32:24 2011
@@ -69,7 +69,7 @@
 		{ "[2001::1]", 1 },
 		{ "[2001:0000:4136:e378:8000:63bf:3fff:fdd2]:5060", 1 },
 		{ "2001:0000:4136:e378:8000:63bf:3fff:fdd2:5060", 0 }, /* port, but no brackets */
-		{ "[fe80::200::abcd", 0 }, /* multiple zero expansions */
+		{ "fe80::200::abcd", 0 }, /* multiple zero expansions */
 	};
 
 	size_t x;