From 808f5dcb55a005bdf82e7f0a6cc07ee786c99a90 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 19 Oct 2007 16:56:26 +0000
Subject: [PATCH] - Downgrade "Buffer limit reached" message to LOG_LEVEL_INFO.
- Use shiny new content_filters_enabled() in client_range().
---
parsers.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/parsers.c b/parsers.c
index 361eb276..62950a81 100644
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.112 2007/10/09 16:38:40 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.113 2007/10/10 17:29:57 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -44,6 +44,9 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.112 2007/10/09 16:38:40 fabiankei
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.113 2007/10/10 17:29:57 fabiankeil
+ * I forgot about Poland.
+ *
* Revision 1.112 2007/10/09 16:38:40 fabiankeil
* Remove Range and If-Range headers if content filtering is enabled.
*
@@ -970,7 +973,7 @@ jb_err add_to_iob(struct client_state *csp, char *buf, int n)
*/
if (need > csp->config->buffer_limit)
{
- log_error(LOG_LEVEL_ERROR, "Buffer limit reached while extending the buffer (iob)");
+ log_error(LOG_LEVEL_INFO, "Buffer limit reached while extending the buffer (iob)");
return JB_ERR_MEMORY;
}
@@ -3448,9 +3451,7 @@ jb_err client_x_filter(struct client_state *csp, char **header)
*********************************************************************/
static jb_err client_range(struct client_state *csp, char **header)
{
- if (((csp->rlist != NULL) &&
- (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||
- (csp->action->flags & (ACTION_DEANIMATE|ACTION_JPEG_INSPECT|ACTION_NO_POPUPS)))
+ if (content_filters_enabled(csp))
{
log_error(LOG_LEVEL_HEADER, "Content filtering is enabled."
" Crunching: \'%s\' to prevent range-mismatch problems.", *header);
--
2.49.0