mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
This stuff shouldn't have been committed. This is the SSL upgrade stuff,
and it was included in a commit that shouldn't have touched these files. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97201 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -322,16 +322,6 @@ int ssl_hook_Access(request_rec *r)
|
||||
* Support for SSLRequireSSL directive
|
||||
*/
|
||||
if (dc->bSSLRequired && !ssl) {
|
||||
if (sc->enabled == UNSET) {
|
||||
/* This vhost was configured for optional SSL, just tell the
|
||||
* client that we need to upgrade.
|
||||
*/
|
||||
apr_table_setn(r->err_headers_out, "Upgrade", "TLS/1.0, HTTP/1.1");
|
||||
apr_table_setn(r->err_headers_out, "Connection", "Upgrade");
|
||||
|
||||
return HTTP_UPGRADE_REQUIRED;
|
||||
}
|
||||
|
||||
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
|
||||
"access to %s failed, reason: %s",
|
||||
r->filename, "SSL connection required");
|
||||
@@ -1120,10 +1110,6 @@ int ssl_hook_Fixup(request_rec *r)
|
||||
SSL *ssl;
|
||||
int i;
|
||||
|
||||
if (sc->enabled == UNSET) {
|
||||
apr_table_setn(r->headers_out, "Upgrade", "TLS/1.0, HTTP/1.1");
|
||||
}
|
||||
|
||||
/*
|
||||
* Check to see if SSL is on
|
||||
*/
|
||||
|
Reference in New Issue
Block a user