Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 4877 invoked from network); 24 Nov 2003 20:36:56 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Nov 2003 20:36:56 -0000 Received: (qmail 82499 invoked by uid 500); 24 Nov 2003 20:36:45 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 82390 invoked by uid 500); 24 Nov 2003 20:36:45 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 82377 invoked by uid 500); 24 Nov 2003 20:36:45 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 82374 invoked from network); 24 Nov 2003 20:36:45 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Nov 2003 20:36:45 -0000 Received: (qmail 4858 invoked by uid 1285); 24 Nov 2003 20:36:55 -0000 Date: 24 Nov 2003 20:36:55 -0000 Message-ID: <20031124203655.4857.qmail@minotaur.apache.org> From: bnicholes@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/arch/netware mod_nw_ssl.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bnicholes 2003/11/24 12:36:55 Modified: modules/arch/netware mod_nw_ssl.c Log: Hook the default_port so that mod_nw_ssl will return the correct port rather than defaulting to 80 Revision Changes Path 1.13 +9 -0 httpd-2.0/modules/arch/netware/mod_nw_ssl.c Index: mod_nw_ssl.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/arch/netware/mod_nw_ssl.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_nw_ssl.c 2 Jun 2003 15:24:30 -0000 1.12 +++ mod_nw_ssl.c 24 Nov 2003 20:36:55 -0000 1.13 @@ -556,6 +556,14 @@ return NULL; } +static apr_port_t nwssl_hook_default_port(const request_rec *r) +{ + if (isSecure(r)) + return DEFAULT_HTTPS_PORT; + + return 0; +} + int ssl_proxy_enable(conn_rec *c) { apr_table_set(c->notes, "nwconv-ssl", "Y"); @@ -585,6 +593,7 @@ ap_hook_post_config(nwssl_post_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_fixups(nwssl_hook_Fixup, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_http_method(nwssl_hook_http_method, NULL,NULL, APR_HOOK_MIDDLE); + ap_hook_default_port (nwssl_hook_default_port, NULL,NULL, APR_HOOK_MIDDLE); APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable); APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);