more workarounds for curl 7.87

This commit is contained in:
Joris Vink 2022-12-28 16:05:14 +01:00
parent 7f27677904
commit 46af5aa11b
1 changed files with 6 additions and 4 deletions

View File

@ -6421,6 +6421,7 @@ static PyObject *
pycurl_handle_setopt_long(struct pycurl_data *data, int idx, PyObject *obj) pycurl_handle_setopt_long(struct pycurl_data *data, int idx, PyObject *obj)
{ {
long val; long val;
CURLoption option;
if (!PyLong_CheckExact(obj)) { if (!PyLong_CheckExact(obj)) {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
@ -6434,8 +6435,8 @@ pycurl_handle_setopt_long(struct pycurl_data *data, int idx, PyObject *obj)
if (val == -1 && PyErr_Occurred()) if (val == -1 && PyErr_Occurred())
return (NULL); return (NULL);
curl_easy_setopt(data->curl.handle, option = CURLOPTTYPE_LONG + py_curlopt[idx].value;
CURLOPTTYPE_LONG + py_curlopt[idx].value, val); curl_easy_setopt(data->curl.handle, option, val);
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }
@ -6447,6 +6448,7 @@ pycurl_handle_setopt_slist(struct pycurl_data *data, int idx, PyObject *obj)
PyObject *item; PyObject *item;
const char *sval; const char *sval;
struct curl_slist *slist; struct curl_slist *slist;
CURLoption option;
Py_ssize_t list_len, i; Py_ssize_t list_len, i;
if (!PyList_CheckExact(obj)) { if (!PyList_CheckExact(obj)) {
@ -6477,8 +6479,8 @@ pycurl_handle_setopt_slist(struct pycurl_data *data, int idx, PyObject *obj)
psl->slist = slist; psl->slist = slist;
LIST_INSERT_HEAD(&data->slists, psl, list); LIST_INSERT_HEAD(&data->slists, psl, list);
curl_easy_setopt(data->curl.handle, option = CURLOPTTYPE_OBJECTPOINT + py_curlopt[idx].value;
CURLOPTTYPE_OBJECTPOINT + py_curlopt[idx].value, slist); curl_easy_setopt(data->curl.handle, option, slist);
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }