projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If --verbose is set, log which tests were skipped and why.
[privoxy.git]
/
project.h
diff --git
a/project.h
b/project.h
index
ede2072
..
ad3f80d
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.12
4 2008/11/16 12:43:49
fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.12
6 2008/12/14 17:02:54
fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@
-37,6
+37,12
@@
*
* Revisions :
* $Log: project.h,v $
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.126 2008/12/14 17:02:54 fabiankeil
+ * Fix a cparser warning.
+ *
+ * Revision 1.125 2008/11/20 08:22:28 fabiankeil
+ * Remove an obsolete comment.
+ *
* Revision 1.124 2008/11/16 12:43:49 fabiankeil
* Turn keep-alive support into a runtime feature
* that is disabled by setting keep-alive-timeout
* Revision 1.124 2008/11/16 12:43:49 fabiankeil
* Turn keep-alive support into a runtime feature
* that is disabled by setting keep-alive-timeout
@@
-815,7
+821,7
@@
typedef int jb_err;
/**
* Max length of CGI parameters (arbitrary limit).
*/
/**
* Max length of CGI parameters (arbitrary limit).
*/
-#define CGI_PARAM_LEN_MAX 500
+#define CGI_PARAM_LEN_MAX 500
U
/**
* Buffer size for capturing struct hostent data in the
/**
* Buffer size for capturing struct hostent data in the
@@
-1785,6
+1791,9
@@
struct configuration_spec
/** Number of retries in case a forwarded connection attempt fails */
int forwarded_connect_retries;
/** Number of retries in case a forwarded connection attempt fails */
int forwarded_connect_retries;
+ /* Timeout when waiting on sockets for data to become available. */
+ int socket_timeout;
+
/** All options from the config file, HTML-formatted. */
char *proxy_args;
/** All options from the config file, HTML-formatted. */
char *proxy_args;