cvs commit: apache-1.3/src/os/win32 util_win32.c
ben 98/06/29 16:14:20
Modified:src/os/win32 util_win32.c
Log:
Yet more PATH_INFO fixes.
Revision ChangesPath
1.19 +8 -5 apache-1.3/src/os/win32/util_win32.c
Index: util_win32.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/util_win32.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- util_win32.c 1998/06/27 17:24:11 1.18
+++ util_win32.c 1998/06/29 23:14:19 1.19
@@ -55,15 +55,19 @@
if(*s == '\\')
*s='/';
}
-return;
+return TRUE;
}
if (szFilePart != buf+3) {
char b2[_MAX_PATH];
+ char b3[_MAX_PATH];
ap_assert(szFilePart buf+3);
-szFilePart[-1]='\0';
-sub_canonical_filename(b2, sizeof b2, buf);
+ memcpy(b3,szFile,s-szFile);
+ b3[s-szFile]='\0';
+//szFilePart[-1]='\0';
+sub_canonical_filename(b2, sizeof b2, b3);
+
ap_assert(strlen(b2)+1 nCanon);
strcpy(szCanon, b2);
strcat(szCanon, /);
@@ -124,8 +128,7 @@
;
*d='\0';
-if(sub_canonical_filename(buf, sizeof buf, b2) nSlashes)
- nSlashes=1;
+sub_canonical_filename(buf, sizeof buf, b2);
buf[0]=tolower(buf[0]);
cvs commit: apache-1.3/src/main fnmatch.c
coar98/06/29 19:11:36
Modified:src/main fnmatch.c
Log:
Logic error.. resulted in case-blind byte-for-byte matches
not.
Revision ChangesPath
1.12 +7 -4 apache-1.3/src/main/fnmatch.c
Index: fnmatch.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/fnmatch.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fnmatch.c 1998/06/28 14:43:19 1.11
+++ fnmatch.c 1998/06/30 02:11:34 1.12
@@ -140,10 +140,13 @@
}
/* FALLTHROUGH */
default:
- if ((c != *string)
- || ((flags FNM_CASE_BLIND)
- (toupper(c) != toupper(*string {
- return (FNM_NOMATCH);
+ if (flags FNM_CASE_BLIND) {
+ if (toupper(c) != toupper(*string)) {
+ return (FNM_NOMATCH);
+ }
+ }
+ else if (c != *string) {
+ return (FNM_NOMATCH);
}
string++;
break;
cvs commit: apache-1.3 STATUS
brian 98/06/30 01:09:14 Modified:.STATUS Log: Add a couple of patches which have come by in the last week without being commited - someone please look these over and commit them if correct! Revision ChangesPath 1.433 +32 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.432 retrieving revision 1.433 diff -u -r1.432 -r1.433 --- STATUS1998/06/19 13:14:56 1.432 +++ STATUS1998/06/30 08:09:13 1.433 @@ -44,7 +44,38 @@ virtualhosting. (If it exists already I can't find it easily.) Available Patches: - + +* Filenames containing whitespace characters caused problems for directives + Bill Stoddard [EMAIL PROTECTED] + Message-ID: [EMAIL PROTECTED] + +* Fix mod_include #perl arg interpolation + Doug MacEachern [EMAIL PROTECTED] + Message-Id: [EMAIL PROTECTED] + +* PR#2483 reports that RewriteMap program still don't work under Win32 because + of a SIGSEGV. The reporter is right, ap_spawn_child_core() calls the child + function with NULL while in the child function the file handles have to be + available. I've assembled the above patch from the reporters description/patch + for testing by our Win32 folks. (I cannot test it myself). + Ralf S. Engelschall [EMAIL PROTECTED] + Message-ID: [EMAIL PROTECTED] + +* This patch makes some structural changes to ap_call_exec to make it more + readable and friendly to a couple of patches that will follow (capability to + query the Win32 registry for interpreter name and a fix for mod_include + exec=cmd processing). This patch does not change the function of ap_call_exec. + W G Stoddard [EMAIL PROTECTED] + Message-ID: [EMAIL PROTECTED] + +* Configure tweaks to support building outside the source tree, and + add more customizeability for installation layout, by + Wilfredo Sanchez [EMAIL PROTECTED] + Message-Id: [EMAIL PROTECTED] + +* Rhapsody port, by Wilfredo Sanchez [EMAIL PROTECTED] + Message-Id: [EMAIL PROTECTED] + * Ralf's [PATCH] Fix module init This fixes the mod_so/mod_perl problems described under FINAL RELEASE SHOWSTOPPERS by doing a more correct init of the modules after loading
cvs commit: apache-1.3/src/main fnmatch.c
coar98/06/30 03:56:17
Modified:src/main fnmatch.c
Log:
Change toupper()s to tolower() as used elsewhere in the code.
Revision ChangesPath
1.13 +4 -4 apache-1.3/src/main/fnmatch.c
Index: fnmatch.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/fnmatch.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fnmatch.c 1998/06/30 02:11:34 1.12
+++ fnmatch.c 1998/06/30 10:56:16 1.13
@@ -141,7 +141,7 @@
/* FALLTHROUGH */
default:
if (flags FNM_CASE_BLIND) {
- if (toupper(c) != toupper(*string)) {
+ if (tolower(c) != tolower(*string)) {
return (FNM_NOMATCH);
}
}
@@ -188,14 +188,14 @@
}
if ((c = test test = c2)
|| ((flags FNM_CASE_BLIND)
- ((toupper(c) = toupper(test))
- (toupper(test) = toupper(c2) {
+ ((tolower(c) = tolower(test))
+ (tolower(test) = tolower(c2) {
ok = 1;
}
}
else if ((c == test)
|| ((flags FNM_CASE_BLIND)
- (toupper(c) == toupper(test {
+ (tolower(c) == tolower(test {
ok = 1;
}
}
