projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buildsource.sgml: Ignore Privoxy versions before 3.0.7
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
3f9b5f1
..
9b54879
100644
(file)
--- a/
project.h
+++ b/
project.h
@@
-1,7
+1,7
@@
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.2
07 2014/07/25 11:55:11
fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.2
11 2016/01/16 12:30:28
fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@
-642,7
+642,7
@@
struct url_actions
};
enum forwarder_type {
};
enum forwarder_type {
- /**< Don't use a SOCKS server
*/
+ /**< Don't use a SOCKS server
, forward to a HTTP proxy directly
*/
SOCKS_NONE = 0,
/**< original SOCKS 4 protocol */
SOCKS_4 = 40,
SOCKS_NONE = 0,
/**< original SOCKS 4 protocol */
SOCKS_4 = 40,
@@
-652,6
+652,12
@@
enum forwarder_type {
SOCKS_5 = 50,
/**< Like SOCKS5, but uses non-standard Tor extensions (currently only optimistic data) */
SOCKS_5T,
SOCKS_5 = 50,
/**< Like SOCKS5, but uses non-standard Tor extensions (currently only optimistic data) */
SOCKS_5T,
+ /**<
+ * Don't use a SOCKS server, forward to the specified webserver.
+ * The difference to SOCKS_NONE is that a request line without
+ * full URL is sent.
+ */
+ FORWARD_WEBSERVER,
};
/*
};
/*
@@
-859,13
+865,13
@@
struct reusable_connection
*/
/**
*/
/**
- * Flag for process return code: Set if exiting p
or
cess has been toggled
+ * Flag for process return code: Set if exiting p
ro
cess has been toggled
* during its lifetime.
*/
#define RC_FLAG_TOGGLED 0x10
/**
* during its lifetime.
*/
#define RC_FLAG_TOGGLED 0x10
/**
- * Flag for process return code: Set if exiting p
or
cess has blocked its
+ * Flag for process return code: Set if exiting p
ro
cess has blocked its
* request.
*/
#define RC_FLAG_BLOCKED 0x20
* request.
*/
#define RC_FLAG_BLOCKED 0x20
@@
-1365,10
+1371,9
@@
struct configuration_spec
/** Calculates the number of elements in an array, using sizeof. */
#define SZ(X) (sizeof(X) / sizeof(*X))
/** Calculates the number of elements in an array, using sizeof. */
#define SZ(X) (sizeof(X) / sizeof(*X))
-#ifdef FEATURE_FORCE_LOAD
-
/** The force load URL prefix
. */
+/** The force load URL prefix. Not behind an ifdef because
+
* it's always used for the show-status page
. */
#define FORCE_PREFIX "/PRIVOXY-FORCE"
#define FORCE_PREFIX "/PRIVOXY-FORCE"
-#endif /* def FEATURE_FORCE_LOAD */
#ifdef FEATURE_NO_GIFS
/** The MIME type for images ("image/png" or "image/gif"). */
#ifdef FEATURE_NO_GIFS
/** The MIME type for images ("image/png" or "image/gif"). */