Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Antoine Pitrou 2010-04-29 10:11:46 +00:00
parent 764b8780db
commit bf043491a1
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -13,6 +13,7 @@ David Abrahams
Jim Ahlstrom Jim Ahlstrom
Farhan Ahmad Farhan Ahmad
Nir Aides Nir Aides
Yaniv Aknin
Jyrki Alakuijala Jyrki Alakuijala
Billy G. Allie Billy G. Allie
Kevin Altis Kevin Altis

3
Misc/NEWS
View File

@ -339,6 +339,9 @@ C-API
Library Library
------- -------
- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
of the Linux kernel. Patch by Yaniv Aknin.
- Issue #8295: Added shutil.unpack_archive. - Issue #8295: Added shutil.unpack_archive.
- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. - Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.

1
Modules/socketmodule.c
View File

@ -1290,6 +1290,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
char *straddr; char *straddr;
addr = (struct sockaddr_l2 *)addr_ret; addr = (struct sockaddr_l2 *)addr_ret;
memset(addr, 0, sizeof(struct sockaddr_l2));
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH; _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
if (!PyArg_ParseTuple(args, "si", &straddr, if (!PyArg_ParseTuple(args, "si", &straddr,
&_BT_L2_MEMB(addr, psm))) { &_BT_L2_MEMB(addr, psm))) {