diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2020-11-16 23:57:14 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2020-11-16 23:57:14 +0100 |
| commit | 064d391854f78ebb4fa311638dd0841227dc60b4 (patch) | |
| tree | d925262fbc34ae68a5bcaa197d4fa4e4d587fb9f | |
| parent | aeee18457c5834b06f902f25ca2e7b80302b9f97 (diff) | |
| parent | 12403a9a19db8c3a31c92d57199e316e4d7a27a3 (diff) | |
Merge branches 'bind-ipv4mapped' and 'support_http_11'
| -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 071d415..fcb0b94 100644 --- a/src/html-error.c +++ b/src/html-error.c @@ -136,7 +136,7 @@ send_html_file (FILE *infile, struct conn_s *connptr) int send_http_headers (struct conn_s *connptr, int code, const char *message) { 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" @@ -155,6 +155,7 @@ int send_http_headers (struct conn_s *connptr, int code, const char *message) const char *add = code == 407 ? p_auth_str : (code == 401 ? w_auth_str : ""); return (write_message (connptr->client_fd, headers, + connptr->protocol.major != 1 ? 0 : connptr->protocol.minor, code, message, PACKAGE, VERSION, add)); } @@ -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); } } |