projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c5153a
)
All the CSP_FLAG_FOO bit masks should be unsigned ints.
author
Fabian Keil
<fk@fabiankeil.de>
Sun, 8 Mar 2009 14:12:51 +0000
(14:12 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sun, 8 Mar 2009 14:12:51 +0000
(14:12 +0000)
project.h
patch
|
blob
|
history
diff --git
a/project.h
b/project.h
index
78a074c
..
b0e969b
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
7 2008/12/20 14:53:55
fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.12
8 2009/03/07 13:09:17
fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@
-10,7
+10,7
@@
* project. Does not define any variables or functions
* (though it does declare some macros).
*
* project. Does not define any variables or functions
* (though it does declare some macros).
*
- * Copyright : Written by and Copyright (C) 2001-200
8 the SourceForg
e
+ * Copyright : Written by and Copyright (C) 2001-200
9 th
e
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-37,6
+37,12
@@
*
* Revisions :
* $Log: project.h,v $
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.128 2009/03/07 13:09:17 fabiankeil
+ * Change csp->expected_content and_csp->expected_content_length from
+ * size_t to unsigned long long to reduce the likelihood of integer
+ * overflows that would let us close the connection prematurely.
+ * Bug found while investigating #2669131, reported by cyberpatrol.
+ *
* Revision 1.127 2008/12/20 14:53:55 fabiankeil
* Add config option socket-timeout to control the time
* Privoxy waits for data to arrive on a socket. Useful
* Revision 1.127 2008/12/20 14:53:55 fabiankeil
* Add config option socket-timeout to control the time
* Privoxy waits for data to arrive on a socket. Useful
@@
-1323,51
+1329,51
@@
struct url_actions
* Flag for csp->flags: Set if an acceptable Connection header
* is already set.
*/
* Flag for csp->flags: Set if an acceptable Connection header
* is already set.
*/
-#define CSP_FLAG_CLIENT_CONNECTION_HEADER_SET
0x00000040UL
+#define CSP_FLAG_CLIENT_CONNECTION_HEADER_SET
0x00000040U
/**
* Flag for csp->flags: Set if adding the 'Connection: close' header
* for the server isn't necessary.
*/
/**
* Flag for csp->flags: Set if adding the 'Connection: close' header
* for the server isn't necessary.
*/
-#define CSP_FLAG_SERVER_CONNECTION_CLOSE_SET 0x00000080U
L
+#define CSP_FLAG_SERVER_CONNECTION_CLOSE_SET 0x00000080U
/**
* Flag for csp->flags: Signals header parsers whether they
* are parsing server or client headers.
*/
/**
* Flag for csp->flags: Signals header parsers whether they
* are parsing server or client headers.
*/
-#define CSP_FLAG_CLIENT_HEADER_PARSING_DONE 0x00000100U
L
+#define CSP_FLAG_CLIENT_HEADER_PARSING_DONE 0x00000100U
/**
* Flag for csp->flags: Set if adding the Host: header
* isn't necessary.
*/
/**
* Flag for csp->flags: Set if adding the Host: header
* isn't necessary.
*/
-#define CSP_FLAG_HOST_HEADER_IS_SET 0x00000200U
L
+#define CSP_FLAG_HOST_HEADER_IS_SET 0x00000200U
/**
* Flag for csp->flags: Set if filtering is disabled by X-Filter: No
* XXX: As we now have tags we might as well ditch this.
*/
/**
* Flag for csp->flags: Set if filtering is disabled by X-Filter: No
* XXX: As we now have tags we might as well ditch this.
*/
-#define CSP_FLAG_NO_FILTERING 0x00000400U
L
+#define CSP_FLAG_NO_FILTERING 0x00000400U
/**
* Flag for csp->flags: Set the client IP has appended to
* an already existing X-Forwarded-For header in which case
* no new header has to be generated.
*/
/**
* Flag for csp->flags: Set the client IP has appended to
* an already existing X-Forwarded-For header in which case
* no new header has to be generated.
*/
-#define CSP_FLAG_X_FORWARDED_FOR_APPENDED 0x00000800U
L
+#define CSP_FLAG_X_FORWARDED_FOR_APPENDED 0x00000800U
/**
* Flag for csp->flags: Set if the server wants to keep
* the connection alive.
*/
/**
* Flag for csp->flags: Set if the server wants to keep
* the connection alive.
*/
-#define CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE 0x00001000U
L
+#define CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE 0x00001000U
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/**
* Flag for csp->flags: Set if the server specified the
* content length.
*/
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/**
* Flag for csp->flags: Set if the server specified the
* content length.
*/
-#define CSP_FLAG_CONTENT_LENGTH_SET 0x00002000U
L
+#define CSP_FLAG_CONTENT_LENGTH_SET 0x00002000U
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
/*
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
/*