[privoxy-commits] current filters.c,1.183,1.184

[Fabian K. <fab...@us...>]

Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13854

Modified Files:
	filters.c 
Log Message:
Let +external-filter{} only filter "text" by default

Given that this is what +filter{} does, it's probably
the expected behaviour.


Index: filters.c
===================================================================
RCS file: /cvsroot/ijbswa/current/filters.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** filters.c	3 Jun 2014 10:29:40 -0000	1.183
--- filters.c	3 Jun 2014 10:33:17 -0000	1.184
***************
*** 2253,2257 ****
  
  #ifdef FEATURE_EXTERNAL_FILTERS
!    if (!list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER]))
     {
        struct list_entry *filtername;
--- 2253,2259 ----
  
  #ifdef FEATURE_EXTERNAL_FILTERS
!    if ((csp->content_type & CT_TEXT) &&
!        (csp->rlist != NULL) &&
!        !list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER]))
     {
        struct list_entry *filtername;
***************
*** 2655,2659 ****
     if ((csp->content_type & CT_TEXT) &&
         (csp->rlist != NULL) &&
!        (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER])))
     {
        return TRUE;
--- 2657,2662 ----
     if ((csp->content_type & CT_TEXT) &&
         (csp->rlist != NULL) &&
!        (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]) ||
!         !list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER])))
     {
        return TRUE;
***************
*** 2665,2669 ****
     }
  
!    return (!list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER]));
  
  }
--- 2668,2672 ----
     }
  
!    return FALSE;
  
  }