You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/01/25 21:44:31 UTC
cvs commit: apache-1.3/src/os/netware os.h
wrowe 01/01/25 12:44:31
Modified: src CHANGES
src/os/netware os.h
Log:
*) Fixed ap_os_is_path_absolute() in OS.H so that it can tell the
between a NetWare path (SYS:/path) and a URL (HTTP://path).
Submitted by: Brad Nicholes <BN...@novell.com>
Revision Changes Path
1.1626 +6 -3 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1625
retrieving revision 1.1626
diff -u -r1.1625 -r1.1626
--- CHANGES 2001/01/24 19:29:22 1.1625
+++ CHANGES 2001/01/25 20:44:24 1.1626
@@ -1,5 +1,9 @@
Changes with Apache 1.3.17
+ *) Fixed ap_os_is_path_absolute() in OS.H so that it can tell the
+ between a NetWare path (SYS:/path) and a URL (HTTP://path).
+ [Brad Nicholes <BN...@novell.com>]
+
*) Fixed the sdbm.h bundled in Apache for Win32, bringing it in sync
with Perl. Because it didn't have the same geometry as Perl,
users reported the first user added with dbmmanage was not
@@ -10,15 +14,14 @@
volume name. Since NetWare's current working directory always
defaults to the SYS: volume regardless of where the executible
started, the default volume will be the volume that is specified
- in ap_server_root. This corrects mod_userdir/Netware reports
- PR5826 & 6283. [Brad Nicholes <BN...@novell.com>]
+ in ap_server_root. [Brad Nicholes <BN...@novell.com>]
*) Handle port numbers in Host headers properly again after
the code was broken in 1.3.15. [Tony Finch]
Changes with Apache 1.3.16
- *) None from 1.3.15
+ *) None from 1.3.15 [repository tags were the issue, no code altered]
Changes with Apache 1.3.15
1.11 +13 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- os.h 2001/01/15 17:06:17 1.10
+++ os.h 2001/01/25 20:44:29 1.11
@@ -127,11 +127,20 @@
inline int ap_os_is_path_absolute(const char *file)
{
- /* XXX: Should this test *(strchr(file, ':') + 1) == '/' ? */
- if ((file[0] == '/') || strchr(file, ':'))
- return 1;
+ char *s = strchr (file, ':');
+
+ if (s)
+ {
+ if (strncmp(s, "://", 3))
+ return 1;
+ }
else
- return 0;
+ {
+ if (file[0] == '/')
+ return 1;
+ }
+
+ return 0;
}
#define ap_os_dso_handle_t void *