From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 22 Apr 2013 15:16:03 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f12e6e081d8a881ac712927d1a0e6b7ff7d4cca;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
---

5f12e6e081d8a881ac712927d1a0e6b7ff7d4cca
diff --cc NEWS
index 2f85aa644,a3c4ad5b1..4fd097753
--- a/NEWS
+++ b/NEWS
@@@ -1,15 -1,10 +1,19 @@@
 -D-Bus 1.6.10 (UNRELEASED)
 +D-Bus 1.7.2 (UNRELEASED)
  ==
  
 +Configuration changes:
 +
 +• On non-QNX Unix platforms, the default limit on fds per message in the
 +  session bus configuration has reduced from 4096 to 1024. The default
 +  limit used on the system bus was already 1024. On QNX, both limits are
 +  reduced further, to 128.
 +
 +Fixes:
 +
+ • Following Unicode Corrigendum #9, the noncharacters U+nFFFE, U+nFFFF,
+   U+FDD0..U+FDEF are allowed in UTF-8 strings again.
+   (fd.o #63072, Simon McVittie)
+ 
  • Diagnose incorrect use of dbus_connection_get_data() with negative slot
    (i.e. before allocating the slot) rather than returning junk
    (fd.o #63127, Dan Williams)