Fixing stupid bug now I've figured out what || means.

(It always returns 0 or 1, not one of it's paramaters.)

diff --git a/actions.c b/actions.c
index ee1f6a5..13a6241 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.17 2001/10/25 03:40:47 david__schmidt Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.18 2001/11/07 00:06:06 steudten Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $


@@ -33,6 +33,10 @@ const char actions_rcs[] = "$Id: actions.c,v 1.17 2001/10/25 03:40:47 david__sch
  *
  * Revisions   :
  *    $Log: actions.c,v $
  *
  * Revisions   :
  *    $Log: actions.c,v $

+ *    Revision 1.18  2001/11/07 00:06:06  steudten
+ *    Add line number in error output for lineparsing for
+ *    actionsfile.
+ *

  *    Revision 1.17  2001/10/25 03:40:47  david__schmidt
  *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
  *    threads to call select() simultaneously.  So, it's time to do a real, live,
  *    Revision 1.17  2001/10/25 03:40:47  david__schmidt
  *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
  *    threads to call select() simultaneously.  So, it's time to do a real, live,


@@ -112,6 +116,7 @@ const char actions_rcs[] = "$Id: actions.c,v 1.17 2001/10/25 03:40:47 david__sch
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

+#include <stdlib.h>

 
 #include "project.h"
 #include "jcc.h"
 
 #include "project.h"
 #include "jcc.h"


@@ -251,7 +256,7 @@ jb_err merge_actions (struct action_spec *dest,
          /* No "remove all"s to worry about. */
          list_remove_list(dest->multi_add[i], src->multi_remove[i]);
          err = list_append_list_unique(dest->multi_remove[i], src->multi_remove[i]);
          /* No "remove all"s to worry about. */
          list_remove_list(dest->multi_add[i], src->multi_remove[i]);
          err = list_append_list_unique(dest->multi_remove[i], src->multi_remove[i]);

-         err = err || list_append_list_unique(dest->multi_add[i], src->multi_add[i]);
+         if (!err) err = list_append_list_unique(dest->multi_add[i], src->multi_add[i]);

       }
 
       if (err)
       }
 
       if (err)


