X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=08a72809a2f30c308f6e9e3fc4b7acd3575e48ad;hb=3b4f4a15dc1ce69b65dc2c09d8743f7ed30662e4;hp=54e5671fc8fc14fd21e85f1c5ce1688707ea8011;hpb=2a478be51f6e6d8f56895e3fee3b122625042d8c;p=tlsproxy%2Ftlsproxy.git
diff --git a/src/connection.c b/src/connection.c
index 54e5671..08a7280 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -36,11 +36,11 @@
/* Format string used to send HTTP/1.0 error responses to the client.
*
- * %s is used 4 times, first three are the error code (no %n$s!), the last is
- * the message. */
+ * %s is used 5 times, first is the error code, then additional headers, next
+ * two are the error code (no %n$s!), the last is the message. */
#define HTTP_RESPONSE_FORMAT "HTTP/1.0 %s\r\n\
Content-Type: text/html; charset=US-ASCII\r\n\
-\r\n\
+%s\r\n\
\n\
\n\
%s\n\
@@ -548,13 +548,13 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
static void send_bad_request(FILE *client_fd) {
const char error[] = "400 Bad Request";
const char msg[] = "Your browser sent an invalid request.";
- fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, error, error, msg);
+ fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, "", error, error, msg);
fflush(client_fd);
}
static void send_forwarding_failure(FILE *client_fd) {
const char error[] = "503 Forwarding failure";
const char msg[] = "Failed to connect to server, check logs.";
- fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, error, error, msg);
+ fprintf(client_fd, HTTP_RESPONSE_FORMAT, error, "", error, error, msg);
fflush(client_fd);
}
static void tls_send_invalid_cert_message(gnutls_session_t session) {
@@ -566,7 +566,7 @@ static void tls_send_invalid_cert_message(gnutls_session_t session) {
+ 3 * sizeof(error) + sizeof(msg)];
result = snprintf(buffer, sizeof(buffer), HTTP_RESPONSE_FORMAT,
- error, error, error, msg);
+ error, "", error, error, msg);
assert(result > 0 && (size_t)result < sizeof(buffer));
gnutls_record_send(session, buffer, strlen(buffer));