moriyoshi Mon Feb 10 14:12:02 2003 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Removed unnecessary code
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.103
php4/sapi/apache2filter/sapi_apache2.c:1.104
--- php4/sapi/apache2filter/sapi_apache2.c:1.103 Tue Jan 28 11:34:21 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Mon Feb 10 14:12:02 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.103 2003/01/28 16:34:21 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.104 2003/02/10 19:12:02 moriyoshi Exp $ */
#include <fcntl.h>
@@ -336,8 +336,6 @@
apr_bucket *b;
const char *str;
apr_size_t n;
- const char *prev_fetched_str;
- apr_size_t prev_fetched_str_len;
apr_status_t rv;
TSRMLS_FETCH();
@@ -356,35 +354,8 @@
return rv;
}
- prev_fetched_str = NULL;
- prev_fetched_str_len = -1;
-
for (b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b =
APR_BUCKET_NEXT(b)) {
apr_bucket_read(b, &str, &n, 1);
-
- /*
- * An intuitive brigade bug detection
- * (http://bugs.php.net/18648)
- *
- * This has something to do with the issue mentioned in the thread
- * on [EMAIL PROTECTED]:
- *
- * http://marc.theaimsgroup.com/?l=apr-dev&m=104039770818472&w=2
- */
- if (APR_BUCKET_IS_HEAP(b)) {
- if ((str == prev_fetched_str && n == prev_fetched_str_len)) {
- char *brigade_dump = NULL;
- apr_bucket *tmp;
-
- for (tmp = APR_BRIGADE_FIRST(bb); tmp !=
APR_BRIGADE_SENTINEL(bb); tmp = APR_BUCKET_NEXT(tmp)) {
- brigade_dump = apr_psprintf(f->r->pool, "%s[%s
%x] ", (brigade_dump ? brigade_dump: ""), tmp->type->name, (int)tmp);
- }
-
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, 0, "* BUG *
You encountered an apr bug. Please contact to [EMAIL PROTECTED] with the following
information: %s", (brigade_dump ? brigade_dump: "(empty)"));
- }
- prev_fetched_str = str;
- prev_fetched_str_len = n;
- }
if (n > 0) {
old_index = ctx->post_len;
ctx->post_len += n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
