Garbage-collect csp->my_ip_addr_str and csp->my_hostname.

diff --git a/loaders.c b/loaders.c
index 2899f30..9667c1c 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.64 2007/06/01 14:12:38 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.65 2007/12/07 18:29:23 fabiankeil Exp $";

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


@@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.64 2007/06/01 14:12:38 fabiankeil
  *
  * Revisions   :
  *    $Log: loaders.c,v $
  *
  * Revisions   :
  *    $Log: loaders.c,v $

+ *    Revision 1.65  2007/12/07 18:29:23  fabiankeil
+ *    Remove now-obsolete csp member x_forwarded.
+ *

  *    Revision 1.64  2007/06/01 14:12:38  fabiankeil
  *    Add unload_forward_spec() in preparation for forward-override{}.
  *
  *    Revision 1.64  2007/06/01 14:12:38  fabiankeil
  *    Add unload_forward_spec() in preparation for forward-override{}.
  *


@@ -500,8 +503,6 @@ void sweep(void)
          last_active->next = csp->next;
 
          freez(csp->ip_addr_str);
          last_active->next = csp->next;
 
          freez(csp->ip_addr_str);

-         freez(csp->my_ip_addr_str);
-         freez(csp->my_hostname);

          freez(csp->iob->buf);
          freez(csp->error_message);
 
          freez(csp->iob->buf);
          freez(csp->error_message);
 

diff --git a/project.h b/project.h
index 678f401..70260eb 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */

-#define PROJECT_H_VERSION "$Id: project.h,v 1.103 2008/03/01 14:00:45 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.104 2008/03/04 18:30:40 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $


@@ -37,6 +37,10 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
  *
  * Revisions   :
  *    $Log: project.h,v $

+ *    Revision 1.104  2008/03/04 18:30:40  fabiankeil
+ *    Remove the treat-forbidden-connects-like-blocks action. We now
+ *    use the "blocked" page for forbidden CONNECT requests by default.
+ *

  *    Revision 1.103  2008/03/01 14:00:45  fabiankeil
  *    Let the block action take the reason for the block
  *    as argument and show it on the "blocked" page.
  *    Revision 1.103  2008/03/01 14:00:45  fabiankeil
  *    Let the block action take the reason for the block
  *    as argument and show it on the "blocked" page.


@@ -1307,14 +1311,6 @@ struct client_state
        As a number. */
    long  ip_addr_long;
 
        As a number. */
    long  ip_addr_long;
 

-   /** Our IP address. I.e. the IP address that the client used to reach us,
-       as a string. */
-   char *my_ip_addr_str;
-
-   /** Our hostname. I.e. the reverse DNS of the IP address that the client
-       used to reach us, as a string. */
-   char *my_hostname;
-

    /** The URL that was requested */
    struct http_request http[1];
 
    /** The URL that was requested */
    struct http_request http[1];