projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump copyright
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
cbceaec
..
943e66d
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-9,7
+9,7
@@
* (though it does declare some macros).
*
* Copyright : Written by and Copyright (C) 2001-2014 the
* (though it does declare some macros).
*
* Copyright : Written by and Copyright (C) 2001-2014 the
- * Privoxy team. http://www.privoxy.org/
+ * Privoxy team. http
s
://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@
-44,7
+44,7
@@
/* Needed for pcre choice */
#include "config.h"
/* Needed for pcre choice */
#include "config.h"
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
#ifdef FEATURE_PTHREAD
# include <pthread.h>
typedef pthread_mutex_t privoxy_mutex_t;
#ifdef FEATURE_PTHREAD
# include <pthread.h>
typedef pthread_mutex_t privoxy_mutex_t;
@@
-175,7
+175,7
@@
typedef enum privoxy_err jb_err;
/**
* This macro is used to free a pointer that may be NULL.
* It also sets the variable to NULL after it's been freed.
/**
* This macro is used to free a pointer that may be NULL.
* It also sets the variable to NULL after it's been freed.
- * The param
a
ter should be a simple variable without side effects.
+ * The param
e
ter should be a simple variable without side effects.
*/
#define freez(X) { if(X) { free((void*)X); X = NULL ; } }
*/
#define freez(X) { if(X) { free((void*)X); X = NULL ; } }
@@
-276,7
+276,7
@@
struct map_entry
/**
* A map from a string to another string.
/**
* A map from a string to another string.
- * This is used for the param
a
ters passed in a HTTP GET request, and
+ * This is used for the param
e
ters passed in a HTTP GET request, and
* to store the exports when the CGI interface is filling in a template.
*/
struct map
* to store the exports when the CGI interface is filling in a template.
*/
struct map
@@
-287,7
+287,7
@@
struct map
struct map_entry *last;
};
struct map_entry *last;
};
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
/*
* Struct of attributes necessary for TLS/SSL connection
*/
/*
* Struct of attributes necessary for TLS/SSL connection
*/
@@
-319,7
+319,7
@@
struct http_request
char *ocmd; /**< Backup of original cmd for CLF logging */
char *gpc; /**< HTTP method: GET, POST, ... */
char *url; /**< The URL */
char *ocmd; /**< Backup of original cmd for CLF logging */
char *gpc; /**< HTTP method: GET, POST, ... */
char *url; /**< The URL */
- char *ver
;
/**< Protocol version */
+ char *ver
sion;
/**< Protocol version */
int status; /**< HTTP Status */
char *host; /**< Host part of URL */
int status; /**< HTTP Status */
char *host; /**< Host part of URL */
@@
-337,26
+337,21
@@
struct http_request
int dcount; /**< How many parts to this domain? (length of dvec) */
#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
int dcount; /**< How many parts to this domain? (length of dvec) */
#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
-#ifdef FEATURE_HTTPS_
FILTERING
- int client_ssl; /**< Flag if we should com
unicate with s
lient over ssl */
- int server_ssl; /**< Flag if we should comunicate with server over ssl */
+#ifdef FEATURE_HTTPS_
INSPECTION
+ int client_ssl; /**< Flag if we should com
municate with c
lient over ssl */
+ int server_ssl; /**< Flag if we should com
m
unicate with server over ssl */
unsigned char hash_of_host_hex[(HASH_OF_HOST_BUF_SIZE * 2) + 1]; /**< chars for hash in hex string and one for '\0' */
unsigned char hash_of_host[HASH_OF_HOST_BUF_SIZE+1]; /**< chars for bytes of hash and one for '\0' */
#endif
};
unsigned char hash_of_host_hex[(HASH_OF_HOST_BUF_SIZE * 2) + 1]; /**< chars for hash in hex string and one for '\0' */
unsigned char hash_of_host[HASH_OF_HOST_BUF_SIZE+1]; /**< chars for bytes of hash and one for '\0' */
#endif
};
-#ifdef FEATURE_HTTPS_FILTERING
-/*
- * If this macro is defined, mutexes count for generating
- * private keys is changed from 65536 to 32.
- */
-#define LIMIT_MUTEX_NUMBER
+#ifdef FEATURE_HTTPS_INSPECTION
/*
* Struct for linked list containing certificates
*/
typedef struct certs_chain {
/*
* Struct for linked list containing certificates
*/
typedef struct certs_chain {
- char
text
_buf[CERT_INFO_BUF_SIZE]; /* text info about properties of certificate */
+ char
info
_buf[CERT_INFO_BUF_SIZE]; /* text info about properties of certificate */
char file_buf[CERT_FILE_BUF_SIZE]; /* buffer for whole certificate - format to save in file */
struct certs_chain *next; /* next certificate in chain of trust */
} certs_chain_t;
char file_buf[CERT_FILE_BUF_SIZE]; /* buffer for whole certificate - format to save in file */
struct certs_chain *next; /* next certificate in chain of trust */
} certs_chain_t;
@@
-572,8
+567,8
@@
struct iob
#define ACTION_LIMIT_COOKIE_LIFETIME 0x08000000UL
/** Action bitmap: Delay writes */
#define ACTION_DELAY_RESPONSE 0x10000000UL
#define ACTION_LIMIT_COOKIE_LIFETIME 0x08000000UL
/** Action bitmap: Delay writes */
#define ACTION_DELAY_RESPONSE 0x10000000UL
-/** Action bitmap: Turn https
filtering
on */
-#define ACTION_
ENABLE_HTTPS_FILTER
0x20000000UL
+/** Action bitmap: Turn https
inspection
on */
+#define ACTION_
HTTPS_INSPECTION
0x20000000UL
/** Action bitmap: Turn certificates verification off */
#define ACTION_IGNORE_CERTIFICATE_ERRORS 0x40000000UL
/** Action bitmap: Turn certificates verification off */
#define ACTION_IGNORE_CERTIFICATE_ERRORS 0x40000000UL
@@
-655,7
+650,7
@@
struct current_action_spec
unsigned long flags;
/**
unsigned long flags;
/**
- * Param
a
ters for those actions that require them.
+ * Param
e
ters for those actions that require them.
* Each entry is valid if & only if the corresponding entry in "flags" is
* set.
*/
* Each entry is valid if & only if the corresponding entry in "flags" is
* set.
*/
@@
-927,7
+922,7
@@
struct reusable_connection
#define CSP_FLAG_UNSUPPORTED_CLIENT_EXPECTATION 0x02000000U
/**
#define CSP_FLAG_UNSUPPORTED_CLIENT_EXPECTATION 0x02000000U
/**
- * Flag for csp->flags: Set if we answered the request ourselve.
+ * Flag for csp->flags: Set if we answered the request ourselve
s
.
*/
#define CSP_FLAG_CRUNCHED 0x04000000U
*/
#define CSP_FLAG_CRUNCHED 0x04000000U
@@
-1020,7
+1015,7
@@
struct client_state
/* XXX: should be renamed to server_iob */
struct iob iob[1];
/* XXX: should be renamed to server_iob */
struct iob iob[1];
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
mbedtls_connection_attr mbedtls_server_attr; /* attributes for connection to server */
mbedtls_connection_attr mbedtls_client_attr; /* attributes for connection to client */
#endif
mbedtls_connection_attr mbedtls_server_attr; /* attributes for connection to server */
mbedtls_connection_attr mbedtls_client_attr; /* attributes for connection to client */
#endif
@@
-1037,7
+1032,7
@@
struct client_state
/** List of all headers for this request */
struct list headers[1];
/** List of all headers for this request */
struct list headers[1];
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
/** List of all encrypted headers for this request */
struct list https_headers[1];
#endif
/** List of all encrypted headers for this request */
struct list https_headers[1];
#endif
@@
-1093,7
+1088,7
@@
struct client_state
*/
char *error_message;
*/
char *error_message;
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
/* Result of server certificate verification */
uint32_t server_cert_verification_result;
/* Result of server certificate verification */
uint32_t server_cert_verification_result;
@@
-1110,7
+1105,7
@@
struct client_state
/*
* Server certificate chain of trust including strings with certificates
/*
* Server certificate chain of trust including strings with certificates
- * information
s
and string with whole certificate file
+ * information and string with whole certificate file
*/
struct certs_chain server_certs_chain;
#endif
*/
struct certs_chain server_certs_chain;
#endif
@@
-1538,7
+1533,7
@@
struct configuration_spec
/** Nonzero if we need to bind() to the new port. */
int need_bind;
/** Nonzero if we need to bind() to the new port. */
int need_bind;
-#ifdef FEATURE_HTTPS_
FILTERING
+#ifdef FEATURE_HTTPS_
INSPECTION
/** Password for proxy ca file **/
char * ca_password;
/** Password for proxy ca file **/
char * ca_password;
@@
-1608,6
+1603,7
@@
struct configuration_spec
* INCLUDES the trailing slash.
*/
#define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
* INCLUDES the trailing slash.
*/
#define CGI_PREFIX "http://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
+#define CGI_PREFIX_HTTPS "https://" CGI_SITE_2_HOST CGI_SITE_2_PATH "/"
#endif /* ndef PROJECT_H_INCLUDED */
#endif /* ndef PROJECT_H_INCLUDED */