X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=jcc.c;h=6713ed55f553553b2db72697358ee1f295f2443e;hp=84a7eb47078971c0676e4cbb944f67bfce9cff7f;hb=3186134c92fc0a088001a89d17abd5b3486baf2f;hpb=82d49cad27a8ebfc04e7cc8211cbd81c533fe7ba diff --git a/jcc.c b/jcc.c index 84a7eb47..6713ed55 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.89 2002/03/31 17:18:59 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -7,7 +7,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; * the main connection-handling function. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,18 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.89 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.88 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.87 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.86 2002/03/25 17:04:55 david__schmidt + * Workaround for closing the jarfile before load_config() comes around again + * * Revision 1.85 2002/03/24 15:23:33 jongfoster * Name changes * @@ -521,6 +533,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; #ifdef _WIN32 # ifndef FEATURE_PTHREAD +# ifndef STRICT +# define STRICT +# endif # include # include # endif /* ndef FEATURE_PTHREAD */ @@ -952,19 +967,15 @@ 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 - * vanilla wafer, then send the vanilla wafer. + * If 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) - && list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) + if (list_is_empty(csp->action->multi[ACTION_MULTI_WAFER]) && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0)) { enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER); } -#endif /* def FEATURE_COOKIE_JAR */ #ifdef FEATURE_KILL_POPUPS @@ -2150,7 +2161,7 @@ static void listen_loop(void) #if defined(__OS2__) && !defined(SELECTED_ONE_OPTION) #define SELECTED_ONE_OPTION child_id = _beginthread( - serve, + (void(* _Optlink)(void*))serve, NULL, 64 * 1024, csp);