From owner-svn-src-head@FreeBSD.ORG  Sat Jul 19 14:10:32 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1AF5E835;
 Sat, 19 Jul 2014 14:10:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 07CBA2EE9;
 Sat, 19 Jul 2014 14:10:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6JEAVQv075614;
 Sat, 19 Jul 2014 14:10:31 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6JEAVeT075610;
 Sat, 19 Jul 2014 14:10:31 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407191410.s6JEAVeT075610@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 19 Jul 2014 14:10:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268876 - in head/contrib/libucl: src tests/basic
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jul 2014 14:10:32 -0000

Author: bapt
Date: Sat Jul 19 14:10:31 2014
New Revision: 268876
URL: http://svnweb.freebsd.org/changeset/base/268876

Log:
  Merge libucl 20140718 (fixes a bug in the parser)

Added:
  head/contrib/libucl/tests/basic/11.in
     - copied unchanged from r268875, vendor/libucl/dist/tests/basic/11.in
  head/contrib/libucl/tests/basic/11.res
     - copied unchanged from r268875, vendor/libucl/dist/tests/basic/11.res
Modified:
  head/contrib/libucl/src/ucl_parser.c
Directory Properties:
  head/contrib/libucl/   (props changed)

Modified: head/contrib/libucl/src/ucl_parser.c
==============================================================================
--- head/contrib/libucl/src/ucl_parser.c	Sat Jul 19 14:08:15 2014	(r268875)
+++ head/contrib/libucl/src/ucl_parser.c	Sat Jul 19 14:10:31 2014	(r268876)
@@ -1661,6 +1661,11 @@ ucl_state_machine (struct ucl_parser *pa
 				return false;
 			}
 			else {
+				/* Skip any spaces */
+				while (p < chunk->end && ucl_test_character (*p,
+						UCL_CHARACTER_WHITESPACE_UNSAFE)) {
+					ucl_chunk_skipc (chunk, p);
+				}
 				p = chunk->pos;
 				if (*p == '[') {
 					parser->state = UCL_STATE_VALUE;

Copied: head/contrib/libucl/tests/basic/11.in (from r268875, vendor/libucl/dist/tests/basic/11.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/libucl/tests/basic/11.in	Sat Jul 19 14:10:31 2014	(r268876, copy of r268875, vendor/libucl/dist/tests/basic/11.in)
@@ -0,0 +1,3 @@
+
+
+   {"key": "value"}

Copied: head/contrib/libucl/tests/basic/11.res (from r268875, vendor/libucl/dist/tests/basic/11.res)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/libucl/tests/basic/11.res	Sat Jul 19 14:10:31 2014	(r268876, copy of r268875, vendor/libucl/dist/tests/basic/11.res)
@@ -0,0 +1,2 @@
+key = "value";
+