diff options
Diffstat (limited to 'httpd-2.4.7-r1537535.patch')
| -rw-r--r-- | httpd-2.4.7-r1537535.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/httpd-2.4.7-r1537535.patch b/httpd-2.4.7-r1537535.patch deleted file mode 100644 index 8e51302..0000000 --- a/httpd-2.4.7-r1537535.patch +++ /dev/null @@ -1,38 +0,0 @@ -# ./pullrev.sh 1537535 - -http://svn.apache.org/viewvc?view=revision&revision=1537535 - ---- httpd-2.4.7/modules/ssl/ssl_engine_config.c.r1537535 -+++ httpd-2.4.7/modules/ssl/ssl_engine_config.c -@@ -196,7 +196,7 @@ static SSLSrvConfigRec *ssl_config_serve - SSLSrvConfigRec *sc = apr_palloc(p, sizeof(*sc)); - - sc->mc = NULL; -- sc->enabled = SSL_ENABLED_FALSE; -+ sc->enabled = SSL_ENABLED_UNSET; - sc->proxy_enabled = UNSET; - sc->vhost_id = NULL; /* set during module init */ - sc->vhost_id_len = 0; /* set during module init */ ---- httpd-2.4.7/modules/ssl/ssl_engine_init.c.r1537535 -+++ httpd-2.4.7/modules/ssl/ssl_engine_init.c -@@ -115,13 +115,16 @@ int ssl_init_Module(apr_pool_t *p, apr_p - sc->vhost_id = ssl_util_vhostid(p, s); - sc->vhost_id_len = strlen(sc->vhost_id); - -- if (ap_get_server_protocol(s) && -- strcmp("https", ap_get_server_protocol(s)) == 0) { -+ /* Default to enabled if SSLEngine is not set explicitly, and -+ * the protocol is https. */ -+ if (ap_get_server_protocol(s) -+ && strcmp("https", ap_get_server_protocol(s)) == 0 -+ && sc->enabled == SSL_ENABLED_UNSET) { - sc->enabled = SSL_ENABLED_TRUE; - } - -- /* If sc->enabled is UNSET, then SSL is optional on this vhost */ -- /* Fix up stuff that may not have been set */ -+ /* Fix up stuff that may not have been set. If sc->enabled is -+ * UNSET, then SSL is disabled on this vhost. */ - if (sc->enabled == SSL_ENABLED_UNSET) { - sc->enabled = SSL_ENABLED_FALSE; - } |