httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r168462 - /httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c
Date Thu, 05 May 2005 23:15:21 GMT
Author: pquerna
Date: Thu May  5 16:15:20 2005
New Revision: 168462

URL: http://svn.apache.org/viewcvs?rev=168462&view=rev
Log:
Add support for 'Protocol' to mod_ssl.

Example Config:

Listen 10.0.0.10:443 https

<VirtualHost 10.0.0.10:443>
SLCertificateFile conf/server.cert
SSLCertificateKeyFile conf/server.key
ServerName foo:443
DocumentRoot /var/www/foo
....
</VirtualHost>

Notice, no need for 'SSLEngine on'.  You can also set 'Protocol https' inside the virtual
host, 
if you do not set it in the Listen command.

Modified:
    httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c

Modified: httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c?rev=168462&r1=168461&r2=168462&view=diff
==============================================================================
--- httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/listen-protocol/modules/ssl/ssl_engine_init.c Thu May  5 16:15:20
2005
@@ -207,8 +207,13 @@
         sc->vhost_id = ssl_util_vhostid(p, s);
         sc->vhost_id_len = strlen(sc->vhost_id);
 
+        if (strcmp("https", ap_get_server_protocol(s)) == 0) {
+            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 */
+
         if (sc->enabled == SSL_ENABLED_UNSET) {
             sc->enabled = SSL_ENABLED_FALSE;
         }
@@ -879,7 +884,8 @@
 
     if (!(have_rsa || have_dsa)) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-                "Oops, no RSA or DSA server certificate found?!");
+                "Oops, no RSA or DSA server certificate found "
+                "for '%s:%d'?!", s->server_hostname, s->port);
         ssl_die();
     }
 



Mime
View raw message