You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2003/11/24 21:36:31 UTC
cvs commit: httpd-2.0/modules/arch/netware mod_nw_ssl.c
bnicholes 2003/11/24 12:36:31
Modified: modules/arch/netware Tag: APACHE_2_0_BRANCH 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
No revision
No revision
1.7.2.5 +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.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- mod_nw_ssl.c 2 Jun 2003 15:23:40 -0000 1.7.2.4
+++ mod_nw_ssl.c 24 Nov 2003 20:36:31 -0000 1.7.2.5
@@ -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);