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 2002/12/09 18:24:00 UTC
cvs commit: apache-1.3/src CHANGES
bnicholes 2002/12/09 09:23:59
Modified: src/os/netware os.h os.c ApacheCore.imp
src/include httpd.h
src CHANGES
Log:
Implemented ap_os_default_port() to allow NetWare to resolve the correct
default port based on the request method. This fixes a problem with URL
reconstruction on a redirect.
Submitted by: Pavel Novy (novy@feld.cvut.cz)
Revision Changes Path
1.26 +1 -0 apache-1.3/src/os/netware/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/netware/os.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- os.h 18 Jun 2002 04:40:23 -0000 1.25
+++ os.h 9 Dec 2002 17:23:57 -0000 1.26
@@ -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*/
1.25 +5 -0 apache-1.3/src/os/netware/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/netware/os.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- os.c 13 Mar 2002 21:05:36 -0000 1.24
+++ os.c 9 Dec 2002 17:23:57 -0000 1.25
@@ -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));
+}
1.15 +1 -0 apache-1.3/src/os/netware/ApacheCore.imp
Index: ApacheCore.imp
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/netware/ApacheCore.imp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApacheCore.imp 7 Apr 2002 15:50:46 -0000 1.14
+++ ApacheCore.imp 9 Dec 2002 17:23:57 -0000 1.15
@@ -362,6 +362,7 @@
ap_os_canonical_filename,
ap_os_case_canonical_filename,
ap_os_http_method,
+ ap_os_default_port,
os_readdir,
os_opendir,
os_closedir,
1.368 +3 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- httpd.h 30 Sep 2002 16:42:11 -0000 1.367
+++ httpd.h 9 Dec 2002 17:23:58 -0000 1.368
@@ -142,11 +142,12 @@
#define DEFAULT_HTTPS_PORT 443
#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_http_method(r) ap_os_http_method((void*)r)
+#define ap_default_port(r) ap_os_default_port((void*)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 --- */
1.1865 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1864
retrieving revision 1.1865
diff -u -r1.1864 -r1.1865
--- CHANGES 8 Dec 2002 19:09:54 -0000 1.1864
+++ CHANGES 9 Dec 2002 17:23:58 -0000 1.1865
@@ -1,5 +1,10 @@
Changes with Apache 1.3.28
+ *) NetWare: implemented ap_os_default_port() to resolve the
+ correct default port based on the request method. This fixes
+ a URL reconstruction problem on a redirect.
+ [Pavel Novy (novy@feld.cvut.cz)]
+
*) Added new ap_register_cleanup_ex() API function which allows
for a "magic" cleanup function to be run at register time
rather than at cleanup time. Also added the