]>
Commit | Line | Data |
---|---|---|
a29569d5 ER |
1 | diff -urN mod_python-3.2.8/src/connobject.c mod_python-3.2.8.new/src/connobject.c |
2 | --- mod_python-3.2.8/src/connobject.c 2006-02-02 22:30:55.000000000 +0100 | |
3 | +++ mod_python-3.2.8.new/src/connobject.c 2006-03-21 13:47:36.384643750 +0100 | |
4 | @@ -79,7 +79,7 @@ | |
5 | rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize); | |
6 | Py_END_ALLOW_THREADS; | |
a875701d | 7 | |
a29569d5 ER |
8 | - if (! APR_STATUS_IS_SUCCESS(rc)) { |
9 | + if (rc != APR_SUCCESS) { | |
10 | PyErr_SetObject(PyExc_IOError, | |
11 | PyString_FromString("Connection read error")); | |
12 | return NULL; | |
13 | @@ -321,12 +321,8 @@ | |
14 | PyObject *ret = NULL; | |
15 | if (addrobj) { | |
16 | apr_port_t port; | |
17 | - if(apr_sockaddr_port_get(&port, addr)==APR_SUCCESS) { | |
18 | - ret = Py_BuildValue("Oi", addrobj, port ); | |
19 | - } | |
20 | - else { | |
21 | - PyErr_SetString(PyExc_SystemError,"apr_sockaddr_port_get failure"); | |
22 | - } | |
23 | + port = addr->port; | |
24 | + ret = Py_BuildValue("Oi", addrobj, port ); | |
25 | Py_DECREF(addrobj); | |
26 | } | |
27 | return ret; | |
28 | diff -urN mod_python-3.2.8/src/filterobject.c mod_python-3.2.8.new/src/filterobject.c | |
29 | --- mod_python-3.2.8/src/filterobject.c 2004-11-25 23:10:52.000000000 +0100 | |
30 | +++ mod_python-3.2.8.new/src/filterobject.c 2006-03-21 13:25:05.140196250 +0100 | |
a875701d MG |
31 | @@ -178,7 +178,7 @@ |
32 | APR_BLOCK_READ, self->readbytes); | |
33 | Py_END_ALLOW_THREADS; | |
34 | ||
35 | - if (!APR_STATUS_IS_EAGAIN(self->rc) && !APR_STATUS_IS_SUCCESS(self->rc)) { | |
a29569d5 | 36 | + if (!APR_STATUS_IS_EAGAIN(self->rc) && !(self->rc == APR_SUCCESS)) { |
a875701d MG |
37 | PyErr_SetObject(PyExc_IOError, |
38 | PyString_FromString("Input filter read error")); | |
39 | return NULL; | |
a29569d5 | 40 |