diff options
| author | rofl0r <rofl0r@users.noreply.github.com> | 2020-08-11 16:35:40 +0100 |
|---|---|---|
| committer | rofl0r <rofl0r@users.noreply.github.com> | 2021-04-16 14:51:01 +0100 |
| commit | a869e71ac382acb2a8b4442477ed675e5bf0ce76 (patch) | |
| tree | 93acd09b5da931c0f05e43e49cb1e7a2a9d2d7a2 | |
| parent | 979c737f9b811c5441ae0573a90b72dc1e44e142 (diff) | |
add support for outgoing connections with HTTP/1.1
since there are numerous changes in HTTP/1.1, the proxyserver will
stick to using HTTP/1.0 for internal usage, however when a connection
is requested with HTTP/1.x from now on we will duplicate the minor revision
the client requested, because apparently some servers refuse to accept
HTTP/1.0
addresses #152.
| -rw-r--r-- | src/html-error.c | 3 | ||||
| -rw-r--r-- | src/reqs.c | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/html-error.c b/src/html-error.c index b6dd29d..998a6ee 100644 --- a/src/html-error.c +++ b/src/html-error.c @@ -138,13 +138,14 @@ int send_http_headers ( const char *message, const char *extra) { const char headers[] = - "HTTP/1.0 %d %s\r\n" + "HTTP/1.%u %d %s\r\n" "Server: %s/%s\r\n" "Content-Type: text/html\r\n" "%s" "Connection: close\r\n" "\r\n"; return (write_message (connptr->client_fd, headers, + connptr->protocol.major != 1 ? 0 : connptr->protocol.minor, code, message, PACKAGE, VERSION, extra)); } @@ -268,28 +268,34 @@ establish_http_connection (struct conn_s *connptr, struct request_s *request) /* host is an IPv6 address literal, so surround it with * [] */ return write_message (connptr->server_fd, - "%s %s HTTP/1.0\r\n" + "%s %s HTTP/1.%u\r\n" "Host: [%s]%s\r\n" "Connection: close\r\n", request->method, request->path, + connptr->protocol.major != 1 ? 0 : + connptr->protocol.minor, request->host, portbuff); } else if (connptr->upstream_proxy && connptr->upstream_proxy->type == PT_HTTP && connptr->upstream_proxy->ua.authstr) { return write_message (connptr->server_fd, - "%s %s HTTP/1.0\r\n" + "%s %s HTTP/1.%u\r\n" "Host: %s%s\r\n" "Connection: close\r\n" "Proxy-Authorization: Basic %s\r\n", request->method, request->path, + connptr->protocol.major != 1 ? 0 : + connptr->protocol.minor, request->host, portbuff, connptr->upstream_proxy->ua.authstr); } else { return write_message (connptr->server_fd, - "%s %s HTTP/1.0\r\n" + "%s %s HTTP/1.%u\r\n" "Host: %s%s\r\n" "Connection: close\r\n", request->method, request->path, + connptr->protocol.major != 1 ? 0 : + connptr->protocol.minor, request->host, portbuff); } } |