projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove_chunked_transfer_coding(): Use appropriate format specifiers in two log messages
[privoxy.git]
/
gateway.c
diff --git
a/gateway.c
b/gateway.c
index
64ba523
..
9b21aa5
100644
(file)
--- a/
gateway.c
+++ b/
gateway.c
@@
-55,10
+55,6
@@
#include <netdb.h>
#endif /* def __BEOS__ */
#include <netdb.h>
#endif /* def __BEOS__ */
-#ifdef __OS2__
-#include <utils.h>
-#endif /* def __OS2__ */
-
#include "project.h"
#include "jcc.h"
#include "errlog.h"
#include "project.h"
#include "jcc.h"
#include "errlog.h"
@@
-78,8
+74,8
@@
#endif /* HAVE_POLL */
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
#endif /* HAVE_POLL */
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
-static jb_socket socks4_connect(const struct forward_spec *
fwd,
- const char *
target_host,
+static jb_socket socks4_connect(const struct forward_spec *fwd,
+ const char *target_host,
int target_port,
struct client_state *csp);
int target_port,
struct client_state *csp);
@@
-129,6
+125,9
@@
struct socks_reply {
static const char socks_userid[] = "anonymous";
#ifdef FEATURE_CONNECTION_SHARING
static const char socks_userid[] = "anonymous";
#ifdef FEATURE_CONNECTION_SHARING
+#ifndef FEATURE_CONNECTION_KEEP_ALIVE
+#error Using FEATURE_CONNECTION_SHARING without FEATURE_CONNECTION_KEEP_ALIVE is impossible
+#endif
#define MAX_REUSABLE_CONNECTIONS 100
#define MAX_REUSABLE_CONNECTIONS 100
@@
-575,11
+574,11
@@
static int mark_connection_unused(const struct reusable_connection *connection)
* Returns : JB_INVALID_SOCKET => failure, else it is the socket file descriptor.
*
*********************************************************************/
* Returns : JB_INVALID_SOCKET => failure, else it is the socket file descriptor.
*
*********************************************************************/
-jb_socket forwarded_connect(const struct forward_spec *
fwd,
+jb_socket forwarded_connect(const struct forward_spec *fwd,
struct http_request *http,
struct client_state *csp)
{
struct http_request *http,
struct client_state *csp)
{
- const char *
dest_host;
+ const char *dest_host;
int dest_port;
jb_socket sfd = JB_INVALID_SOCKET;
int dest_port;
jb_socket sfd = JB_INVALID_SOCKET;
@@
-710,8
+709,8
@@
extern jb_err socks_fuzz(struct client_state *csp)
* Returns : JB_INVALID_SOCKET => failure, else a socket file descriptor.
*
*********************************************************************/
* Returns : JB_INVALID_SOCKET => failure, else a socket file descriptor.
*
*********************************************************************/
-static jb_socket socks4_connect(const struct forward_spec *
fwd,
- const char *
target_host,
+static jb_socket socks4_connect(const struct forward_spec *fwd,
+ const char *target_host,
int target_port,
struct client_state *csp)
{
int target_port,
struct client_state *csp)
{