MFH

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index da8c160d7b08fb0a0eb382c9272c785144c21a1b..052863d345376019787bd01d2e0fd090b2d9499d 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -333,7 +333,7 @@ static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
                return rv;
        }
 
-       APR_BRIGADE_FOREACH(b, bb) {
+       for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) {
                apr_bucket_read(b, &str, &n, 1);
                if (n > 0) {
                        old_index = ctx->post_len;
@@ -420,7 +420,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
                return ap_pass_brigade(f->next, bb);
        }
 
-       APR_BRIGADE_FOREACH(b, bb) {
+       for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BUCKET_NEXT(b)) {
                zend_file_handle zfd;
 
                if (!ctx->request_processed && APR_BUCKET_IS_FILE(b)) {