diff -r -u mod_python-3.2.6/src/connobject.c mod_python-3.2.6.patched/src/connobject.c
--- mod_python-3.2.6/src/connobject.c	Sat Nov 12 12:59:35 2005
+++ mod_python-3.2.6.patched/src/connobject.c	Fri Jan 20 14:13:30 2006
@@ -78,7 +78,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;
@@ -312,24 +306,17 @@
  **
  *  utility func to make a socket address
  */
-
 static PyObject *makesockaddr(struct apr_sockaddr_t *addr)
-{
+{   
     PyObject *addrobj = makeipaddr(addr);
     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");
-        }
+        ret = Py_BuildValue("Oi", addrobj, ntohs(addr->sa.sin.sin_port));
         Py_DECREF(addrobj);
     }
     return ret;
 }
-
+    
 /**
  ** conn_getattr
  **
diff -r -u mod_python-3.2.6/src/filterobject.c mod_python-3.2.6.patched/src/filterobject.c
--- mod_python-3.2.6/src/filterobject.c	Thu Nov 25 16:10:52 2004
+++ mod_python-3.2.6.patched/src/filterobject.c	Fri Jan 20 14:13:40 2006
@@ -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) {
             PyErr_SetObject(PyExc_IOError, 
                             PyString_FromString("Input filter read error"));
             return NULL;
diff -r -u mod_python-3.2.6/test/test.py mod_python-3.2.6.patched/test/test.py
--- mod_python-3.2.6/test/test.py	Thu Jan 12 17:14:11 2006
+++ mod_python-3.2.6.patched/test/test.py	Fri Jan 20 13:50:04 2006
@@ -290,9 +290,9 @@
             PythonOption('PythonOptionTest sample_value'),
             DocumentRoot(DOCUMENT_ROOT),
             LoadModule("python_module %s" % quoteIfSpace(MOD_PYTHON_SO)),
-            IfModule("!mod_auth.c",
-                     LoadModule("auth_module %s" %
-                                quoteIfSpace(os.path.join(modpath, "mod_auth.so")))))
+            IfModule("!mod_auth_basic.c",
+                     LoadModule("auth_basic_module %s" %
+                                quoteIfSpace(os.path.join(modpath, "mod_auth_basic.so")))))
 
         f = open(CONFIG, "w")
         f.write(str(s))