@@ -308,8 +313,12 @@ jb_err copy_action (struct action_spec *dest,
    for (i = 0; i < ACTION_MULTI_COUNT; i++)
    {
       dest->multi_remove_all[i] = src->multi_remove_all[i];
    for (i = 0; i < ACTION_MULTI_COUNT; i++)
    {
       dest->multi_remove_all[i] = src->multi_remove_all[i];

-      err =        list_duplicate(dest->multi_remove[i], src->multi_remove[i]);
-      err = err || list_duplicate(dest->multi_add[i],    src->multi_add[i]);
+      err = list_duplicate(dest->multi_remove[i], src->multi_remove[i]);
+      if (err)
+      {
+         return err;
+      }
+      err = list_duplicate(dest->multi_add[i],    src->multi_add[i]);

       if (err)
       {
          return err;
       if (err)
       {
          return err;

diff --git a/cgisimple.c b/cgisimple.c
index bc0131b..851e0fc 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.6 2001/10/14 22:00:32 jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.7 2001/10/23 21:48:19 jongfoster Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $


@@ -36,6 +36,18 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.6 2001/10/14 22:00:32 jongfos
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $

+ *    Revision 1.7  2001/10/23 21:48:19  jongfoster
+ *    Cleaning up error handling in CGI functions - they now send back
+ *    a HTML error page and should never cause a FATAL error.  (Fixes one
+ *    potential source of "denial of service" attacks).
+ *
+ *    CGI actions file editor that works and is actually useful.
+ *
+ *    Ability to toggle JunkBuster remotely using a CGI call.
+ *
+ *    You can turn off both the above features in the main configuration
+ *    file, e.g. if you are running a multi-user proxy.
+ *

  *    Revision 1.6  2001/10/14 22:00:32  jongfoster
  *    Adding support for a 404 error when an invalid CGI page is requested.
  *
  *    Revision 1.6  2001/10/14 22:00:32  jongfoster
  *    Adding support for a 404 error when an invalid CGI page is requested.
  *


@@ -509,7 +521,7 @@ jb_err cgi_show_status(struct client_state *csp,
    }
 
    err = map(exports, "options", 1, csp->config->proxy_args, 1);
    }
 
    err = map(exports, "options", 1, csp->config->proxy_args, 1);

-   err = err || show_defines(exports);
+   if (!err) err = show_defines(exports);

 
 #ifdef FEATURE_STATISTICS
    local_urls_read     = urls_read;
 
 #ifdef FEATURE_STATISTICS
    local_urls_read     = urls_read;


@@ -527,23 +539,23 @@ jb_err cgi_show_status(struct client_state *csp,
 
    if (local_urls_read == 0)
    {
 
    if (local_urls_read == 0)
    {

-      err = err || map_block_killer(exports, "have-stats");
+      if (!err) err = map_block_killer(exports, "have-stats");

    }
    else
    {
    }
    else
    {

-      err = err || map_block_killer(exports, "have-no-stats");
+      if (!err) err = map_block_killer(exports, "have-no-stats");

 
       perc_rej = (float)local_urls_rejected * 100.0F /
             (float)local_urls_read;
 
       sprintf(buf, "%d", local_urls_read);
 
       perc_rej = (float)local_urls_rejected * 100.0F /
             (float)local_urls_read;
 
       sprintf(buf, "%d", local_urls_read);

-      err = err || map(exports, "requests-received", 1, buf, 1);
+      if (!err) err = map(exports, "requests-received", 1, buf, 1);

 
       sprintf(buf, "%d", local_urls_rejected);
 
       sprintf(buf, "%d", local_urls_rejected);

-      err = err || map(exports, "requests-blocked", 1, buf, 1);
+      if (!err) err = map(exports, "requests-blocked", 1, buf, 1);

 
       sprintf(buf, "%6.2f", perc_rej);
 
       sprintf(buf, "%6.2f", perc_rej);

-      err = err || map(exports, "percent-blocked", 1, buf, 1);
+      if (!err) err = map(exports, "percent-blocked", 1, buf, 1);

    }
 
 #else /* ndef FEATURE_STATISTICS */
    }
 
 #else /* ndef FEATURE_STATISTICS */


@@ -552,33 +564,33 @@ jb_err cgi_show_status(struct client_state *csp,
 
    if (csp->actions_list)
    {
 
    if (csp->actions_list)
    {

-      err = err || map(exports, "actions-filename", 1,  csp->actions_list->filename, 1);
+      if (!err) err = map(exports, "actions-filename", 1,  csp->actions_list->filename, 1);

    }
    else
    {
    }
    else
    {

-      err = err || map(exports, "actions-filename", 1, "None specified", 1);
+      if (!err) err = map(exports, "actions-filename", 1, "None specified", 1);

    }
 
    if (csp->rlist)
    {
    }
 
    if (csp->rlist)
    {

-      err = err || map(exports, "re-filter-filename", 1,  csp->rlist->filename, 1);
+      if (!err) err = map(exports, "re-filter-filename", 1,  csp->rlist->filename, 1);

    }
    else
    {
    }
    else
    {

-      err = err || map(exports, "re-filter-filename", 1, "None specified", 1);
+      if (!err) err = map(exports, "re-filter-filename", 1, "None specified", 1);

    }
 
 #ifdef FEATURE_TRUST
    if (csp->tlist)
    {
    }
 
 #ifdef FEATURE_TRUST
    if (csp->tlist)
    {

-      err = err || map(exports, "trust-filename", 1,  csp->tlist->filename, 1);
+      if (!err) err = map(exports, "trust-filename", 1,  csp->tlist->filename, 1);

    }
    else
    {
    }
    else
    {

-      err = err || map(exports, "trust-filename", 1, "None specified", 1);
+      if (!err) err = map(exports, "trust-filename", 1, "None specified", 1);

    }
 #else
    }
 #else

-   err = err || map_block_killer(exports, "trust-support");
+   if (!err) err = map_block_killer(exports, "trust-support");

 #endif /* ndef FEATURE_TRUST */
 
    if (err)
 #endif /* ndef FEATURE_TRUST */
 
    if (err)


@@ -874,7 +886,7 @@ jb_err cgi_robots_txt(struct client_state *csp,
    rsp->is_static = 1;
 
    get_http_time(7 * 24 * 60 * 60, buf); /* 7 days into future */
    rsp->is_static = 1;
 
    get_http_time(7 * 24 * 60 * 60, buf); /* 7 days into future */

-   err = err || enlist_unique_header(rsp->headers, "Expires", buf);
+   if (!err) err = enlist_unique_header(rsp->headers, "Expires", buf);

 
    return (err ? JB_ERR_MEMORY : JB_ERR_OK);
 }
 
    return (err ? JB_ERR_MEMORY : JB_ERR_OK);
 }


@@ -899,96 +911,96 @@ static jb_err show_defines(struct map *exports)
    jb_err err = JB_ERR_OK;
 
 #ifdef FEATURE_ACL
    jb_err err = JB_ERR_OK;
 
 #ifdef FEATURE_ACL

-   err = err || map_conditional(exports, "FEATURE_ACL", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_ACL", 1);

 #else /* ifndef FEATURE_ACL */
 #else /* ifndef FEATURE_ACL */

-   err = err || map_conditional(exports, "FEATURE_ACL", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_ACL", 0);

 #endif /* ndef FEATURE_ACL */
 
 #ifdef FEATURE_COOKIE_JAR
 #endif /* ndef FEATURE_ACL */
 
 #ifdef FEATURE_COOKIE_JAR

-   err = err || map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 1);

 #else /* ifndef FEATURE_COOKIE_JAR */
 #else /* ifndef FEATURE_COOKIE_JAR */

-   err = err || map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 0);

 #endif /* ndef FEATURE_COOKIE_JAR */
 
 #ifdef FEATURE_FAST_REDIRECTS
 #endif /* ndef FEATURE_COOKIE_JAR */
 
 #ifdef FEATURE_FAST_REDIRECTS

-   err = err || map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);

 #else /* ifndef FEATURE_FAST_REDIRECTS */
 #else /* ifndef FEATURE_FAST_REDIRECTS */

-   err = err || map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);

 #endif /* ndef FEATURE_FAST_REDIRECTS */
 
 #ifdef FEATURE_FORCE_LOAD
 #endif /* ndef FEATURE_FAST_REDIRECTS */
 
 #ifdef FEATURE_FORCE_LOAD

-   err = err || map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 1);

 #else /* ifndef FEATURE_FORCE_LOAD */
 #else /* ifndef FEATURE_FORCE_LOAD */

-   err = err || map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_FORCE_LOAD", 0);

 #endif /* ndef FEATURE_FORCE_LOAD */
 
 #ifdef FEATURE_IMAGE_BLOCKING
 #endif /* ndef FEATURE_FORCE_LOAD */
 
 #ifdef FEATURE_IMAGE_BLOCKING

-   err = err || map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);

 #else /* ifndef FEATURE_IMAGE_BLOCKING */
 #else /* ifndef FEATURE_IMAGE_BLOCKING */

-   err = err || map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 0);

 #endif /* ndef FEATURE_IMAGE_BLOCKING */
 
 #ifdef FEATURE_IMAGE_DETECT_MSIE
 #endif /* ndef FEATURE_IMAGE_BLOCKING */
 
 #ifdef FEATURE_IMAGE_DETECT_MSIE

