apache-mod_suphp-apr.patch

   1 diff -urN suphp-0.5.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_suphp.c
   2 --- suphp-0.5.2.org/src/apache2/mod_suphp.c     2004-10-23 12:58:09.156787800 +0200
   3 +++ suphp-0.5.2/src/apache2/mod_suphp.c 2004-10-23 12:59:23.461491768 +0200
   4 @@ -56,7 +56,7 @@
   5          return -1;
   6
   7      rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
   8 -    if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
   9 +    if (rv != APR_SUCCESS || (bucket_data_len == 0))
  10      {
  11          return 0;
  12      }
  13 @@ -524,7 +524,7 @@
  14              return rv;
  15          }
  16
  17 -        APR_BRIGADE_FOREACH(bucket, bb)
  18 +       for(bucket = APR_BRIGADE_FIRST(bb); bucket != APR_BRIGADE_SENTINEL(bb); bucket = APR_BUCKET_NEXT(bucket))
  19          {
  20              const char *data;
  21              apr_size_t len;
  22 @@ -595,7 +595,7 @@
  23
  24              const char *buf;
  25              apr_size_t blen;
  26 -            APR_BRIGADE_FOREACH(b, bb)
  27 +           for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b))
  28              {
  29                  if (APR_BUCKET_IS_EOS(b))
  30                      break;
  31 @@ -616,7 +616,7 @@
  32              /* empty brigade (script output) */
  33              const char *buf;
  34              apr_size_t blen;
  35 -            APR_BRIGADE_FOREACH(b, bb)
  36 +           for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b))
  37              {
  38                  if (APR_BUCKET_IS_EOS(b))
  39                      break;