X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=638d787f2febaa9a193b4c8c9eebe71f3c4d83e3;hp=c2983e300f0ae591a6ae67ba4c665e1ae1ad0e62;hb=e17b6feae14ffe8347306e820d5fd26a1daa841e;hpb=19ec21616f979bd3893bdf3729d1f85ef90f9586 diff --git a/cgisimple.c b/cgisimple.c index c2983e30..638d787f 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.145 2017/01/23 13:05:12 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.148 2017/03/08 13:13:18 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -345,6 +345,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, jb_err err = JB_ERR_OK; char *client_tag_status; char buf[1000]; + time_t refresh_delay; assert(csp); assert(rsp); @@ -397,6 +398,24 @@ jb_err cgi_show_client_tags(struct client_state *csp, } if (!err) err = string_append(&client_tag_status, "\n"); } + refresh_delay = get_next_tag_timeout_for_client(csp->client_address); + if (refresh_delay != 0) + { + snprintf(buf, sizeof(buf), "%d", csp->config->client_tag_lifetime); + if (map(exports, "refresh-delay", 1, buf, 1)) + { + free_map(exports); + return JB_ERR_MEMORY; + } + } + else + { + err = map_block_killer(exports, "tags-expire"); + if (err != JB_ERR_OK) + { + return err; + } + } if (map(exports, "client-tags", 1, client_tag_status, 0)) { @@ -1820,6 +1839,14 @@ static jb_err show_defines(struct map *exports) 1, #else 0, +#endif + }, + { + "FEATURE_EXTERNAL_FILTERS", +#ifdef FEATURE_EXTERNAL_FILTERS + 1, +#else + 0, #endif }, { @@ -1852,14 +1879,6 @@ static jb_err show_defines(struct map *exports) 1, #else 0, -#endif - }, - { - "FEATURE_IMAGE_DETECT_MSIE", -#ifdef FEATURE_IMAGE_DETECT_MSIE - 1, -#else - 0, #endif }, {