-   err = err || map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);

 #else /* ifndef FEATURE_IMAGE_DETECT_MSIE */
 #else /* ifndef FEATURE_IMAGE_DETECT_MSIE */

-   err = err || map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);

 #endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
 
 #ifdef FEATURE_KILL_POPUPS
 #endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
 
 #ifdef FEATURE_KILL_POPUPS

-   err = err || map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 1);

 #else /* ifndef FEATURE_KILL_POPUPS */
 #else /* ifndef FEATURE_KILL_POPUPS */

-   err = err || map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 0);

 #endif /* ndef FEATURE_KILL_POPUPS */
 
 #ifdef FEATURE_PTHREAD
 #endif /* ndef FEATURE_KILL_POPUPS */
 
 #ifdef FEATURE_PTHREAD

-   err = err || map_conditional(exports, "FEATURE_PTHREAD", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 1);

 #else /* ifndef FEATURE_PTHREAD */
 #else /* ifndef FEATURE_PTHREAD */

-   err = err || map_conditional(exports, "FEATURE_PTHREAD", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_PTHREAD", 0);

 #endif /* ndef FEATURE_PTHREAD */
 
 #ifdef FEATURE_STATISTICS
 #endif /* ndef FEATURE_PTHREAD */
 
 #ifdef FEATURE_STATISTICS

-   err = err || map_conditional(exports, "FEATURE_STATISTICS", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_STATISTICS", 1);

 #else /* ifndef FEATURE_STATISTICS */
 #else /* ifndef FEATURE_STATISTICS */

-   err = err || map_conditional(exports, "FEATURE_STATISTICS", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_STATISTICS", 0);

 #endif /* ndef FEATURE_STATISTICS */
 
 #ifdef FEATURE_TOGGLE
 #endif /* ndef FEATURE_STATISTICS */
 
 #ifdef FEATURE_TOGGLE

-   err = err || map_conditional(exports, "FEATURE_TOGGLE", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_TOGGLE", 1);

 #else /* ifndef FEATURE_TOGGLE */
 #else /* ifndef FEATURE_TOGGLE */

-   err = err || map_conditional(exports, "FEATURE_TOGGLE", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_TOGGLE", 0);

 #endif /* ndef FEATURE_TOGGLE */
 
 #ifdef FEATURE_TRUST
 #endif /* ndef FEATURE_TOGGLE */
 
 #ifdef FEATURE_TRUST

-   err = err || map_conditional(exports, "FEATURE_TRUST", 1);
+   if (!err) err = map_conditional(exports, "FEATURE_TRUST", 1);

 #else /* ifndef FEATURE_TRUST */
 #else /* ifndef FEATURE_TRUST */

-   err = err || map_conditional(exports, "FEATURE_TRUST", 0);
+   if (!err) err = map_conditional(exports, "FEATURE_TRUST", 0);

 #endif /* ndef FEATURE_TRUST */
 
 #ifdef REGEX_GNU
 #endif /* ndef FEATURE_TRUST */
 
 #ifdef REGEX_GNU

-   err = err || map_conditional(exports, "REGEX_GNU", 1);
+   if (!err) err = map_conditional(exports, "REGEX_GNU", 1);

 #else /* ifndef REGEX_GNU */
 #else /* ifndef REGEX_GNU */

-   err = err || map_conditional(exports, "REGEX_GNU", 0);
+   if (!err) err = map_conditional(exports, "REGEX_GNU", 0);

 #endif /* def REGEX_GNU */
 
 #ifdef REGEX_PCRE
 #endif /* def REGEX_GNU */
 
 #ifdef REGEX_PCRE

-   err = err || map_conditional(exports, "REGEX_PCRE", 1);
+   if (!err) err = map_conditional(exports, "REGEX_PCRE", 1);

 #else /* ifndef REGEX_PCRE */
 #else /* ifndef REGEX_PCRE */

-   err = err || map_conditional(exports, "REGEX_PCRE", 0);
+   if (!err) err = map_conditional(exports, "REGEX_PCRE", 0);

 #endif /* def REGEX_PCRE */
 
 #ifdef STATIC_PCRE
 #endif /* def REGEX_PCRE */
 
 #ifdef STATIC_PCRE

-   err = err || map_conditional(exports, "STATIC_PCRE", 1);
+   if (!err) err = map_conditional(exports, "STATIC_PCRE", 1);

 #else /* ifndef STATIC_PCRE */
 #else /* ifndef STATIC_PCRE */

-   err = err || map_conditional(exports, "STATIC_PCRE", 0);
+   if (!err) err = map_conditional(exports, "STATIC_PCRE", 0);

 #endif /* ndef STATIC_PCRE */
 
 #ifdef STATIC_PCRS
 #endif /* ndef STATIC_PCRE */
 
 #ifdef STATIC_PCRS

-   err = err || map_conditional(exports, "STATIC_PCRS", 1);
+   if (!err) err = map_conditional(exports, "STATIC_PCRS", 1);

 #else /* ifndef STATIC_PCRS */
 #else /* ifndef STATIC_PCRS */

-   err = err || map_conditional(exports, "STATIC_PCRS", 0);
+   if (!err) err = map_conditional(exports, "STATIC_PCRS", 0);

 #endif /* ndef STATIC_PCRS */
 
 #endif /* ndef STATIC_PCRS */
 

-   err = err || map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
+   if (!err) err = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);

 
    return err;
 }
 
    return err;
 }

diff --git a/filters.c b/filters.c
index 309aca3..be4bf47 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.40 2001/10/26 17:34:17 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.40 2001/10/26 17:37:55 oes Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $


@@ -38,6 +38,14 @@ const char filters_rcs[] = "$Id: filters.c,v 1.40 2001/10/26 17:34:17 oes Exp $"
  *
  * Revisions   :
  *    $Log: filters.c,v $
  *
  * Revisions   :
  *    $Log: filters.c,v $

+ *    Revision 1.40  2001/10/26 17:37:55  oes
+ *    - Re-enabled Netscape 200/404 bug workaround in block_url():
+ *      - Removed OS/2 special case
+ *      - Made block_url() independant from sed() having been run
+ *    - Made trust_url independant from sed() having been run
+ *    - Made is_imageurl independant from sed() having been run.
+ *      It now checks User-Agent: and Accept: by itself.
+ *

  *
  *    Revision 1.39  2001/10/25 03:40:48  david__schmidt
  *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple
  *
  *    Revision 1.39  2001/10/25 03:40:48  david__schmidt
  *    Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple


@@ -729,10 +737,10 @@ struct http_response *block_url(struct client_state *csp)
       err = map_block_killer(exports, "force-support");
 #endif /* ndef FEATURE_FORCE_LOAD */
 
       err = map_block_killer(exports, "force-support");
 #endif /* ndef FEATURE_FORCE_LOAD */
 

-      err = err || map(exports, "hostport", 1, csp->http->hostport, 1);
-      err = err || map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
-      err = err || map(exports, "path", 1, csp->http->path, 1);
-      err = err || map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+      if (!err) err = map(exports, "hostport", 1, csp->http->hostport, 1);
+      if (!err) err = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
+      if (!err) err = map(exports, "path", 1, csp->http->path, 1);
+      if (!err) err = map(exports, "path-html", 1, html_encode(csp->http->path), 0);

 
       if (err)
       {
 
       if (err)
       {


@@ -804,20 +812,20 @@ struct http_response *trust_url(struct client_state *csp)
    /*
     * Export the host, port, and referrer information
     */
    /*
     * Export the host, port, and referrer information
     */

-   err = map(exports, "hostport", 1, csp->http->hostport, 1)
-      || map(exports, "path", 1, csp->http->path, 1)
-      || map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0)
-      || map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+   err = map(exports, "hostport", 1, csp->http->hostport, 1);
+   if (!err) err = map(exports, "path", 1, csp->http->path, 1);
+   if (!err) err = map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
+   if (!err) err = map(exports, "path-html", 1, html_encode(csp->http->path), 0);

 
    if (NULL != (p = get_header_value(csp->headers, "Referer:")))
    {
 
    if (NULL != (p = get_header_value(csp->headers, "Referer:")))
    {

-      err = err || map(exports, "referrer", 1, p, 1);
-      err = err || map(exports, "referrer-html", 1, html_encode(p), 0);
+      if (!err) err = map(exports, "referrer", 1, p, 1);
+      if (!err) err = map(exports, "referrer-html", 1, html_encode(p), 0);

    }
    else
    {
    }
    else
    {

-      err = err || map(exports, "referrer", 1, "unknown", 1);
-      err = err || map(exports, "referrer-html", 1, "unknown", 1);
+      if (!err) err = map(exports, "referrer", 1, "unknown", 1);
+      if (!err) err = map(exports, "referrer-html", 1, "unknown", 1);

    }
 
    if (err)
    }
 
    if (err)