projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unblock .urbandictionary.com/popular
[privoxy.git]
/
filters.c
diff --git
a/filters.c
b/filters.c
index
d7861f0
..
a94454c
100644
(file)
--- a/
filters.c
+++ b/
filters.c
@@
-1,4
+1,4
@@
-const char filters_rcs[] = "$Id: filters.c,v 1.1
65 2012/02/29 19:34:04
fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.1
71 2012/03/18 13:47:33
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@
-360,7
+360,7
@@
int acl_addr(const char *aspec, struct access_control_addr *aca)
if ((p = strchr(acl_spec, '/')) != NULL)
{
*p++ = '\0';
if ((p = strchr(acl_spec, '/')) != NULL)
{
*p++ = '\0';
- if (
ijb
_isdigit(*p) == 0)
+ if (
privoxy
_isdigit(*p) == 0)
{
freez(acl_spec);
return(-1);
{
freez(acl_spec);
return(-1);
@@
-577,7
+577,7
@@
struct http_response *block_url(struct client_state *csp)
/* determine HOW images should be blocked */
p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
/* determine HOW images should be blocked */
p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
- if(csp->action->flags & ACTION_HANDLE_AS_EMPTY_DOCUMENT)
+ if
(csp->action->flags & ACTION_HANDLE_AS_EMPTY_DOCUMENT)
{
log_error(LOG_LEVEL_ERROR, "handle-as-empty-document overruled by handle-as-image.");
}
{
log_error(LOG_LEVEL_ERROR, "handle-as-empty-document overruled by handle-as-image.");
}
@@
-646,7
+646,7
@@
struct http_response *block_url(struct client_state *csp)
}
else
#endif /* def FEATURE_IMAGE_BLOCKING */
}
else
#endif /* def FEATURE_IMAGE_BLOCKING */
- if(csp->action->flags & ACTION_HANDLE_AS_EMPTY_DOCUMENT)
+ if
(csp->action->flags & ACTION_HANDLE_AS_EMPTY_DOCUMENT)
{
/*
* Send empty document.
{
/*
* Send empty document.
@@
-1109,12
+1109,13
@@
char *get_last_url(char *subject, const char *redirect_mode)
if (NULL == url_segments)
{
if (NULL == url_segments)
{
- log_error(LOG_LEVEL_ERROR, "Out of memory while decoding URL: %s", new_url);
+ log_error(LOG_LEVEL_ERROR,
+ "Out of memory while decoding URL: %s", subject);
freez(subject);
return NULL;
}
freez(subject);
return NULL;
}
- segments = ssplit(subject, "?&", url_segments, max_segments
, 1, 1
);
+ segments = ssplit(subject, "?&", url_segments, max_segments);
while (segments-- > 0)
{
while (segments-- > 0)
{
@@
-2127,7
+2128,7
@@
const static struct forward_spec *get_forward_override_settings(struct client_st
return NULL;
}
return NULL;
}
- vec_count = ssplit(forward_settings, " \t", vec, SZ(vec)
, 1, 1
);
+ vec_count = ssplit(forward_settings, " \t", vec, SZ(vec));
if ((vec_count == 2) && !strcasecmp(vec[0], "forward"))
{
fwd->type = SOCKS_NONE;
if ((vec_count == 2) && !strcasecmp(vec[0], "forward"))
{
fwd->type = SOCKS_NONE;