bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally got the SSL problem fixed. We can not send _any_ client headers

Browse Source 
(including the new line) to the origin server when in tunnelling mode. SSL
now works correctly. Yeah.
This commit is contained in:
Robert James Kaes 2001-09-14 21:16:56 +00:00
parent 9c520c7a50
commit ea4d707d12
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/reqs.c
View File

@ -1,4 +1,4 @@
/* $Id: reqs.c,v 1.25 2001-09-14 19:50:45 rjkaes Exp $ /* $Id: reqs.c,v 1.26 2001-09-14 21:16:56 rjkaes Exp $
* *
* This is where all the work in tinyproxy is actually done. Incoming * This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then * connections have a new thread created for them. The thread then
@ -497,6 +497,7 @@ static int process_client_headers(struct conn_s *connptr)
static char *skipheaders[] = { static char *skipheaders[] = {
"proxy-connection", "proxy-connection",
"host",
"connection" "connection"
}; };
int i; int i;
@ -519,7 +520,10 @@ static int process_client_headers(struct conn_s *connptr)
if (connptr->output_message) if (connptr->output_message)
continue; continue;
if (!connptr->ssl && strncasecmp(header, "host", 4) ==0) /*
* Don't send any of the headers if we're in SSL mode.
*/
if (connptr->ssl)
continue; continue;
/* /*
@ -548,7 +552,7 @@ static int process_client_headers(struct conn_s *connptr)
} }
} }
if (!connptr->output_message) { if (!connptr->output_message && !connptr->ssl) {
#ifdef XTINYPROXY_ENABLE #ifdef XTINYPROXY_ENABLE
if (config.my_domain if (config.my_domain
&& add_xtinyproxy_header(connptr) < 0) { && add_xtinyproxy_header(connptr) < 0) {
@ -736,6 +740,8 @@ static void destroy_conn(struct conn_s *connptr)
update_stats(STAT_CLOSE); update_stats(STAT_CLOSE);
} }
#define SSL_CONNECTION_RESPONSE "HTTP/1.0 200 Connection established\r\n\r\n"
/* /*
* This is the main drive for each connection. As you can tell, for the * This is the main drive for each connection. As you can tell, for the
* first few steps we are using a blocking socket. If you remember the * first few steps we are using a blocking socket. If you remember the
@ -841,7 +847,7 @@ send_error:
return; return;
} }
} else { } else {
if (safe_write(connptr->client_fd, "HTTP/1.0 200 Connection established\r\n\r\n", 39) < 0) { if (safe_write(connptr->client_fd, SSL_CONNECTION_RESPONSE, strlen(SSL_CONNECTION_RESPONSE)) < 0) {
log_message(LOG_ERR, "Could not send SSL greeting to client."); log_message(LOG_ERR, "Could not send SSL greeting to client.");
destroy_conn(connptr); destroy_conn(connptr);
return; return;