← Back to branch summary

~ubuntu-branches/debian/jessie/libapache2-mod-python/jessie

« back to all changes in this revision

Viewing changes to debian/patches/10_bts521965.patch

  • Committer: Package Import Robot
  • Author(s): Arthur de Jong
  • Date: 2013-06-28 13:13:39 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20130628131339-k0153luvvedddtml
Tags: 3.3.1-11
* Team upload.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_bts521965.patch
 
1
Description: fix a FTBFS due to new apr > 1.3.x (bb is the bucket brigade)
 
2
Origin: http://www.modpython.org/pipermail/mod_python/2008-October/025724.html
 
3
Bug-Debian: http://bugs.debian.org/521965
 
4
 
 
5
--- a/src/connobject.c
 
6
+++ b/src/connobject.c
 
7
@@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c
 
8
     bytes_read = 0;
 
9
 
 
10
     while ((bytes_read < len || len == 0) &&
 
11
-           !(b == APR_BRIGADE_SENTINEL(b) ||
 
12
+           !(b == APR_BRIGADE_SENTINEL(bb) ||
 
13
              APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
 
14
 
 
15
         const char *data;