X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=aed21f0574a8cb0ebd2288b255b194aee70d138e;hp=a308e1afcca171590f785eb8b625fdae09c0beb2;hb=57ada44f5881cab962648120ab3b88035b011f06;hpb=531dc25abeef12f4e3feec82633d64ac26ea00f1

diff --git a/project.h b/project.h
index a308e1af..aed21f05 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.50 2002/03/04 19:32:07 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.53 2002/03/08 16:48:55 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,15 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.53  2002/03/08 16:48:55  oes
+ *    Added FEATURE_NO_GIFS and BUILTIN_IMAGE_MIMETYPE
+ *
+ *    Revision 1.52  2002/03/07 03:46:17  oes
+ *    Fixed compiler warnings
+ *
+ *    Revision 1.51  2002/03/05 04:52:42  oes
+ *    Deleted non-errlog debugging code
+ *
  *    Revision 1.50  2002/03/04 19:32:07  oes
  *    Changed default port to 8118
  *
@@ -395,10 +404,31 @@
 #include "amiga.h"
 #endif /* def AMIGA */
 
+#ifdef _WIN32
+/*
+ * I don't want to have to #include all this just for the declaration
+ * of SOCKET.  However, it looks like we have to...
+ */
+#include <windows.h>
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/*
+ * The type used by sockets.  On UNIX it's an int.  Microsoft decided to
+ * make it an unsigned.
+ */
+#ifdef _WIN32
+typedef SOCKET jb_socket;
+#define JB_INVALID_SOCKET INVALID_SOCKET
+#else /* ndef _WIN32 */
+typedef int jb_socket;
+#define JB_INVALID_SOCKET (-1)
+#endif /* ndef _WIN32 */
+
 
 /*
  * Error codes.  Functions returning these should return a jb_err
@@ -518,17 +548,19 @@ struct http_request
    int    dcount;      /* How many parts to this domain? (length of dvec)   */
 };
 
-/* Response generated by CGI, blocker, or error handler */
+/* 
+ * Response generated by CGI, blocker, or error handler
+ */
 struct http_response
 {
-  char *status;           /* HTTP status (string)*/
+  char  *status;          /* HTTP status (string) */
   struct list headers[1]; /* List of header lines */
-  char *head;             /* Formatted http response head */
-  int   head_length;      /* Length of http response head */
-  char *body;             /* HTTP document body */
-  int   content_length;   /* Length of body, REQUIRED if binary body */
-  int   is_static;        /* Nonzero if the content will never change and
-                           * should be cached by the broser (e.g. images) */
+  char  *head;            /* Formatted http response head */
+  size_t head_length;     /* Length of http response head */
+  char  *body;            /* HTTP document body */
+  size_t content_length;  /* Length of body, REQUIRED if binary body */
+  int    is_static;       /* Nonzero if the content will never change and
+                           * should be cached by the brwoser (e.g. images) */
 };
 
 /* A URL pattern */
@@ -704,10 +736,10 @@ struct client_state
    struct current_action_spec  action[1];
 
    /* socket to talk to client (web browser) */
-   int  cfd;
+   jb_socket cfd;
 
    /* socket to talk to server (web server or proxy) */
-   int  sfd;
+   jb_socket sfd;
 
    /* Multi-purpose flag container, see CSP_FLAG_* above */
    unsigned short int flags;
@@ -774,8 +806,8 @@ typedef jb_err (*parser_func_ptr    )(struct client_state *, char **);
  */
 struct parsers
 {
-   char *str;
-   char  len;
+   char   *str;
+   size_t len;
    parser_func_ptr parser;
 };
 
@@ -977,6 +1009,13 @@ struct configuration_spec
 #define FORCE_PREFIX "/IJB-FORCE-LOAD"
 #endif /* def FEATURE_FORCE_LOAD */
 
+#ifdef FEATURE_NO_GIFS
+#define BUILTIN_IMAGE_MIMETYPE "image/png"
+#else
+#define BUILTIN_IMAGE_MIMETYPE "image/gif"
+#endif /* def FEATURE_NO_GIFS */
+
+
 /* Hardwired URLs */
 #define HOME_PAGE_URL       "http://ijbswa.sourceforge.net"
 #define REDIRECT_URL        HOME_PAGE_URL "/redirect.php?v=" VERSION "&to="