From 4b3691aa225fc5133d7c25ddbffec1a4553a048c Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 6 May 2002 18:47:22 +0000 Subject: [PATCH] Get proxy CONNECT basically working (IE seems to be happy with secure connections). The to-do of fixing client I/O so it goes through the filters still remains. But it will be nice if it will work until somebody gets around to doing that. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94971 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ modules/proxy/proxy_connect.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index eae3b08354..abf3a4aa33 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ Changes with Apache 2.0.37 + *) Get proxy CONNECT basically working. [Jeff Trawick] + *) Fix mod_rewrite hang when APR uses SysV Semaphores and RewriteLogLevel is set to anything other than 0. PR: 8143 [Aaron Bannert, Cliff Woolley] diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c index 9704ed228f..4888411a28 100644 --- a/modules/proxy/proxy_connect.c +++ b/modules/proxy/proxy_connect.c @@ -279,11 +279,11 @@ int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf, apr_send(client_socket, buffer, &nbytes); nbytes = apr_snprintf(buffer, sizeof(buffer), "Proxy-agent: %s" CRLF CRLF, ap_get_server_version()); + apr_send(client_socket, buffer, &nbytes); #if 0 /* This is safer code, but it doesn't work yet. I'm leaving it * here so that I can fix it later. */ - apr_send(r->connection->client_socket, buffer, &nbytes); r->status = HTTP_OK; r->header_only = 1; apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_version()); -- 2.40.0