httpd-bugs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bugzi...@apache.org
Subject DO NOT REPLY [Bug 24331] - SSLPassPhraseDialog exec: always default port in argv
Date Mon, 17 Nov 2003 09:51:09 GMT
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24331>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24331

SSLPassPhraseDialog exec: always default port in argv





------- Additional Comments From jm@ccn.net  2003-11-17 09:51 -------
I changed it in 2.0.48 but the ssl_util_vhostid function hasn't been changed
between 2.0.47 and 2.0.48.

my diff -u output:

--- ssl_util.c  Fri May 16 20:12:19 2003
+++ /usr/local/apache-2.0.48/src/httpd-2.0.48/modules/ssl/ssl_util.c      Sun
Nov  2 00:09:01 2003
@@ -80,14 +80,18 @@
     apr_port_t port;
 
     host = s->server_hostname;
-    if (s->port != 0)
-        port = s->port;
+    if (s->addrs->host_port != 0)
+        port = s->addrs->host_port;
     else {
-        sc = mySrvConfig(s);
-        if (sc->enabled)
-            port = DEFAULT_HTTPS_PORT;
-        else
-            port = DEFAULT_HTTP_PORT;
+        if (s->port != 0)
+            port = s->port;
+        else {
+            sc = mySrvConfig(s);
+            if (sc->enabled)
+                port = DEFAULT_HTTPS_PORT;
+            else
+                port = DEFAULT_HTTP_PORT;
+        }
     }
     id = apr_psprintf(p, "%s:%lu", host, (unsigned long)port);
     return id;




The complete CHANGED function in ssl_util.c:

char *ssl_util_vhostid(apr_pool_t *p, server_rec *s)
{
    char *id;
    SSLSrvConfigRec *sc;
    char *host;
    apr_port_t port;

    host = s->server_hostname;
    if (s->addrs->host_port != 0)
        port = s->addrs->host_port;
    else {
        if (s->port != 0)
            port = s->port;
        else {
            sc = mySrvConfig(s);
            if (sc->enabled)
                port = DEFAULT_HTTPS_PORT;
            else
                port = DEFAULT_HTTP_PORT;
        }
    }
    id = apr_psprintf(p, "%s:%lu", host, (unsigned long)port);
    return id;
}

---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscribe@httpd.apache.org
For additional commands, e-mail: bugs-help@httpd.apache.org


Mime
View raw message