[Python-checkins] r80613 - in python/branches/release31-maint: Misc/ACKS Misc/NEWS Modules/socketmodule.c
antoine.pitrou
python-checkins at python.org
Thu Apr 29 12:18:33 CEST 2010
Author: antoine.pitrou
Date: Thu Apr 29 12:18:33 2010
New Revision: 80613
Log:
Merged revisions 80612 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80612 | antoine.pitrou | 2010-04-29 12:11:46 +0200 (jeu., 29 avril 2010) | 10 lines
Merged revisions 80610 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80610 | antoine.pitrou | 2010-04-29 12:05:40 +0200 (jeu., 29 avril 2010) | 4 lines
Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
of the Linux kernel. Patch by Yaniv Aknin.
........
................
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Misc/ACKS
python/branches/release31-maint/Misc/NEWS
python/branches/release31-maint/Modules/socketmodule.c
Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS (original)
+++ python/branches/release31-maint/Misc/ACKS Thu Apr 29 12:18:33 2010
@@ -12,6 +12,7 @@
David Abrahams
Jim Ahlstrom
Farhan Ahmad
+Yaniv Aknin
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Thu Apr 29 12:18:33 2010
@@ -40,6 +40,9 @@
Library
-------
+- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
+ of the Linux kernel. Patch by Yaniv Aknin.
+
- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
It should correctly return an empty response now.
Modified: python/branches/release31-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/socketmodule.c (original)
+++ python/branches/release31-maint/Modules/socketmodule.c Thu Apr 29 12:18:33 2010
@@ -1290,6 +1290,7 @@
char *straddr;
addr = (struct sockaddr_l2 *)addr_ret;
+ memset(addr, 0, sizeof(struct sockaddr_l2));
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
if (!PyArg_ParseTuple(args, "si", &straddr,
&_BT_L2_MEMB(addr, psm))) {
More information about the Python-checkins
mailing list