cvs: php4 /sapi/apache2filter sapi_apache2.c

dougm Sun Jan 20 13:44:15 2002 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c Log: adjust to ap_get_brigade and input filter api changes Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.59 php4/sapi/apache2filter/sapi_apache2.c:1.60 --- php4/sapi/apache2filter/sapi_apache2.c:1.59 Tue Dec 11 10:31:56 2001 +++ php4/sapi/apache2filter/sapi_apache2.c Sun Jan 20 13:44:15 2002 @@ -238,7 +238,7 @@ } static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, - ap_input_mode_t mode, apr_off_t *readbytes) + ap_input_mode_t mode, apr_read_type_e block, apr_off_t *readbytes) { php_struct *ctx; long old_index; @@ -249,14 +249,14 @@ TSRMLS_FETCH(); if (f->r->proxyreq) { - return ap_get_brigade(f->next, bb, mode, readbytes); + return ap_get_brigade(f->next, bb, mode, block, readbytes); } ctx = SG(server_context); INIT_CTX; - if ((rv = ap_get_brigade(f->next, bb, mode, readbytes)) != APR_SUCCESS) { + if ((rv = ap_get_brigade(f->next, bb, mode, block, readbytes)) != APR_SUCCESS) { return rv; }