X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.h;h=9da00cf1316abd025c2fbad8314e2a79f4ac7cb6;hb=d55afc696ab392e92c44352cbe8b93ddd2724ef6;hp=014a4c0a0499b6f679bef9f383cd26a9d6f4ab1b;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232;p=privoxy.git

diff --git a/jcc.h b/jcc.h
index 014a4c0a..9da00cf1 100644
--- a/jcc.h
+++ b/jcc.h
@@ -1,6 +1,6 @@
 #ifndef JCC_H_INCLUDED
 #define JCC_H_INCLUDED
-#define JCC_H_VERSION "$Id: jcc.h,v 1.10 2002/03/16 23:54:06 jongfoster Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.18 2006/11/13 19:05:51 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
@@ -8,8 +8,8 @@
  * Purpose     :  Main file.  Contains main() method, main loop, and 
  *                the main connection-handling function.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team.  http://ijbswa.sourceforge.net
+ * Copyright   :  Written by and Copyright (C) 2001-2006 the SourceForge
+ *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -35,6 +35,55 @@
  *
  * Revisions   :
  *    $Log: jcc.h,v $
+ *    Revision 1.18  2006/11/13 19:05:51  fabiankeil
+ *    Make pthread mutex locking more generic. Instead of
+ *    checking for OSX and OpenBSD, check for FEATURE_PTHREAD
+ *    and use mutex locking unless there is an _r function
+ *    available. Better safe than sorry.
+ *
+ *    Fixes "./configure --disable-pthread" and should result
+ *    in less threading-related problems on pthread-using platforms,
+ *    but it still doesn't fix BR#1122404.
+ *
+ *    Revision 1.17  2006/11/06 19:58:23  fabiankeil
+ *    Move pthread.h inclusion from jcc.c to jcc.h.
+ *    Fixes build on x86-freebsd1 (FreeBSD 5.4-RELEASE).
+ *
+ *    Revision 1.16  2006/09/02 15:36:42  fabiankeil
+ *    Follow the OpenBSD port's lead and protect the resolve
+ *    functions on OpenBSD as well.
+ *
+ *    Revision 1.15  2006/09/02 10:24:30  fabiankeil
+ *    Include pthread.h for OpenBSD to make Privoxy build again.
+ *
+ *    Tested shortly on OpenBSD 3.9 without problems, but the OpenBSD
+ *    port has additional patches to use the mutexes OSX_DARWIN needs,
+ *    and it should be investigated if they are still required for
+ *    reliable operation.
+ *
+ *    Revision 1.14  2006/07/18 14:48:46  david__schmidt
+ *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ *    with what was really the latest development (the v_3_0_branch branch)
+ *
+ *    Revision 1.12.2.3  2006/01/21 16:16:08  david__schmidt
+ *    Thanks to  Edward Carrel for his patch to modernize OSX's
pthreads support.  See bug #1409623.
+ *
+ *    Revision 1.12.2.2  2005/04/03 20:10:50  david__schmidt
+ *    Thanks to Jindrich Makovicka for a race condition fix for the log
+ *    file.  The race condition remains for non-pthread implementations.
+ *    Reference patch #1175720.
+ *
+ *    Revision 1.12.2.1  2003/03/07 03:41:05  david__schmidt
+ *    Wrapping all *_r functions (the non-_r versions of them) with mutex 
+ *    semaphores for OSX.  Hopefully this will take care of all of those pesky
+ *    crash reports.
+ *
+ *    Revision 1.12  2002/03/26 22:29:55  swa
+ *    we have a new homepage!
+ *
+ *    Revision 1.11  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
  *    Revision 1.10  2002/03/16 23:54:06  jongfoster
  *    Adding graceful termination feature, to help look for memory leaks.
  *    If you enable this (which, by design, has to be done by hand
@@ -100,8 +149,8 @@ extern int urls_read;
 extern int urls_rejected;
 #endif /*def FEATURE_STATISTICS*/
 
-extern struct client_state clients[];
-extern struct file_list    files[];
+extern struct client_state clients[1];
+extern struct file_list    files[1];
 
 #ifdef unix
 extern const char *pidfile;
@@ -112,6 +161,28 @@ extern int no_daemon;
 extern int g_terminate;
 #endif
 
+#ifdef FEATURE_PTHREAD
+#include <pthread.h>
+extern pthread_mutex_t log_mutex;
+extern pthread_mutex_t log_init_mutex;
+
+#ifndef HAVE_GMTIME_R
+extern pthread_mutex_t gmtime_mutex;
+#endif /* ndef HAVE_GMTIME_R */
+
+#ifndef HAVE_LOCALTIME_R
+extern pthread_mutex_t localtime_mutex;
+#endif /* ndef HAVE_GMTIME_R */
+
+#ifndef HAVE_GETHOSTBYADDR_R
+extern pthread_mutex_t gethostbyaddr_mutex;
+#endif /* ndef HAVE_GETHOSTBYADDR_R */
+
+#ifndef HAVE_GETHOSTBYNAME_R
+extern pthread_mutex_t gethostbyname_mutex;
+#endif /* ndef HAVE_GETHOSTBYNAME_R */
+#endif /* FEATURE_PTHREAD */
+
 /* Functions */
 
 #ifdef __MINGW32__
@@ -124,6 +195,14 @@ int main(int argc, const char *argv[]);
 extern const char jcc_rcs[];
 extern const char jcc_h_rcs[];
 
+/* HTTP snippets */
+extern const char CSUCCEED[];
+extern const char CHEADER[];
+extern const char CFORBIDDEN[];
+extern const char FTP_RESPONSE[];
+extern const char GOPHER_RESPONSE[];
+extern const char MISSING_DESTINATION_RESPONSE[];
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif