mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 80612 via svnmerge from

Browse Source 
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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-29 10:18:33 +00:00
parent b199796f97
commit 72867d611d
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

@ -12,6 +12,7 @@ PS: In the standard Python distribution, this file is encoded in UTF-8.
David Abrahams
Jim Ahlstrom
Farhan Ahmad
Yaniv Aknin
Jyrki Alakuijala
Billy G. Allie
Kevin Altis

3
Misc/NEWS
View File

@ -40,6 +40,9 @@ Core and Builtins
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.

1
Modules/socketmodule.c
View File

@ -1290,6 +1290,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
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))) {