Moving some code that wasn't cookie-related out of an #ifdef

FEATURE_COOKIE_JAR

diff --git a/jcc.c b/jcc.c
index dd89b04..7c09830 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.46 2001/10/08 15:17:41 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.47 2001/10/10 16:44:36 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.46 2001/10/08 15:17:41 oes Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.47  2001/10/10 16:44:36  oes
+ *    Added CONNECT destination port limitation check
+ *
  *    Revision 1.46  2001/10/08 15:17:41  oes
  *    Re-enabled SSL forwarding
  *
@@ -608,7 +611,6 @@ static void chat(struct client_state *csp)
       url_actions(http, csp);
    }
 
-#ifdef FEATURE_COOKIE_JAR
 
    /*
     * Check if a CONNECT request is allowable:
@@ -669,6 +671,7 @@ static void chat(struct client_state *csp)
    enlist(csp->headers, http->cmd);
 
 
+#ifdef FEATURE_COOKIE_JAR
    /*
     * If we're logging cookies in a cookie jar, and the user has not
     * supplied any wafers, and the user has not told us to suppress the
@@ -682,6 +685,7 @@ static void chat(struct client_state *csp)
    }
 #endif /* def FEATURE_COOKIE_JAR */
 
+
 #ifdef FEATURE_KILL_POPUPS
    block_popups               = ((csp->action->flags & ACTION_NO_POPUPS) != 0);
 #endif /* def FEATURE_KILL_POPUPS */