X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=inline;f=filters.c;h=c9448fd2290204135474c513ec9bcc9fa7e0ff83;hb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba;hp=53748f109d1d88345c922f1a2fe3a363111b724d;hpb=e23257d162f842b41571671c70bc141b0c1399b4;p=privoxy.git

diff --git a/filters.c b/filters.c
index 53748f10..c9448fd2 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.20 2001/07/01 17:01:04 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.25 2001/07/26 10:09:46 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -38,6 +38,28 @@ const char filters_rcs[] = "$Id: filters.c,v 1.20 2001/07/01 17:01:04 oes Exp $"
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.25  2001/07/26 10:09:46  oes
+ *    Made browser detection a little less naive
+ *
+ *    Revision 1.24  2001/07/25 17:22:51  oes
+ *    Added workaround for Netscape bug that prevents display of page when loading a component fails.
+ *
+ *    Revision 1.23  2001/07/23 13:40:12  oes
+ *    Fixed bug that caused document body to be dropped when pcrs joblist was empty.
+ *
+ *    Revision 1.22  2001/07/18 12:29:34  oes
+ *    - Made gif_deanimate_response respect
+ *      csp->action->string[ACTION_STRING_DEANIMATE]
+ *    - Logging cosmetics
+ *
+ *    Revision 1.21  2001/07/13 13:59:53  oes
+ *     - Introduced gif_deanimate_response which shares the
+ *       generic content modification interface of pcrs_filter_response
+ *       and acts as a wrapper to deanimate.c:gif_deanimate()
+ *     - Renamed re_process_buffer to pcrs_filter_response
+ *     - pcrs_filter_response now returns NULL on failiure
+ *     - Removed all #ifdef PCRS
+ *
  *    Revision 1.20  2001/07/01 17:01:04  oes
  *    Added comments and missing return statement in is_untrusted_url()
  *
@@ -267,7 +289,7 @@ const char filters_h_rcs[] = FILTERS_H_VERSION;
 #define ijb_isdigit(__X) isdigit((int)(unsigned char)(__X))
 
 
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
 /*********************************************************************
  *
  * Function    :  block_acl
@@ -401,7 +423,7 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
    return(0);
 
 }
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
 
 
 /*********************************************************************
@@ -418,7 +440,9 @@ int acl_addr(char *aspec, struct access_control_addr *aca)
  *********************************************************************/
 struct http_response *block_url(struct client_state *csp)
 {
+#ifdef FEATURE_IMAGE_BLOCKING
    char *p;
+#endif /* def FEATURE_IMAGE_BLOCKING */
    struct http_response *rsp;
    struct map *exports = NULL;
 
@@ -442,7 +466,7 @@ struct http_response *block_url(struct client_state *csp)
     * If it's an image-url, send back an image or redirect
     * as specified by the relevant +image action
     */
-#ifdef IMAGE_BLOCKING
+#ifdef FEATURE_IMAGE_BLOCKING
    if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
         && is_imageurl(csp))
    {
@@ -471,7 +495,7 @@ struct http_response *block_url(struct client_state *csp)
       }
    }  
    else
-#endif /* def IMAGE_BLOCKING */
+#endif /* def FEATURE_IMAGE_BLOCKING */
 
    /* 
     * Else, generate an HTML "blocked" message:
@@ -479,11 +503,11 @@ struct http_response *block_url(struct client_state *csp)
    {
 
       exports = default_exports(csp, NULL);	   
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
       exports = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else
+#else /* ifndef FEATURE_FORCE_LOAD */
       exports = map_block_killer(exports, "force-support");
-#endif /* ndef FORCE_LOAD */
+#endif /* ndef FEATURE_FORCE_LOAD */
 
       exports = map(exports, "hostport", 1, csp->http->hostport, 1);
       exports = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
@@ -493,7 +517,24 @@ struct http_response *block_url(struct client_state *csp)
       rsp->body = fill_template(csp, "blocked", exports);
       free_map(exports);
   
-      rsp->status = strdup("403 Request for blocked URL"); 
+      /*
+       * Workaround for stupid Netscape bug which prevents
+       * pages from being displayed if loading a referenced
+       * JavaScript or style sheet fails. So make it appear
+       * as if it succeeded.
+       */
+      if (csp->http->user_agent
+          && !strncmpic(csp->http->user_agent, "mozilla", 7)
+          && !strstr(csp->http->user_agent, "compatible")
+          && !strstr(csp->http->user_agent, "Opera"))
+      {
+         rsp->status = strdup("200 Request for blocked URL"); 
+      }
+      else
+      {
+         rsp->status = strdup("404 Request for blocked URL"); 
+      }
+
    }
 
    return(finish_http_response(rsp));
