Changed "permission" to "action" throughout.

Removed DEFAULT_USER_AGENT - it must now be specified manually.
Moved vanilla wafer check into chat(), since we must now
decide whether or not to add it based on the URL.

diff --git a/jcc.c b/jcc.c
index 0dbbf8d..05c30fa 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.14 2001/05/29 20:14:01 joergs Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.14  2001/05/29 20:14:01  joergs
+ *    AmigaOS bugfix: PCRS needs a lot of stack, stacksize for child threads
+ *    increased.
+ *
  *    Revision 1.13  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
@@ -210,6 +214,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $";
 #endif
 
 #include "project.h"
+#include "list.h"
 #include "jcc.h"
 #include "filters.h"
 #include "loaders.h"
@@ -220,12 +225,11 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $";
 #include "errlog.h"
 #include "jbsockets.h"
 #include "gateway.h"
+#include "actions.h"
 
 const char jcc_h_rcs[] = JCC_H_VERSION;
 const char project_h_rcs[] = PROJECT_H_VERSION;
 
-const char DEFAULT_USER_AGENT[] ="User-Agent: Mozilla (X11; I; Linux 2.0.32 i586)";
-
 struct client_state  clients[1];
 struct file_list     files[1];
 
@@ -252,6 +256,17 @@ static int32 server_thread(void *data);
 #endif
 
 
+/* The vanilla wafer. */
+static const char VANILLA_WAFER[] =
+   "NOTICE=TO_WHOM_IT_MAY_CONCERN_"
+   "Do_not_send_me_any_copyrighted_information_other_than_the_"
+   "document_that_I_am_requesting_or_any_of_its_necessary_components._"
+   "In_particular_do_not_send_me_any_cookies_that_"
+   "are_subject_to_a_claim_of_copyright_by_anybody._"
+   "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_"
+   "(copyright_or_otherwise)_applying_to_any_cookie._";
+
+
 /*********************************************************************
  *
  * Function    :  chat
@@ -429,21 +444,35 @@ static void chat(struct client_state *csp)
 #ifdef TOGGLE
    if (!csp->toggled_on)
    {
-      /* Most compatible set of permissions */
-      csp->permissions = PERMIT_MOST_COMPATIBLE;
+      /* Most compatible set of actions (i.e. none) */
+      init_current_action(csp->action);
    }
    else
 #endif /* ndef TOGGLE */
    {
-      csp->permissions = url_permissions(http, csp);
+      url_actions(http, csp);
+   }
+
+#ifdef JAR_FILES
+   /*
+    * 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
+    * vanilla wafer, then send the vanilla wafer.
+    */
+   if ((csp->config->jarfile != NULL)
+       && (csp->action->multi[ACTION_MULTI_WAFER]->next == NULL)
+       && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0))
+   {
+      enlist_share(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER);
    }
+#endif /* def JAR_FILES */
 
 #ifdef KILLPOPUPS
-   block_popups               = ((csp->permissions & PERMIT_POPUPS) == 0);
+   block_popups               = ((csp->action->flags & ACTION_NO_POPUPS) != 0);
 #endif /* def KILLPOPUPS */
 #ifdef PCRS
    pcrs_filter                = (csp->rlist != NULL) &&  /* There are expressions to be used */
-                                ((csp->permissions & PERMIT_RE_FILTER) != 0);
+                                ((csp->action->flags & ACTION_FILTER) != 0);
 #endif /* def PCRS */
 
 
@@ -496,7 +525,7 @@ static void chat(struct client_state *csp)
 
 #ifdef FAST_REDIRECTS
    else if (IS_ENABLED_AND
-            ((csp->permissions & PERMIT_FAST_REDIRECTS) != 0) && 
+            ((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) && 
             (p = redirect_url(http, csp))) 
    {
       /* This must be blocked as HTML */

diff --git a/jcc.h b/jcc.h
index fcafbb7..a43a12c 100644 (file)
--- a/jcc.h
+++ b/jcc.h
@@ -1,9 +1,9 @@
 #ifndef _JCC_H
 #define _JCC_H
-#define JCC_H_VERSION "$Id: jcc.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.1.1.1 2001/05/15 13:58:56 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/jcc.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
  *
  * Purpose     :  Main file.  Contains main() method, main loop, and 
  *                the main connection-handling function.
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: jcc.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:58:56  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 \f
@@ -66,10 +69,6 @@ extern struct client_state clients[];
 
 extern struct file_list    files[];
 
-/* Global constants */
-
-extern const char DEFAULT_USER_AGENT[];
-
 
 /* Functions */