cvs commit: apache-1.3/src/main http_main.c
rse 98/06/29 04:41:50
Modified:src CHANGES
src/main http_main.c
Log:
Move the initial suEXEC-related startup message from plain fprintf()/stderr to
a delayed ap_log_error()-based one to avoid problems when Apache is started
from inetd (instead of standalone). Under this situation startup messages on
stderr lead to problems (the line is sent to the client in front of the
requested document).
Now the following occurs in the error_log:
[Mon Jun 29 13:37:38 1998] [notice] Apache/1.3.1-dev (Unix) configured --
resuming normal operations
[Mon Jun 29 13:37:38 1998] [info] Server built: Jun 29 1998 13:37:13
[Mon Jun 29 13:37:38 1998] [info] suEXEC mechanism enabled (wrapper:
/tmp/apache/sbin/suexec)
PR: 871, 1318
Revision ChangesPath
1.937 +7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- CHANGES 1998/06/28 14:43:16 1.936
+++ CHANGES 1998/06/29 11:41:47 1.937
@@ -1,5 +1,12 @@
Changes with Apache 1.3.1
+ *) Move the initial suEXEC-related startup message from plain
+ fprintf()/stderr to a delayed ap_log_error()-based one to avoid problems
+ when Apache is started from inetd (instead of standalone). Under this
+ situation startup messages on stderr lead to problems (the line is sent
+ to the client in front of the requested document).
+ [Ralf S. Engelschall] PR#871, PR#1318
+
*) Add a flag so ap_fnmatch() can be used for case-blind pattern matching.
[Ken Coar, Dean Gaudet]
1.369 +4 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- http_main.c 1998/06/26 21:15:18 1.368
+++ http_main.c 1998/06/29 11:41:48 1.369
@@ -2753,7 +2753,6 @@
if ((wrapper.st_mode & S_ISUID) && wrapper.st_uid == 0) {
ap_suexec_enabled = 1;
- fprintf(stderr, "Configuring Apache for use with suexec wrapper.\n");
}
#endif /* ndef WIN32 */
return (ap_suexec_enabled);
@@ -4066,6 +4065,10 @@
ap_get_server_version());
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
"Server built: %s", ap_get_server_built());
+ if (ap_suexec_enabled) {
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
+ "suEXEC mechanism enabled (wrapper: %s)", SUEXEC_BIN);
+ }
restart_pending = shutdown_pending = 0;
while (!restart_pending && !shutdown_pending) {
cvs commit: apache-1.3/src CHANGES Configure
rse 98/06/29 05:10:54 Modified:src CHANGES Configure Log: Fix the Guess-DSO-flags-from-Perl stuff in src/Configure: "perl" was used instead of "$PERL" which contains the correctly determined Perl interpreter (important for instance on systems where "perl" and "perl5" exists, like BSDI or FreeBSD, etc). PR: 2505 Revision ChangesPath 1.938 +6 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.937 retrieving revision 1.938 diff -u -r1.937 -r1.938 --- CHANGES 1998/06/29 11:41:47 1.937 +++ CHANGES 1998/06/29 12:10:51 1.938 @@ -1,5 +1,11 @@ Changes with Apache 1.3.1 + *) Fix the Guess-DSO-flags-from-Perl stuff in src/Configure: "perl" was + used instead of "$PERL" which contains the correctly determined Perl + interpreter (important for instance on systems where "perl" and "perl5" + exists, like BSDI or FreeBSD, etc). + [Ralf S. Engelschall] PR#2505 + *) Move the initial suEXEC-related startup message from plain fprintf()/stderr to a delayed ap_log_error()-based one to avoid problems when Apache is started from inetd (instead of standalone). Under this 1.269 +3 -3 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- Configure 1998/06/17 13:34:02 1.268 +++ Configure 1998/06/29 12:10:52 1.269 @@ -999,9 +999,9 @@ if [ ".`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != . ]; then # ...and actually uses the dlopen-style interface, # so we can guess the flags from its knowledge -CFLAGS_SHLIB="`perl -V:cccdlflags | cut -d\' -f2`" -LDFLAGS_SHLIB="`perl -V:lddlflags | cut -d\' -f2`" -LDFLAGS_SHLIB_EXPORT="`perl -V:ccdlflags | cut -d\' -f2`" +CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`" +LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`" +LDFLAGS_SHLIB_EXPORT="`$PERL -V:ccdlflags | cut -d\' -f2`" # but additionally we have to inform the # user that we are just guessing the flags echo ""
cvs commit: apache-1.3/src/helpers GuessOS
rse 98/06/29 05:21:04
Modified:src CHANGES Configure
src/helpers GuessOS
Log:
PORT: Add UnixWare 7 support
Submitted by: Vadim Kostoglodoff <[EMAIL PROTECTED]>
Reviewed and fixed (UW=7 -> UW=700) by: Ralf S. Engelschall
PR: 2463
Revision ChangesPath
1.939 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.938
retrieving revision 1.939
diff -u -r1.938 -r1.939
--- CHANGES 1998/06/29 12:10:51 1.938
+++ CHANGES 1998/06/29 12:21:01 1.939
@@ -1,5 +1,8 @@
Changes with Apache 1.3.1
+ *) PORT: Add UnixWare 7 support
+ [Vadim Kostoglodoff <[EMAIL PROTECTED]>] PR#2463
+
*) Fix the Guess-DSO-flags-from-Perl stuff in src/Configure: "perl" was
used instead of "$PERL" which contains the correctly determined Perl
interpreter (important for instance on systems where "perl" and "perl5"
1.270 +6 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- Configure 1998/06/29 12:10:52 1.269
+++ Configure 1998/06/29 12:21:02 1.270
@@ -584,6 +584,12 @@
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
DBM_LIB=""
;;
+*-unixware7)
+ OS='UnixWare 7'
+ CFLAGS="$CFLAGS -DUW=700"
+ LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
+ DBM_LIB=""
+ ;;
maxion-*-sysv4*)
OS='SVR4'
CFLAGS="$CFLAGS -DSVR4"
1.43 +5 -0 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- GuessOS 1998/06/13 22:36:47 1.42
+++ GuessOS 1998/06/29 12:21:04 1.43
@@ -50,6 +50,11 @@
4.2)
echo "whatever-whatever-unixware1"; exit 0
;;
+ 5)
+ if [ "x$VERSION" = "x7" ]; then
+ echo "${MACHINE}-whatever-unixware7"; exit 0
+ fi
+ ;;
esac
fi
fi
cvs commit: apache-site/dist HEADER.html
coar98/06/29 06:30:35 Modified:dist HEADER.html Log: Hopefully shut up the clamour until we've got a Win32 binary. Revision ChangesPath 1.2 +5 -0 apache-site/dist/HEADER.html Index: HEADER.html === RCS file: /export/home/cvs/apache-site/dist/HEADER.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HEADER.html 1997/10/18 13:33:14 1.1 +++ HEADER.html 1998/06/29 13:30:35 1.2 @@ -4,3 +4,8 @@ If you're having trouble accessing these files, there's probably a closer mirror to you. http://www.apache.org/dyn/closer.cgi";>Go here to find it. + + Apache 1.3.0 for Win32 is NOT YET AVAILABLE! + + Please be patient! +
cvs commit: apache-1.3/src/include http_config.h
jim 98/06/29 12:02:04 Modified:src CHANGES src/include http_config.h Log: Hmmm... This name change involves an API change. For example, PHP3.0.1-dev now barfs (Rasmus, hint hint :) ) Revision ChangesPath 1.940 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.939 retrieving revision 1.940 diff -u -r1.939 -r1.940 --- CHANGES 1998/06/29 12:21:01 1.939 +++ CHANGES 1998/06/29 19:01:59 1.940 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) API: Name changes of table_elts to ap_table_elts and is_table_empty + to ap_is_table_empty. [Ben Laurie] + *) PORT: Add UnixWare 7 support [Vadim Kostoglodoff <[EMAIL PROTECTED]>] PR#2463 1.88 +1 -1 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- http_config.h 1998/05/27 14:01:31 1.87 +++ http_config.h 1998/06/29 19:02:03 1.88 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980527 +#define MODULE_MAGIC_NUMBER 19980627 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-devsite mmn.txt
jim 98/06/29 12:04:25 Modified:.mmn.txt Log: Document MMN bump for tables Revision ChangesPath 1.25 +3 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mmn.txt 1998/05/27 23:07:41 1.24 +++ mmn.txt 1998/06/29 19:04:25 1.25 @@ -66,3 +66,6 @@ This string will be printed in place of the canned error responses, and will be propagated to ErrorDocuments or cgi scripts in the (REDIRECT_)ERROR_NOTES variable. +19980627 (1.3.1-dev) - More renaming that we forgot/bypassed. In particular: +table_elts --> ap_table_elts +is_table_empty --> ap_is_table_empty
cvs commit: apache-1.3/src/include compat.h
jim 98/06/29 12:06:19 Modified:src/include compat.h Log: Be backwards compatible Revision ChangesPath 1.11 +2 -0 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- compat.h 1998/05/28 22:09:46 1.10 +++ compat.h 1998/06/29 19:06:18 1.11 @@ -176,6 +176,7 @@ #define is_fnmatch ap_is_fnmatch #define is_initial_req ap_is_initial_req #define is_matchexpap_is_matchexp +#define is_table_empty ap_is_table_empty #define is_url ap_is_url #define keepalive_timeout ap_keepalive_timeout #define kill_cleanup ap_kill_cleanup @@ -379,6 +380,7 @@ #define table_add ap_table_add #define table_addn ap_table_addn #define table_do ap_table_do +#define table_elts ap_table_elts #define table_get ap_table_get #define table_mergeap_table_merge #define table_mergen ap_table_mergen
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]);