@@ -501,7 +542,7 @@ struct http_response *block_url(struct client_state *csp)
 }
 
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
 /*********************************************************************
  *
  * Function    :  trust_url FIXME: I should be called distrust_url
@@ -591,11 +632,11 @@ struct http_response *trust_url(struct client_state *csp)
    /*
     * Export the force prefix or the force conditional block killer
     */
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
    exports = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else
+#else /* ifndef FEATURE_FORCE_LOAD */
    exports = map_block_killer(exports, "force-support");
-#endif /* ndef FORCE_LOAD */
+#endif /* ndef FEATURE_FORCE_LOAD */
 
    /*
     * Build the response
@@ -606,10 +647,10 @@ struct http_response *trust_url(struct client_state *csp)
    return(finish_http_response(rsp));
 
 }
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
 
-#ifdef FAST_REDIRECTS
+#ifdef FEATURE_FAST_REDIRECTS
 /*********************************************************************
  *
  * Function    :  redirect_url
@@ -662,18 +703,18 @@ struct http_response *redirect_url(struct client_state *csp)
    }
 
 }
-#endif /* def FAST_REDIRECTS */
+#endif /* def FEATURE_FAST_REDIRECTS */
 
 
-#ifdef IMAGE_BLOCKING
+#ifdef FEATURE_IMAGE_BLOCKING
 /*********************************************************************
  *
  * Function    :  is_imageurl
  *
  * Description :  Given a URL, decide whether it is an image or not,
  *                using either the info from a previous +image action
- *                or, #ifdef DETECT_MSIE_IMAGES, the info from the
- *                browser's accept header.
+ *                or, #ifdef FEATURE_IMAGE_DETECT_MSIE, the info from
+ *                the browser's accept header.
  *                
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -684,7 +725,7 @@ struct http_response *redirect_url(struct client_state *csp)
  *********************************************************************/
 int is_imageurl(struct client_state *csp)
 {
-#ifdef DETECT_MSIE_IMAGES
+#ifdef FEATURE_IMAGE_DETECT_MSIE
    if ((csp->accept_types 
        & (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE|ACCEPT_TYPE_MSIE_HTML))
        == (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE))
@@ -697,15 +738,15 @@ int is_imageurl(struct client_state *csp)
    {
       return 0;
    }
-#endif
+#endif /* def FEATURE_IMAGE_DETECT_MSIE */
 
    return ((csp->action->flags & ACTION_IMAGE) != 0);
 
 }
-#endif /* def IMAGE_BLOCKING */
+#endif /* def FEATURE_IMAGE_BLOCKING */
 
 
-#ifdef TRUST_FILES
+#ifdef FEATURE_COOKIE_JAR
 /*********************************************************************
  *
  * Function    :  is_untrusted_url
@@ -867,7 +908,7 @@ int is_untrusted_url(struct client_state *csp)
    }
    return(1);
 }
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_COOKIE_JAR */
 
 
 /*********************************************************************
@@ -909,6 +950,12 @@ char *pcrs_filter_response(struct client_state *csp)
       return(NULL);
    }
 
+   if ( NULL == b->joblist )
+   {
+      log_error(LOG_LEVEL_RE_FILTER, "Empty joblist. Nothing to do.");
+      return(NULL);
+   }
+
    log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) ...",
               csp->http->hostport, csp->http->path, size);
 
@@ -955,16 +1002,16 @@ char *gif_deanimate_response(struct client_state *csp)
    if (  (NULL == (in =  (struct binbuffer *)zalloc(sizeof *in )))
       || (NULL == (out = (struct binbuffer *)zalloc(sizeof *out))) )
    {
-      log_error(LOG_LEVEL_DEANIMATE, "failed! (No Mem!)");
+      log_error(LOG_LEVEL_DEANIMATE, "failed! (no mem)");
       return NULL;
    }
 
    in->buffer = csp->iob->cur;
    in->size = size;
 
-   if (gif_deanimate(in, out))
+   if (gif_deanimate(in, out, strncmp("last", csp->action->string[ACTION_STRING_DEANIMATE], 4)))
    {
-      log_error(LOG_LEVEL_DEANIMATE, "failed! (size %d)", size);
+      log_error(LOG_LEVEL_DEANIMATE, "failed! (gif parsing)");
       free(in);
       buf_free(out);
       return(NULL);