0.6.1.20061108-1 release

[manu/suphp.git] / src / apache2 / mod_suphp.c

diff --git a/src/apache2/mod_suphp.c b/src/apache2/mod_suphp.c
index e056574..4b26a7a 100644 (file)
--- a/src/apache2/mod_suphp.c
+++ b/src/apache2/mod_suphp.c
@@ -82,7 +82,7 @@ char *suphp_brigade_read(apr_pool_t *p, apr_bucket_brigade *bb, int bytes)
         char *buf;
         apr_size_t size;
         apr_size_t i;
-        while (apr_bucket_read(b, &buf, &size, APR_BLOCK_READ) == APR_SUCCESS) {
+        if (apr_bucket_read(b, &buf, &size, APR_BLOCK_READ) == APR_SUCCESS) {
             for (i = 0; i < size; i++) {
                 *next_byte = *buf;
                 next_byte++;
@@ -488,7 +488,7 @@ static void suphp_discard_output(apr_bucket_brigade *bb) {
   const char *buf;
   apr_size_t len;
   apr_status_t rv;
-  APR_BRIGADE_FOREACH(b, bb) {
+  for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) {
       if (APR_BUCKET_IS_EOS(b)) {
           break;
       }
@@ -763,7 +763,7 @@ static int suphp_handler(request_rec *r)
             return rv;
         }
         
-        APR_BRIGADE_FOREACH(bucket, bb)
+        for (bucket = APR_BRIGADE_FIRST(bb); bucket != APR_BRIGADE_SENTINEL(bb); bucket = APR_BUCKET_NEXT(bucket))
         {
             const char *data;
             apr_size_t len;