1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup): Don't send Upgrade

for a subrequest.  When it *is* sent, list it in a Connection: header
as required by 2616.

PR: 32486


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@592457 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2007-11-06 15:34:35 +00:00
parent c15016e058
commit 264f7c6b73

View File

@@ -1070,8 +1070,13 @@ int ssl_hook_Fixup(request_rec *r)
SSL *ssl;
int i;
if (sc->enabled == SSL_ENABLED_OPTIONAL && !(sslconn && sslconn->ssl)) {
/* If "SSLEngine optional" is configured, this is not an SSL
* connection, and this isn't a subrequest, send an Upgrade
* response header. */
if (sc->enabled == SSL_ENABLED_OPTIONAL && !(sslconn && sslconn->ssl)
&& !r->main) {
apr_table_setn(r->headers_out, "Upgrade", "TLS/1.0, HTTP/1.1");
apr_table_mergen(r->headers_out, "Connection", "upgrade");
}
/*