diff options
| author | Danny Rawlins <romster@shortcircuit.net.au> | 2008-07-01 16:57:46 +1000 |
|---|---|---|
| committer | Danny Rawlins <romster@shortcircuit.net.au> | 2008-07-01 16:57:46 +1000 |
| commit | 7d6932f679a9e41bc84947a2c1ad831f6981f849 (patch) | |
| tree | 0a4ca4ed7eda923cc012cc78717665ffb8f4a9a4 /mod_python | |
| parent | b32145a5cb0c9c5f9ccb45d9e7d0b7dfe5ae8421 (diff) | |
| download | contrib-7d6932f679a9e41bc84947a2c1ad831f6981f849.tar.gz contrib-7d6932f679a9e41bc84947a2c1ad831f6981f849.tar.xz | |
mod_python: API compatibility fix for apr
Diffstat (limited to 'mod_python')
| -rw-r--r-- | mod_python/Pkgfile | 8 | ||||
| -rw-r--r-- | mod_python/mod_python-3.3.1-apr-fix.patch | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/mod_python/Pkgfile b/mod_python/Pkgfile index 1b67eff5f..656d8de28 100644 --- a/mod_python/Pkgfile +++ b/mod_python/Pkgfile @@ -6,13 +6,15 @@ name=mod_python version=3.3.1 -release=1 +release=2 source=(http://www.apache.org/dist/httpd/modpython/mod_python-$version.tgz - configure.patch) + configure.patch + mod_python-$version-apr-fix.patch) build() { cd mod_python-$version - patch -p 1 -i ../configure.patch configure + patch -p 1 -i $SRC/configure.patch configure + patch -p 1 -i $SRC/mod_python-$version-apr-fix.patch ./configure \ --prefix=/usr \ diff --git a/mod_python/mod_python-3.3.1-apr-fix.patch b/mod_python/mod_python-3.3.1-apr-fix.patch new file mode 100644 index 000000000..13b3b0448 --- /dev/null +++ b/mod_python/mod_python-3.3.1-apr-fix.patch @@ -0,0 +1,12 @@ +diff -pruN mod_python-3.3.1.orig/src/connobject.c mod_python-3.3.1/src/connobject.c +--- mod_python-3.3.1.orig/src/connobject.c 2008-07-01 06:45:51.592845367 +0000 ++++ mod_python-3.3.1/src/connobject.c 2008-07-01 06:47:56.513846039 +0000 +@@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c + bytes_read = 0; + + while ((bytes_read < len || len == 0) && +- !(b == APR_BRIGADE_SENTINEL(b) || ++ !(b == APR_BRIGADE_SENTINEL(bb) || + APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) { + + const char *data; |