cvs commit: apache-1.3/src Makefile.tmpl
dgaudet 98/03/01 23:07:17 Modified:src Makefile.tmpl Log: some garbage that crept in Revision ChangesPath 1.82 +0 -2 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Makefile.tmpl 1998/03/02 07:05:53 1.81 +++ Makefile.tmpl 1998/03/02 07:07:16 1.82 @@ -87,5 +87,3 @@ modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h -t.o: t.c -tt.o: tt.c
cvs commit: apache-1.3/src/os/win32 util_win32.c
pcs 98/03/02 02:57:59
Modified:src CHANGES
src/os/win32 util_win32.c
Log:
Revert patch which fixed PR#1712 but broken the #! method of specifying
an interpreter for a script. PR#1712 will be reopened.
Revision ChangesPath
1.677 +0 -4 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- CHANGES 1998/03/02 06:51:01 1.676
+++ CHANGES 1998/03/02 10:57:57 1.677
@@ -216,10 +216,6 @@
when the client doesn't otherwise specify an encoding.
[Ronald Tschalaer [EMAIL PROTECTED]]
- *) WIN32: Append a '.' to extensionless executables in spawn[lv]e*
- replacements, which makes them work.
- [Sam Robb [EMAIL PROTECTED], Ben Laurie]
-
*) Sort out problems with canonical filename handling happening too late.
[Dean Gaudet, Ben Laurie]
1.9 +13 -26apache-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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util_win32.c 1998/02/08 18:50:51 1.8
+++ util_win32.c 1998/03/02 10:57:59 1.9
@@ -12,11 +12,17 @@
char *szFilePart;
WIN32_FIND_DATA d;
HANDLE h;
+int add_trailing_slash = 0;
n = GetFullPathName(szFile, sizeof buf, buf, szFilePart);
assert(n);
assert(n sizeof buf);
+if (*szFile szFile[strlen(szFile)-1] == '/') {
+add_trailing_slash = 1;
+}
+
+
if (!strchr(buf, '*') !strchr(buf, '?')) {
h = FindFirstFile(buf, d);
if(h != INVALID_HANDLE_VALUE)
@@ -52,6 +58,9 @@
strlwr(d.cFileName);
strcat(szCanon, d.cFileName);
}
+if (add_trailing_slash) {
+strcat(szCanon, /);
+}
}
API_EXPORT(char *) os_canonical_filename(pool *pPool, const char *szFile)
@@ -85,11 +94,10 @@
return stat(szPath, pStat);
}
-/* Fix three really crap problems with Win32 spawn[lv]e*:
+/* Fix two really crap problems with Win32 spawn[lv]e*:
*
* 1. Win32 doesn't deal with spaces in argv.
* 2. Win95 doesn't like / in cmdname.
- * 3. Win32 wants a '.' appended to extensionless files.
*/
#undef _spawnv
@@ -100,20 +108,13 @@
const char *szArg;
char *szCmd;
char *s;
-int len=strlen(cmdname);
-szCmd = _alloca(len+2);
+szCmd = _alloca(strlen(cmdname)+1);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if (*s == '/')
*s = '\\';
-s = strrchr(szCmd, '.');
-if (!s || s strrchr(szCmd, '\\')) {
-szCmd[len] = '.';
-szCmd[len+1] = '\0';
-}
-
for (n=0; argv[n]; ++n)
;
@@ -146,20 +147,13 @@
const char *szArg;
char *szCmd;
char *s;
-int len=strlen(cmdname);
-szCmd = _alloca(len+2);
+szCmd = _alloca(strlen(cmdname)+1);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if (*s == '/')
*s = '\\';
-s = strrchr(szCmd, '.');
-if (!s || s strrchr(szCmd, '\\')) {
-szCmd[len] = '.';
-szCmd[len+1] = '\0';
-}
-
for (n = 0; argv[n] ; ++n)
;
@@ -193,19 +187,12 @@
const char *const *aszEnv;
char *szCmd;
char *s;
-int len=strlen(cmdname);
-szCmd = _alloca(len+2);
+szCmd = _alloca(strlen(cmdname)+1);
strcpy(szCmd, cmdname);
for (s = szCmd; *s; ++s)
if(*s == '/')
*s = '\\';
-
-s = strrchr(szCmd, '.');
-if (!s || s strrchr(szCmd, '\\')) {
-szCmd[len] = '.';
-szCmd[len+1] = '\0';
-}
va_start(vlist, cmdname);
for (n = 0; va_arg(vlist, const char *); ++n)
cvs commit: apache-1.3/htdocs/manual/misc known_bugs.html
pcs 98/03/02 03:07:16 Modified:htdocs/manual/misc known_bugs.html Log: Add the Win32 #! path bug. Copy down the 1.3b3 win32 bugs that still exist in 1.3b5 (because users would assume that a known bug listed under 1.3b3 but not 1.3b5 is fixed). Revision ChangesPath 1.50 +15 -0 apache-1.3/htdocs/manual/misc/known_bugs.html Index: known_bugs.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/known_bugs.html,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- known_bugs.html 1998/03/01 00:10:49 1.49 +++ known_bugs.html 1998/03/02 11:07:15 1.50 @@ -49,6 +49,21 @@ a href=http://www.apache.org/dist/patches/apply_to_1.3b5/PR1889.patch;this patch/a to fix the problem. See a href=http://bugs.apache.org/index/full/1889;PR#1889/a for more details +LISTRONGWin32 only/STRONG Use of #! at the start of a CGI script file +does not work unless the interpreter filename includes the +extension (e.g. use SAMP#!c:/bin/perl.exe/SAMP instead of +SAMP#!c:/bin/perl/SAMP). +LISTRONGNT only/STRONG When installed as a service, Apache expects +to find its ServerRoot at \Apache on the system disk. See +A HREF=http://bugs.apache.org/index/full/1489;PR#1489/A. +LISTRONGWin32 only/STRONG The CODEAlias/CODE directive does not +work if the target is a root directory, e.g. D:/. See +A HREF=http://bugs.apache.org/index/full/1558;PR#1558/A. +LISTRONGWin32 only/STRONG Repeated concurrent requests to a CGI +program can cause Apache to lock-up. See +A HREF=http://bugs.apache.org/index/full/1129;PR#1129/A and +A HREF=http://bugs.apache.org/index/full/1607;PR#1607/A. + /ol H2Apache 1.3b3 Bugs/H2
cvs commit: apache-1.3 STATUS
coar98/03/02 04:07:36 Modified:.STATUS Log: Put the 'Committed Code Changes' section back in - this file is mailed regularly whereas CHANGES is not, and STATUS is typically *slightly* more accurate (people often forget to update CHANGES). Revision ChangesPath 1.166 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- STATUS1998/03/02 08:21:14 1.165 +++ STATUS1998/03/02 12:07:35 1.166 @@ -18,6 +18,8 @@ Showstoppers: +Committed Code Changes: + Available Patches: * Ralf's [PATCH] Config File Line Continuation (take 2)
cvs commit: apache-1.3 STATUS
rse 98/03/02 06:32:33 Modified:.STATUS Log: Because real hacker's have nothing do to: fill the `Committed Code Changes' to make Ken happy ;-) (and update the available votes) Revision ChangesPath 1.167 +49 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- STATUS1998/03/02 12:07:35 1.166 +++ STATUS1998/03/02 14:32:33 1.167 @@ -19,17 +19,61 @@ Showstoppers: Committed Code Changes: +* Dean's `const'-change to os_is_path_absolute(). +* Security patch for UserDir /abspath without a * in the path. PR#1701 +* Dean's cleanup of race conditions in Unix child_main +* Dean's fixes for better handling of various errors from select() and + accept() in child_main(). PR#1747, 1107, 588, 1787, 987, 588 +* Dean's add of -lm to LIBS for HPUX. PR#1639 +* Ralf's remove of obsolete dist.tar target from Makefile.tmpl +* Dean's fixes for some inconsistencies in Files semantics. PR#1817 +* Dean's Files is not permitted within Location. PR#379 +* Dean's and Martin's fix of /Files +* Fix for mod_mime_magic error messages. PR#1827 +* Workaround for using RLIMIT_AS for the RLimitMEM directive. PR#1816 +* Doug's patch to bind a process to a single processor under AIX +* Martin's patch for mod_info to fix HTML markup +* Martin's changes to the check_cmd_context() function +* Patch for the ap_cpystrn() off-by-1 error +* Dean's fix for multiple UserDir problem introduced during 1.3b4-dev. +* Dean's fix to problems with absoluteURIs. +* Dean's patch to use SA_RESETHAND or SA_ONESHOT for coredump handlers. +* Patch to recognize FreeBSD versions. PR#1450 +* Workaround in mod_status for NeXT's running not m68k chips +* Fix for -X situation to honor the SIGINT or SIGQUIT signals +* Patch to hide Proxy-Authorization from CGI/SSI/etc +* Ralf's new ProxyPassReverse directive for mod_proxy +* Ralf's add of new RewriteMap types: rnd and int. PR#1631 +* Fix regex handling for mod_setenvif BrowserMatch command. PR#1825 +* Ralf's fix for assumptions on the username characters in mod_rewrite +* Paul's merge of os/win32/mod_dll.c into modules/standard/mod_so.c +* Paul's patch for reading the server-root from the NT registry +* Ralf's fix for locking of `RewriteMap' programs. PR#1029 +* Dean's fix for the `config with no Port setting' situation +* Ralf's fix for `RewriteMap' program handling. PR#1431 +* Ralf's fix for the initialization of RewriteLogLevel. PR#1325 +* Ralf's mod_rewrite meta-construct expansion inconsistency fix +* Martin's new URI parsing stuff (the source module main/util_uri.c) +* New `%a' construct for LogFormat and CustomLog. PR#1885 +* Ralf's `Rule HIDE' feature for hiding the symbol namespace +* Make \\ behave as expected. +* Fix for poly directive in image maps. PR#1771 +* Reduce memory usage, and speed up ServerAlias support. PR#1531 +* Dean's cleanup of code in http_vhost.c and vhost-stuff in mod_rewrite.c +* Dean's rewrite of absoluteURI handling vhost matching +* Dean's new mod_test_util_uri.c Available Patches: -* Ralf's [PATCH] Config File Line Continuation (take 2) -[EMAIL PROTECTED] +* Ralf's [PATCH] Config File Line Continuation (take 3) +[EMAIL PROTECTED] (this version uses strict matching of the backslash, i.e. no trailing spaces are allowed - this should be now avoid problems) Status: Ralf +1 Martin +1 (on concept) -Dean +1 (on concept) -Dean -1? (because of RAW_ARGS issues) +Dean +1 (on concept, but -1? because of RAW_ARGS issues?) + Dirk-Willem van Gulik +1 + Jim +1 * M.D.Parker's [PATCH] mod_status/1448: Status Information have version [EMAIL PROTECTED] @@ -47,6 +91,7 @@ Jim +1(for 1.3.1 on concept) Jim -1(for 1.3.0 because too late) Randy -1 (too late for 1.3 in general) +Ken -1(for 1.3.0 in general) * Dean's [PRE-PATCH] expanding ap_snprintf() [EMAIL PROTECTED]
cvs commit: apache-1.3/src/os/unix os.h
dgaudet 98/03/02 09:51:34 Modified:src/os/unix os.h Log: remove a gccism: __const Revision ChangesPath 1.7 +3 -3 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- os.h 1998/02/24 10:30:55 1.6 +++ os.h 1998/03/02 17:51:33 1.7 @@ -41,9 +41,9 @@ #ifdef HAS_DLFCN # include dlfcn.h #else -void * dlopen (__const char * __filename, int __flag); -__const char * dlerror (void); -void * dlsym (void *, __const char *); +void * dlopen (const char * __filename, int __flag); +const char * dlerror (void); +void * dlsym (void *, const char *); int dlclose (void *); #endif
cvs commit: apache-1.3/src/main http_vhost.c
dgaudet 98/03/02 09:53:48
Modified:src/main http_vhost.c
Log:
some systems #define s_addr s_addr_list[0].S_un or something like that, so
s_addr is offlimits
Revision ChangesPath
1.9 +4 -4 apache-1.3/src/main/http_vhost.c
Index: http_vhost.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_vhost.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_vhost.c 1998/03/02 06:51:11 1.8
+++ http_vhost.c 1998/03/02 17:53:47 1.9
@@ -373,14 +373,14 @@
{
unsigned bucket;
ipaddr_chain *trav;
-unsigned s_addr;
+unsigned addr;
/* scan the hash table for an exact match first */
-s_addr = server_ip-s_addr;
-bucket = hash_inaddr(s_addr);
+addr = server_ip-s_addr;
+bucket = hash_inaddr(addr);
for (trav = iphash_table[bucket]; trav; trav = trav-next) {
server_addr_rec *sar = trav-sar;
- if ((sar-host_addr.s_addr == s_addr)
+ if ((sar-host_addr.s_addr == addr)
(sar-host_port == 0 || sar-host_port == port
|| port == 0)) {
return trav;
