From a29569d5f4ca73c66c839f24817fa5d8aa48be3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 21 Mar 2006 14:41:07 +0000 Subject: [PATCH] - update to 3.2.8 by Kamil Jakubowski - follow upstream code: use space for identing Changed files: apache-mod_python-apr-status-is-success.patch -> 1.2 --- apache-mod_python-apr-status-is-success.patch | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/apache-mod_python-apr-status-is-success.patch b/apache-mod_python-apr-status-is-success.patch index 774eaf5..f7a453f 100644 --- a/apache-mod_python-apr-status-is-success.patch +++ b/apache-mod_python-apr-status-is-success.patch @@ -1,24 +1,40 @@ -diff -Nur mod_python-3.1.3-orig/src/connobject.c mod_python-3.1.3/src/connobject.c ---- mod_python-3.1.3-orig/src/connobject.c 2004-02-16 20:47:27.000000000 +0100 -+++ mod_python-3.1.3/src/connobject.c 2004-10-16 12:03:50.870833912 +0200 -@@ -78,7 +78,7 @@ - rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize); - Py_END_ALLOW_THREADS; +diff -urN mod_python-3.2.8/src/connobject.c mod_python-3.2.8.new/src/connobject.c +--- mod_python-3.2.8/src/connobject.c 2006-02-02 22:30:55.000000000 +0100 ++++ mod_python-3.2.8.new/src/connobject.c 2006-03-21 13:47:36.384643750 +0100 +@@ -79,7 +79,7 @@ + rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize); + Py_END_ALLOW_THREADS; -- if (! APR_STATUS_IS_SUCCESS(rc)) { -+ if ( rc != APR_SUCCESS ) { - PyErr_SetObject(PyExc_IOError, - PyString_FromString("Connection read error")); - return NULL; -diff -Nur mod_python-3.1.3-orig/src/filterobject.c mod_python-3.1.3/src/filterobject.c ---- mod_python-3.1.3-orig/src/filterobject.c 2004-02-16 20:47:27.000000000 +0100 -+++ mod_python-3.1.3/src/filterobject.c 2004-10-16 12:04:10.783806680 +0200 +- if (! APR_STATUS_IS_SUCCESS(rc)) { ++ if (rc != APR_SUCCESS) { + PyErr_SetObject(PyExc_IOError, + PyString_FromString("Connection read error")); + return NULL; +@@ -321,12 +321,8 @@ + PyObject *ret = NULL; + if (addrobj) { + apr_port_t port; +- if(apr_sockaddr_port_get(&port, addr)==APR_SUCCESS) { +- ret = Py_BuildValue("Oi", addrobj, port ); +- } +- else { +- PyErr_SetString(PyExc_SystemError,"apr_sockaddr_port_get failure"); +- } ++ port = addr->port; ++ ret = Py_BuildValue("Oi", addrobj, port ); + Py_DECREF(addrobj); + } + return ret; +diff -urN mod_python-3.2.8/src/filterobject.c mod_python-3.2.8.new/src/filterobject.c +--- mod_python-3.2.8/src/filterobject.c 2004-11-25 23:10:52.000000000 +0100 ++++ mod_python-3.2.8.new/src/filterobject.c 2006-03-21 13:25:05.140196250 +0100 @@ -178,7 +178,7 @@ APR_BLOCK_READ, self->readbytes); Py_END_ALLOW_THREADS; - if (!APR_STATUS_IS_EAGAIN(self->rc) && !APR_STATUS_IS_SUCCESS(self->rc)) { -+ if (!APR_STATUS_IS_EAGAIN(self->rc) && self->rc != APR_SUCCESS ) { ++ if (!APR_STATUS_IS_EAGAIN(self->rc) && !(self->rc == APR_SUCCESS)) { PyErr_SetObject(PyExc_IOError, PyString_FromString("Input filter read error")); return NULL; + -- 2.43.0