[PATCH] ap_default_port() and Apache 1.3 on NetWare

[Pavel Novy]

Port 443 is not treated as a default port for the https method on
NetWare, so wrong redirects like this are occuring:

"https://server_name/some_location"; (missing a trailing slash)
-> "https://server_name:443/some_location/";

Here comes a set of patches designed to fix that issue.

Thanks,
Pavel


--- src/include/httpd.h 2002-10-01 00:12:04.000000000 +0200
+++ src/include/httpd.h 2002-12-07 19:14:32.000000000 +0100
@@ -143,10 +143,11 @@
 #define ap_is_default_port(port,r)     ((port) == ap_default_port(r))
 #ifdef NETWARE
 #define ap_http_method(r) ap_os_http_method(r)
+#define ap_default_port(r) ap_os_default_port(r)
 #else
 #define ap_http_method(r)      "http"
-#endif
 #define ap_default_port(r)     DEFAULT_HTTP_PORT
+#endif
 
 /* --------- Default user name and group name running standalone ---------- */
 /* --- These may be specified as numbers by placing a # before a number --- */

--- src/os/netware/os.h 2002-06-18 12:12:10.000000000 +0200
+++ src/os/netware/os.h 2002-12-07 19:43:12.000000000 +0100
@@ -186,5 +186,6 @@
 void init_name_space(void);
 int ap_os_is_filename_valid(const char *file);
 char *ap_os_http_method(void *r);
+unsigned short ap_os_default_port(void *r);
 #endif /*! APACHE_OS_H*/
 

--- src/os/netware/os.c 2002-03-14 00:12:06.000000000 +0100
+++ src/os/netware/os.c 2002-12-07 19:47:42.000000000 +0100
@@ -502,3 +502,8 @@
         if (optParam & (SO_SSL_ENABLE | SO_SSL_SERVER)) return "https";
     return "http";
 }
+
+unsigned short ap_os_default_port(void *r)
+{
+  return ap_default_port_for_scheme(ap_os_http_method(r));
+}