X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=02259d8a5c1b9d98371cc80fda394ab323c7912c;hp=48554aadecc2a4afde84d7b8a2c3638164af7f10;hb=0a8865e0da215820eeb4f691f0d5f0de4b8896dc;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232
diff --git a/filters.c b/filters.c
index 48554aad..02259d8a 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.49 2002/03/16 20:29:14 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.55 2002/04/02 16:13:51 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -12,7 +12,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.49 2002/03/16 20:29:14 oes Exp $"
* 'ijb_send_banner', and `trust_url'
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * Privoxy team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -38,6 +38,24 @@ const char filters_rcs[] = "$Id: filters.c,v 1.49 2002/03/16 20:29:14 oes Exp $"
*
* Revisions :
* $Log: filters.c,v $
+ * Revision 1.55 2002/04/02 16:13:51 oes
+ * Fix: No "Go there anyway" for SSL
+ *
+ * Revision 1.54 2002/04/02 14:55:56 oes
+ * Bugfix: is_untrusted_url() now depends on FEATURE_TRUST, not FEATURE_COOKIE_JAR
+ *
+ * Revision 1.53 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * Revision 1.52 2002/03/24 16:35:57 jongfoster
+ * Removing logo
+ *
+ * Revision 1.51 2002/03/24 15:23:33 jongfoster
+ * Name changes
+ *
+ * Revision 1.50 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
* Revision 1.49 2002/03/16 20:29:14 oes
* Cosmetics
*
@@ -687,15 +705,15 @@ struct http_response *block_url(struct client_state *csp)
#if 1 /* Two alternative strategies, use this one for now: */
/* and handle accordingly: */
- if ((p == NULL) || (0 == strcmpic(p, "logo")))
+ if ((p == NULL) || (0 == strcmpic(p, "pattern")))
{
- rsp->body = bindup(image_logo_data, image_logo_length);
+ rsp->body = bindup(image_pattern_data, image_pattern_length);
if (rsp->body == NULL)
{
free_http_response(rsp);
return cgi_error_memory();
}
- rsp->content_length = image_logo_length;
+ rsp->content_length = image_pattern_length;
if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
{
@@ -721,26 +739,9 @@ struct http_response *block_url(struct client_state *csp)
}
}
- else if (0 == strcmpic(p, "pattern"))
- {
- rsp->body = bindup(image_pattern_data, image_pattern_length);
- if (rsp->body == NULL)
- {
- free_http_response(rsp);
- return cgi_error_memory();
- }
- rsp->content_length = image_pattern_length;
-
- if (enlist_unique_header(rsp->headers, "Content-Type", BUILTIN_IMAGE_MIMETYPE))
- {
- free_http_response(rsp);
- return cgi_error_memory();
- }
- }
-
else
{
- rsp->status = strdup("302 Local Redirect from Junkbuster");
+ rsp->status = strdup("302 Local Redirect from Privoxy");
if (rsp->status == NULL)
{
free_http_response(rsp);
@@ -757,19 +758,15 @@ struct http_response *block_url(struct client_state *csp)
#else /* Following code is disabled for now */
/* and handle accordingly: */
- if ((p == NULL) || (0 == strcmpic(p, "logo")))
+ if ((p == NULL) || (0 == strcmpic(p, "pattern")))
{
- p = CGI_PREFIX "send-banner?type=logo";
+ p = CGI_PREFIX "send-banner?type=pattern";
}
else if (0 == strcmpic(p, "blank"))
{
p = CGI_PREFIX "send-banner?type=blank";
}
- else if (0 == strcmpic(p, "pattern"))
- {
- p = CGI_PREFIX "send-banner?type=pattern";
- }
- rsp->status = strdup("302 Local Redirect from Junkbuster");
+ rsp->status = strdup("302 Local Redirect from Privoxy");
if (rsp->status == NULL)
{
free_http_response(rsp);
@@ -827,10 +824,13 @@ struct http_response *block_url(struct client_state *csp)
#ifdef FEATURE_FORCE_LOAD
err = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else /* ifndef FEATURE_FORCE_LOAD */
- err = map_block_killer(exports, "force-support");
+ if (csp->http->ssl != 0)
#endif /* ndef FEATURE_FORCE_LOAD */
+ {
+ err = map_block_killer(exports, "force-support");
+ }
+ if (!err) err = map(exports, "protocol", 1, csp->http->ssl ? "https://" : "http://", 1);
if (!err) err = map(exports, "hostport", 1, html_encode(csp->http->hostport), 0);
if (!err) err = map(exports, "path", 1, html_encode(csp->http->path), 0);
@@ -902,9 +902,10 @@ struct http_response *trust_url(struct client_state *csp)
}
/*
- * Export the host, port, and referrer information
+ * Export the protocol, host, port, and referrer information
*/
err = map(exports, "hostport", 1, csp->http->hostport, 1);
+ if (!err) err = map(exports, "protocol", 1, csp->http->ssl ? "https://" : "http://", 1);
if (!err) err = map(exports, "path", 1, csp->http->path, 1);
if (NULL != (p = get_header_value(csp->headers, "Referer:")))
@@ -951,7 +952,7 @@ struct http_response *trust_url(struct client_state *csp)
p = strdup("");
for (l = csp->config->trust_info->first; l ; l = l->next)
{
- sprintf(buf, " %s
\n",l->str, l->str);
+ sprintf(buf, " %s
\n",l->str, l->str);
string_append(&p, buf);
}
err = map(exports, "trust-info", 1, p, 0);
@@ -1042,7 +1043,7 @@ struct http_response *redirect_url(struct client_state *csp)
}
if ( enlist_unique_header(rsp->headers, "Location", q)
- || (NULL == (rsp->status = strdup("302 Local Redirect from Junkbuster"))) )
+ || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))) )
{
free_http_response(rsp);
return cgi_error_memory();
@@ -1105,7 +1106,7 @@ int is_imageurl(struct client_state *csp)
#endif /* def FEATURE_IMAGE_BLOCKING */
-#ifdef FEATURE_COOKIE_JAR
+#ifdef FEATURE_TRUST
/*********************************************************************
*
* Function : is_untrusted_url
@@ -1159,15 +1160,10 @@ int is_untrusted_url(struct client_state *csp)
return 1;
}
- /*
- * If not, do we maybe trust its referrer?
- */
-
/*
- * Parse the URL from the referrer
+ * If not, do we maybe trust its referrer?
*/
-
err = parse_http_url(referer, rhttp, csp);
if (err)
{
@@ -1229,7 +1225,7 @@ int is_untrusted_url(struct client_state *csp)
}
return 1;
}
-#endif /* def FEATURE_COOKIE_JAR */
+#endif /* def FEATURE_TRUST */
/*********************************************************************