cvs: php4 /sapi/apache2filter sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Mon, 09 Dec 2002 18:45:32 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17049@lists.php.net to get a copy of this message | ||
iliaa Mon Dec 9 13:45:32 2002 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Replaced deprecated APR_BRIGADE_FOREACH macro.
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.92 php4/sapi/apache2filter/sapi_apache2.c:1.93
--- php4/sapi/apache2filter/sapi_apache2.c:1.92 Tue Nov 26 00:57:02 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Mon Dec 9 13:45:32 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.92 2002/11/26 05:57:02 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.93 2002/12/09 18:45:32 iliaa Exp $ */
#include <fcntl.h>
@@ -328,7 +328,7 @@
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;
@@ -415,7 +415,7 @@
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)) {