[Python-modules-commits] [pycurl] 37/140: Import pycurl_7.15.2.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Wed Oct 1 21:45:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit 046d41fec4733f170dc058c1367e88c56ee334ce
Author: Barry Warsaw <barry at python.org>
Date: Wed Oct 1 16:43:30 2014 -0400
Import pycurl_7.15.2.orig.tar.gz
---
ChangeLog | 18 +++++++++++++++++-
PKG-INFO | 2 +-
README | 4 ++--
setup.py | 4 ++--
setup_win32_ssl.py | 4 ++--
src/pycurl.c | 24 +++++++++++++++---------
6 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 959a802..de9fc77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,20 @@
-Version 7.15.0 [requires libcurl-7.15.0 or better]
+Version 7.15.2 [requires libcurl-7.15.2 or better]
+--------------
+
+ * Added CURLOPT_CONNECT_ONLY, CURLINFO_LASTSOCKET,
+ CURLOPT_LOCALPORT and CURLOPT_LOCALPORTRANGE.
+
+
+Version 7.15.1
+--------------
+
+2006-01-31 Kjetil Jacobsen <kjetilja>
+
+ * Fixed memory leak for getinfo calls that return a
+ list as result. Patch by Paul Pacheco.
+
+
+Version 7.15.0
--------------
2005-10-18 Kjetil Jacobsen <kjetilja>
diff --git a/PKG-INFO b/PKG-INFO
index ee21105..38b28ba 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: pycurl
-Version: 7.15.0
+Version: 7.15.2
Summary: PycURL -- cURL library module for Python
Home-page: http://pycurl.sourceforge.net/
Author: Kjetil Jacobsen, Markus F.X.J. Oberhumer
diff --git a/README b/README
index 65de06a..21c9b65 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
LICENSE
-------
-Copyright (C) 2001-2005 by Kjetil Jacobsen <kjetilja at gmail.com>
-Copyright (C) 2001-2005 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Copyright (C) 2001-2006 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2006 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
PycURL is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/setup.py b/setup.py
index 0ab81d4..a50facc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: setup.py,v 1.128 2005/10/18 07:17:46 kjetilja Exp $
+# $Id: setup.py,v 1.130 2006/03/03 13:56:20 kjetilja Exp $
"""Setup script for the PycURL module distribution."""
PACKAGE = "pycurl"
PY_PACKAGE = "curl"
-VERSION = "7.15.0"
+VERSION = "7.15.2"
import glob, os, re, sys, string
import distutils
diff --git a/setup_win32_ssl.py b/setup_win32_ssl.py
index f821252..1711a54 100644
--- a/setup_win32_ssl.py
+++ b/setup_win32_ssl.py
@@ -1,13 +1,13 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# vi:ts=4:et
-# $Id: setup_win32_ssl.py,v 1.32 2005/10/18 07:17:46 kjetilja Exp $
+# $Id: setup_win32_ssl.py,v 1.34 2006/03/03 13:56:20 kjetilja Exp $
import os, sys, string
assert sys.platform == "win32", "Only for building on Win32 with SSL and zlib"
-CURL_DIR = r"c:\src\build\pycurl\curl-7.15.0-ssl"
+CURL_DIR = r"c:\src\build\pycurl\curl-7.15.2-ssl"
OPENSSL_DIR = r"c:\src\build\pycurl\openssl-0.9.7g"
sys.argv.insert(1, "--curl-dir=" + CURL_DIR)
diff --git a/src/pycurl.c b/src/pycurl.c
index fb495bf..20501be 100644
--- a/src/pycurl.c
+++ b/src/pycurl.c
@@ -1,10 +1,10 @@
-/* $Id: pycurl.c,v 1.95 2005/10/18 07:17:46 kjetilja Exp $ */
+/* $Id: pycurl.c,v 1.98 2006/03/03 13:56:20 kjetilja Exp $ */
/* PycURL -- cURL Python module
*
* Authors:
- * Copyright (C) 2001-2005 by Kjetil Jacobsen <kjetilja at cs.uit.no>
- * Copyright (C) 2001-2005 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+ * Copyright (C) 2001-2006 by Kjetil Jacobsen <kjetilja at cs.uit.no>
+ * Copyright (C) 2001-2006 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
*
* Contributions:
* Tino Lange <Tino.Lange at gmx.de>
@@ -49,8 +49,8 @@
#if !defined(PY_VERSION_HEX) || (PY_VERSION_HEX < 0x02020000)
# error "Need Python version 2.2 or greater to compile pycurl."
#endif
-#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f00)
-# error "Need libcurl version 7.15.0 or greater to compile pycurl."
+#if !defined(LIBCURL_VERSION_NUM) || (LIBCURL_VERSION_NUM < 0x070f02)
+# error "Need libcurl version 7.15.2 or greater to compile pycurl."
#endif
#undef UNUSED
@@ -172,6 +172,7 @@ static char *PyString_AsString_NoNUL(PyObject *obj)
static PyObject *convert_slist(struct curl_slist *slist, int free_flags)
{
PyObject *ret = NULL;
+ struct curl_slist *slist_start = slist;
ret = PyList_New(0);
if (ret == NULL) goto error;
@@ -191,14 +192,14 @@ static PyObject *convert_slist(struct curl_slist *slist, int free_flags)
Py_DECREF(v);
}
- if ((free_flags & 1) && slist)
- curl_slist_free_all(slist);
+ if ((free_flags & 1) && slist_start)
+ curl_slist_free_all(slist_start);
return ret;
error:
Py_XDECREF(ret);
- if ((free_flags & 2) && slist)
- curl_slist_free_all(slist);
+ if ((free_flags & 2) && slist_start)
+ curl_slist_free_all(slist_start);
return NULL;
}
@@ -1585,6 +1586,7 @@ do_curl_getinfo(CurlObject *self, PyObject *args)
case CURLINFO_PROXYAUTH_AVAIL:
case CURLINFO_OS_ERRNO:
case CURLINFO_NUM_CONNECTS:
+ case CURLINFO_LASTSOCKET:
{
/* Return PyInt as result */
long l_res = -1;
@@ -2699,6 +2701,9 @@ initpycurl(void)
insint_c(d, "IGNORE_CONTENT_LENGTH", CURLOPT_IGNORE_CONTENT_LENGTH);
insint_c(d, "COOKIELIST", CURLOPT_COOKIELIST);
insint_c(d, "FTP_SKIP_PASV_IP", CURLOPT_FTP_SKIP_PASV_IP);
+ insint_c(d, "CONNECT_ONLY", CURLOPT_CONNECT_ONLY);
+ insint_c(d, "LOCALPORT", CURLOPT_LOCALPORT);
+ insint_c(d, "LOCALPORTRANGE", CURLOPT_LOCALPORTRANGE);
/* constants for setopt(IPRESOLVE, x) */
insint_c(d, "IPRESOLVE_WHATEVER", CURL_IPRESOLVE_WHATEVER);
@@ -2757,6 +2762,7 @@ initpycurl(void)
insint_c(d, "NUM_CONNECTS", CURLINFO_NUM_CONNECTS);
insint_c(d, "SSL_ENGINES", CURLINFO_SSL_ENGINES);
insint_c(d, "INFO_COOKIELIST", CURLINFO_COOKIELIST);
+ insint_c(d, "LASTSOCKET", CURLINFO_LASTSOCKET);
/* curl_closepolicy: constants for setopt(CLOSEPOLICY, x) */
insint_c(d, "CLOSEPOLICY_OLDEST", CURLCLOSEPOLICY_OLDEST);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pycurl.git
More information about the Python-modules-commits
mailing list