projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix footer markup
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
e0ca39b
..
8ab7f87
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.44
0 2016/01/16 12:33:36
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.44
1 2016/02/26 12:29:38
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-115,6
+115,9
@@
const char jcc_rcs[] = "$Id: jcc.c,v 1.440 2016/01/16 12:33:36 fabiankeil Exp $"
#include "cgi.h"
#include "loadcfg.h"
#include "urlmatch.h"
#include "cgi.h"
#include "loadcfg.h"
#include "urlmatch.h"
+#ifdef FEATURE_CLIENT_TAGS
+#include "client-tags.h"
+#endif
const char jcc_h_rcs[] = JCC_H_VERSION;
const char project_h_rcs[] = PROJECT_H_VERSION;
const char jcc_h_rcs[] = JCC_H_VERSION;
const char project_h_rcs[] = PROJECT_H_VERSION;
@@
-185,6
+188,9
@@
privoxy_mutex_t connection_reuse_mutex;
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_t external_filter_mutex;
#endif
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_t external_filter_mutex;
#endif
+#ifdef FEATURE_CLIENT_TAGS
+privoxy_mutex_t client_tags_mutex;
+#endif
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R)
privoxy_mutex_t resolver_mutex;
#if !defined(HAVE_GETHOSTBYADDR_R) || !defined(HAVE_GETHOSTBYNAME_R)
privoxy_mutex_t resolver_mutex;
@@
-1842,6
+1848,9
@@
static void chat(struct client_state *csp)
http = csp->http;
http = csp->http;
+#if FEATURE_CLIENT_TAGS
+ get_tag_list_for_client(csp->client_tags, csp->ip_addr_str);
+#endif
if (receive_client_request(csp) != JB_ERR_OK)
{
return;
if (receive_client_request(csp) != JB_ERR_OK)
{
return;
@@
-2813,6
+2822,9
@@
static void prepare_csp_for_next_request(struct client_state *csp)
free_http_request(csp->http);
destroy_list(csp->headers);
destroy_list(csp->tags);
free_http_request(csp->http);
destroy_list(csp->headers);
destroy_list(csp->tags);
+#ifdef FEATURE_CLIENT_TAGS
+ destroy_list(csp->client_tags);
+#endif
free_current_action(csp->action);
if (NULL != csp->fwd)
{
free_current_action(csp->action);
if (NULL != csp->fwd)
{
@@
-3246,6
+3258,9
@@
static void initialize_mutexes(void)
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_init(&external_filter_mutex);
#endif
#ifdef FEATURE_EXTERNAL_FILTERS
privoxy_mutex_init(&external_filter_mutex);
#endif
+#ifdef FEATURE_CLIENT_TAGS
+ privoxy_mutex_init(&client_tags_mutex);
+#endif
/*
* XXX: The assumptions below are a bit naive
/*
* XXX: The assumptions below are a bit naive