projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regenerate user manual with the last ChangeLog fixes
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
6967ad8
..
53de19a
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-1,4
+1,4
@@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.4
18 2012/12/07 12:43:05
fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.4
21 2012/12/07 12:50:37
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@
-911,7
+911,8
@@
static jb_err change_request_destination(struct client_state *csp)
struct http_request *http = csp->http;
jb_err err;
struct http_request *http = csp->http;
jb_err err;
- log_error(LOG_LEVEL_INFO, "Rewrite detected: %s", csp->headers->first->str);
+ log_error(LOG_LEVEL_REDIRECTS, "Rewrite detected: %s",
+ csp->headers->first->str);
free_http_request(http);
err = parse_http_request(csp->headers->first->str, http);
if (JB_ERR_OK != err)
free_http_request(http);
err = parse_http_request(csp->headers->first->str, http);
if (JB_ERR_OK != err)
@@
-1920,7
+1921,12
@@
static void chat(struct client_state *csp)
csp->server_connection.requests_sent_total++;
csp->server_connection.requests_sent_total++;
- if (fwd->forward_host || (http->ssl == 0))
+ if ((fwd->type == SOCKS_5T) && (NULL == csp->headers->first))
+ {
+ /* Client headers have been sent optimistically */
+ assert(csp->headers->last == NULL);
+ }
+ else if (fwd->forward_host || (http->ssl == 0))
{
int write_failure;
hdr = list_to_text(csp->headers);
{
int write_failure;
hdr = list_to_text(csp->headers);
@@
-1978,6
+1984,7
@@
static void chat(struct client_state *csp)
log_error(LOG_LEVEL_CONNECT, "to %s successful", http->hostport);
log_error(LOG_LEVEL_CONNECT, "to %s successful", http->hostport);
+ /* XXX: should the time start earlier for optimistically sent data? */
csp->server_connection.request_sent = time(NULL);
maxfd = (csp->cfd > csp->server_connection.sfd) ?
csp->server_connection.request_sent = time(NULL);
maxfd = (csp->cfd > csp->server_connection.sfd) ?