cvs commit: apache-1.3 configure
rse 00/02/05 06:29:00 Modified:src CHANGES .configure Log: Avoid infinite looping in APACI's configure script inside Ultrix' /bin/sh5 upgrade step. Submitted by: Jan Gallo <[EMAIL PROTECTED]>, Ralf S. Engelschall Reviewed by: Ralf S. Engelschall PR: 4940 Revision ChangesPath 1.1511+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1510 retrieving revision 1.1511 diff -u -r1.1510 -r1.1511 --- CHANGES 2000/02/05 14:15:41 1.1510 +++ CHANGES 2000/02/05 14:28:54 1.1511 @@ -1,5 +1,9 @@ Changes with Apache 1.3.12 + *) Avoid infinite looping in APACI's configure script + inside Ultrix' /bin/sh5 upgrade step. + [Jan Gallo <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#4940 + *) PORT: Add support for Amdahl UTS 4.3 and later. [Dave Dykstra <[EMAIL PROTECTED]>] PR#5654 1.119 +7 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- configure 2000/02/05 09:57:15 1.118 +++ configure 2000/02/05 14:28:59 1.119 @@ -68,7 +68,13 @@ ## ## avoid brain dead shells on Ultrix and friends ## -test -f /bin/sh5 && exec /bin/sh5 $0 "$@" +if [ -f /bin/sh5 ]; then +if [ ".$APACI_SH5_UPGRADE_STEP" != .done ]; then + APACI_SH5_UPGRADE_STEP=done + export APACI_SH5_UPGRADE_STEP + exec /bin/sh5 $0 "$@" +fi +fi ## ## the paths to the Apache source tree
cvs commit: apache-1.3/src CHANGES Configure
rse 00/02/05 06:15:46 Modified:src CHANGES Configure Log: PORT: Add support for Amdahl UTS 4.3 and later. Submitted by: Dave Dykstra <[EMAIL PROTECTED]> PR: 5654 Revision ChangesPath 1.1510+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1509 retrieving revision 1.1510 diff -u -r1.1509 -r1.1510 --- CHANGES 2000/02/05 12:33:13 1.1509 +++ CHANGES 2000/02/05 14:15:41 1.1510 @@ -1,5 +1,8 @@ Changes with Apache 1.3.12 + *) PORT: Add support for Amdahl UTS 4.3 and later. + [Dave Dykstra <[EMAIL PROTECTED]>] PR#5654 + *) Make implementation/descriptions of the FLAG directives AuthAuthoritative, MetaFiles and ExtendedStatus consistent with documentation and the standard way of implementation those directives. 1.392 +11 -4 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.391 retrieving revision 1.392 diff -u -r1.391 -r1.392 --- Configure 2000/01/20 02:54:54 1.391 +++ Configure 2000/02/05 14:15:42 1.392 @@ -676,10 +676,17 @@ LIBS="$LIBS -lPW" ;; *-uts*) - OS='Amdahl UTS' - CFLAGS="$CFLAGS -Xa -eft -DUTS21 -DUSEBCOPY" - LIBS="$LIBS -lsocket -lbsd -la" - DEF_WANTHSREGEX=yes + PLATOSVERS=`echo $PLAT | sed 's/^.*,//'` + OS='Amdahl UTS $PLATOSVERS' + case "$PLATOSVERS" in + 2*) CFLAGS="$CFLAGS -Xa -eft -DUTS21 -DUSEBCOPY" + LIBS="$LIBS -lsocket -lbsd -la" + DEF_WANTHSREGEX=yes + ;; + *) CFLAGS="$CFLAGS -Xa -DSVR4" + LIBS="$LIBS -lsocket -lnsl" + ;; + esac ;; *-ultrix) OS='ULTRIX'
cvs commit: apache-1.3 STATUS
jim 00/02/05 05:46:43 Modified:.STATUS Log: Release schedule for 1.3.12 Revision ChangesPath 1.802 +6 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.801 retrieving revision 1.802 diff -u -r1.801 -r1.802 --- STATUS2000/01/26 20:10:23 1.801 +++ STATUS2000/02/05 13:46:42 1.802 @@ -1,13 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/26 20:10:23 $] + Last modified at [$Date: 2000/02/05 13:46:42 $] Release: -1.3.12-dev: In development +1.3.12-dev: In development with a plan to RELEASE on Feb. 10, 2000. + Jim offers to be RM. + Feb. 6: Freeze CVS tree + Feb. 8: tag and roll tarball + Feb. 10: Announce and release 1.3.11: Tagged and rolled Jan. 19, 2000. Released and announced on the 21st. - PREBUILT BINARIES: see table at bottom - 1.3.10: Not released. Pulled at "last minute" due to a build bug in the MPE port. 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th.
cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
rse 00/02/05 04:33:17
Modified:src CHANGES
src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
Log:
Make implementation/descriptions of the FLAG directives
AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
documentation and the standard way of implementation those directives.
Submitted by: David MacKenzie <[EMAIL PROTECTED]>, Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 5642
Revision ChangesPath
1.1509+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- CHANGES 2000/02/05 12:01:48 1.1508
+++ CHANGES 2000/02/05 12:33:13 1.1509
@@ -1,5 +1,10 @@
Changes with Apache 1.3.12
+ *) Make implementation/descriptions of the FLAG directives
+ AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
+ documentation and the standard way of implementation those directives.
+ [David MacKenzie <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5642
+
*) Cast integer ap_wait_t values in http_main.c to get rid of compile
time errors on platforms where "ap_wait_t" is not defined as "int"
(currently only the NEXT and UTS21 platforms).
1.48 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_auth.c1999/08/02 20:50:22 1.47
+++ mod_auth.c2000/02/05 12:33:15 1.48
@@ -110,7 +110,7 @@
{"AuthAuthoritative", ap_set_flag_slot,
(void *) XtOffsetOf(auth_config_rec, auth_authoritative),
OR_AUTHCFG, FLAG,
- "Set to 'no' to allow access control to be passed along to lower
modules if the UserID is not known to this module"},
+ "Set to 'off' to allow access control to be passed along to lower
modules if the UserID is not known to this module"},
{NULL}
};
1.112 +3 -8 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_status.c 2000/02/02 20:44:06 1.111
+++ mod_status.c 2000/02/05 12:33:16 1.112
@@ -135,24 +135,19 @@
*command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
*/
-static const char *set_extended_status(cmd_parms *cmd, void *dummy, char
*arg)
+static const char *set_extended_status(cmd_parms *cmd, void *dummy, int arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
-if (!strcasecmp(arg, "off") || !strcmp(arg, "0")) {
- ap_extended_status = 0;
-}
-else {
- ap_extended_status = 1;
-}
+ap_extended_status = arg;
return NULL;
}
static const command_rec status_module_cmds[] =
{
-{ "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, TAKE1,
+{ "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, FLAG,
"\"On\" to enable extended status information, \"Off\" to disable" },
{NULL}
};
1.38 +2 -2 apache-1.3/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_cern_meta.c 1999/10/21 20:45:17 1.37
+++ mod_cern_meta.c 2000/02/05 12:33:16 1.38
@@ -169,7 +169,7 @@
typedef struct {
char *metadir;
char *metasuffix;
-char *metafiles;
+int metafiles;
} cern_meta_dir_config;
static void *create_cern_meta_dir_config(pool *p, char *dummy)
@@ -210,7 +210,7 @@
return NULL;
}
-static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config *
dconf, char *arg)
+static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config *
dconf, int arg)
{
dconf->metafiles = arg;
return NULL;
cvs commit: apache-2.0/src/lib/apr/shmem/unix/mm configure.in mm.h mm_conf.h.in mm_core.c
dreid 00/02/05 04:07:39 Modified:src/lib/apr/shmem/unix/mm configure.in mm.h mm_conf.h.in mm_core.c Log: This commit gets mm running on BeOS. With this BeOS APR once more compiles and builds cleanly. Not sure if this is how to update mm, but it gets things working again. Revision ChangesPath 1.3 +12 -0 apache-2.0/src/lib/apr/shmem/unix/mm/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in 1999/09/27 07:42:04 1.2 +++ configure.in 2000/02/05 12:07:37 1.3 @@ -93,12 +93,16 @@ AC_HAVE_HEADERS(unistd.h) AC_HAVE_FUNCS(getpagesize sysconf) AC_CHECK_DEFINE(_SC_PAGESIZE, unistd.h) +AC_HAVE_HEADERS(kernel/OS.h) +AC_CHECK_DEFINE(B_PAGE_SIZE, kernel/OS.h) AC_BEGIN_DECISION([memory page size determination]) AC_IFALLYES(header:unistd.h func:getpagesize, AC_DECIDE(MM_VMPS_GETPAGESIZE, [4.2BSD getpagesize()])) AC_IFALLYES(header:unistd.h func:sysconf define:_SC_PAGESIZE, AC_DECIDE(MM_VMPS_SYSCONF, [POSIX.1 sysconf(_SC_PAGESIZE)])) +AC_IFALLYES(header:kernel/OS.h define:B_PAGE_SIZE, +AC_DECIDE(MM_VMPS_BEOS, [BeOS B_PAGE_SIZE])) AC_END_DECISION AC_DEFINE_UNQUOTED($ac_decision) @@ -114,6 +118,8 @@ AC_TEST_FILE(/dev/zero) AC_HAVE_HEADERS(sys/ipc.h sys/shm.h sys/file.h) AC_HAVE_FUNCS(shmget shmat shmdt shmctl) +AC_HAVE_HEADERS(kernel/OS.h) +AC_HAVE_FUNCS(create_area) AC_BEGIN_DECISION([shared memory allocation method]) AC_IFALLYES(header:sys/mman.h func:mmap func:munmap, @@ -127,6 +133,8 @@ AC_DECIDE(MM_SHMT_IPCSHM, [SysV IPC shmget()])) AC_IFALLYES(header:sys/mman.h func:mmap func:munmap define:MAP_ANON, AC_DECIDE(MM_SHMT_MMANON, [4.4BSD-style mmap() via MAP_ANON])) +AC_IFALLYES(header:kernel/OS.h func:create_area, + AC_DECIDE(MM_SHMT_BEOS, [BeOS areas])) case $PLATFORM in *-*-linux* ) # Linux has problems with MM_SHMT_MMANON @@ -155,6 +163,8 @@ AC_CHECK_DEFINE(F_SETLK, fcntl.h) AC_CHECK_DEFINE(IPC_PRIVATE, sys/ipc.h) AC_CHECK_DEFINE(SEM_UNDO, sys/sem.h) +AC_HAVE_HEADERS(kernel/OS.h) +AC_CHECK_FUNCS(create_sem, kernel/OS.h) AC_MSG_CHECKING(whether union semun is defined in sys/sem.h) AC_TRY_COMPILE([ @@ -178,6 +188,8 @@ AC_DECIDE(MM_SEMT_IPCSEM, [SysV IPC semget()])) AC_IFALLYES(header:fcntl.h define:F_SETLK, AC_DECIDE(MM_SEMT_FCNTL, [SVR4-style fcntl() on temporary file])) +AC_IFALLYES(header:kernel/OS.h func:create_sem, +AC_DECIDE(MM_SEMT_BEOS, [BeOS semaphores/benaphores])) AC_ARG_WITH(sem,dnl [ --with-sem=TYPE force semaphore type: FLOCK FCNTL IPCSEM], AC_DECISION_FORCE(MM_SEMT_$withval) 1.3 +11 -0 apache-2.0/src/lib/apr/shmem/unix/mm/mm.h Index: mm.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mm.h 1999/09/27 07:42:08 1.2 +++ mm.h 2000/02/05 12:07:37 1.3 @@ -187,6 +187,10 @@ #include #endif +#ifdef MM_SHMT_BEOS +#include +#endif + #define MM_ALLOC_MINSIZE (1024*8) #define MM_CORE_FILEMODE (S_IRUSR|S_IWUSR) #define MM_CORE_DEFAULT_PAGESIZE (1024*8) @@ -262,6 +266,13 @@ int mc_fdmem; #if defined(MM_SHMT_MMFILE) char mc_fnmem[MM_MAXPATH]; +#endif +#if defined(MM_SHMT_BEOS) +area_id mc_areaid; +#endif +#if defined(MM_SEMT_BEOS) +sem_id mc_semid; +int32 mc_ben; #endif #if !defined(MM_SEMT_FLOCK) int mc_fdsem; 1.2 +3 -0 apache-2.0/src/lib/apr/shmem/unix/mm/mm_conf.h.in Index: mm_conf.h.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_conf.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mm_conf.h.in 1999/08/17 15:59:45 1.1 +++ mm_conf.h.in 2000/02/05 12:07:38 1.2 @@ -8,6 +8,7 @@ /* VM Page Size Determination */ #undef MM_VMPS_GETPAGESIZE #undef MM_VMPS_SYSCONF +#undef MM_VMPS_BEOS /* Shared Memory Type */ #undef MM_SHMT_MMANON @@ -15,6 +16,7 @@ #undef MM_SHMT_MMZERO #undef MM_SHMT_MMFILE #undef MM_SHMT_IPCSHM +#undef MM_SHMT_BEOS /* Shared Memory Maximum Segment Size */ #define MM_SHM_MAXSEGSIZE @MM_SHM_MAXSEGSIZE@ @@ -23,6 +25,7 @@ #undef MM_SEMT_FLOCK #undef MM_SEMT_FCNTL #undef MM_SEMT_IPCSEM +#undef MM_SEMT_BEOS /* Debugging */ #undef MM_DEBUG
cvs commit: apache-2.0/src/lib/apr/file_io/beos readwrite.c
dreid 00/02/05 04:05:06
Modified:src/lib/apr/file_io/beos readwrite.c
Log:
Remove the stated lines from readwrite.c to bring BeOS back in line
and get it building again.
Revision ChangesPath
1.6 +0 -9 apache-2.0/src/lib/apr/file_io/beos/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/readwrite.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- readwrite.c 1999/12/12 17:08:43 1.5
+++ readwrite.c 2000/02/05 12:05:06 1.6
@@ -119,7 +119,6 @@
rv = write(thefile->filedes, buf, *nbytes);
}
-thefile->stated = 0;
*nbytes = rv;
if (rv == -1) {
return errno;
@@ -160,7 +159,6 @@
}
else {
*iocnt = bytes;
-thefile->stated = 0;
return APR_SUCCESS;
}
}
@@ -176,7 +174,6 @@
{
if (thefile->buffered) {
if (fputc(ch, thefile->filehand) == ch) {
-thefile->stated = 0;
return APR_SUCCESS;
}
return errno;
@@ -184,7 +181,6 @@
if (write(thefile->filedes, &ch, 1) != 1) {
return errno;
}
-thefile->stated = 0;
return APR_SUCCESS;
}
@@ -198,13 +194,11 @@
{
if (thefile->buffered) {
if (ungetc(ch, thefile->filehand) == ch) {
-thefile->stated = 0;
return APR_SUCCESS;
}
return errno;
}
/* Not sure what to do in this case. For now, return SUCCESS. */
-thefile->stated = 0;
return APR_SUCCESS;
}
@@ -256,7 +250,6 @@
if (thefile->buffered) {
if (fputs(str, thefile->filehand)) {
-thefile->stated = 0;
return APR_SUCCESS;
}
return errno;
@@ -266,7 +259,6 @@
if (rv != len) {
return errno;
}
-thefile->stated = 0;
return APR_SUCCESS;
}
@@ -279,7 +271,6 @@
{
if (thefile->buffered) {
if (!fflush(thefile->filehand)) {
-thefile->stated = 0;
return APR_SUCCESS;
}
return errno;
cvs commit: apache-1.3/src/main http_main.c
rse 00/02/05 04:01:55
Modified:src CHANGES
src/main http_main.c
Log:
Cast integer ap_wait_t values in http_main.c to get rid of compile time
errors on platforms where "ap_wait_t" is not defined as "int" (currently
only the NEXT and UTS21 platforms). If you've a better non-evil-cast
solution, feel free to adjust this again.
Submitted by: Gary Bickford <[EMAIL PROTECTED]>, Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 5053
Revision ChangesPath
1.1508+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1507
retrieving revision 1.1508
diff -u -r1.1507 -r1.1508
--- CHANGES 2000/02/05 01:32:32 1.1507
+++ CHANGES 2000/02/05 12:01:48 1.1508
@@ -1,5 +1,10 @@
Changes with Apache 1.3.12
+ *) Cast integer ap_wait_t values in http_main.c to get rid of compile
+ time errors on platforms where "ap_wait_t" is not defined as "int"
+ (currently only the NEXT and UTS21 platforms).
+ [Gary Bickford <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#5053
+
*) The default suexec path was HTTPD_ROOT/sbin/suexec if not
configured via APACI. Changed to HTTPD_ROOT/bin/suexec.
[Lars Eilebrecht]
1.491 +5 -5 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- http_main.c 2000/01/26 20:10:38 1.490
+++ http_main.c 2000/02/05 12:01:52 1.491
@@ -1585,7 +1585,7 @@
for (pocr = &other_children; *pocr; pocr = &(*pocr)->next) {
if ((*pocr)->data == data) {
nocr = (*pocr)->next;
- (*(*pocr)->maintenance) (OC_REASON_UNREGISTER, (*pocr)->data, -1);
+ (*(*pocr)->maintenance) (OC_REASON_UNREGISTER, (*pocr)->data,
(ap_wait_t)-1);
*pocr = nocr;
/* XXX: um, well we've just wasted some space in pconf ? */
return;
@@ -1641,7 +1641,7 @@
continue;
if (FD_ISSET(ocr->write_fd, &writable_fds))
continue;
- (*ocr->maintenance) (OC_REASON_UNWRITABLE, ocr->data, -1);
+ (*ocr->maintenance) (OC_REASON_UNWRITABLE, ocr->data, (ap_wait_t)-1);
}
}
@@ -2460,16 +2460,16 @@
waitret = waitpid(ocr->pid, &status, WNOHANG);
if (waitret == ocr->pid) {
ocr->pid = -1;
- (*ocr->maintenance) (OC_REASON_DEATH, ocr->data, status);
+ (*ocr->maintenance) (OC_REASON_DEATH, ocr->data,
(ap_wait_t)status);
}
else if (waitret == 0) {
- (*ocr->maintenance) (OC_REASON_RESTART, ocr->data, -1);
+ (*ocr->maintenance) (OC_REASON_RESTART, ocr->data,
(ap_wait_t)-1);
++not_dead_yet;
}
else if (waitret == -1) {
/* uh what the heck? they didn't call unregister? */
ocr->pid = -1;
- (*ocr->maintenance) (OC_REASON_LOST, ocr->data, -1);
+ (*ocr->maintenance) (OC_REASON_LOST, ocr->data, (ap_wait_t)-1);
}
}
#endif
cvs commit: apache-1.3/htdocs/manual/mod mod_rewrite.html
rse 00/02/05 03:44:07 Modified:htdocs/manual/mod mod_rewrite.html Log: Fix description of regex quantifiers. Submitted by: Carl van Tast <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 5614 Revision ChangesPath 1.48 +1 -1 apache-1.3/htdocs/manual/mod/mod_rewrite.html Index: mod_rewrite.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_rewrite.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mod_rewrite.html 2000/01/08 14:50:12 1.47 +++ mod_rewrite.html 2000/02/05 11:44:06 1.48 @@ -1364,7 +1364,7 @@ Quantifiers: ? 0 or 1 of the preceding text - * 0 or N of the preceding text (N > 1) + * 0 or N of the preceding text (N > 0) + 1 or N of the preceding text (N > 1) Grouping:
cvs commit: apache-1.3/htdocs/manual/vhosts ip-based.html
rse 00/02/05 03:39:55 Modified:htdocs/manual/vhosts ip-based.html Log: Make clear that there are more directives which are actually not allowed in sections. Submitted by: sehh <[EMAIL PROTECTED] PR: 5596 Revision ChangesPath 1.6 +3 -2 apache-1.3/htdocs/manual/vhosts/ip-based.html Index: ip-based.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/vhosts/ip-based.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ip-based.html 1998/02/05 20:05:16 1.5 +++ ip-based.html 2000/02/05 11:39:54 1.6 @@ -119,8 +119,9 @@ Listen, PidFile, TypesConfig, -ServerRoot and -NameVirtualHost. +ServerRoot, +NameVirtualHost +and a few other directives. User and Group may be used inside a VirtualHost
cvs commit: apache-1.3/htdocs/manual/mod mod_mime.html
rse 00/02/05 03:34:38 Modified:htdocs/manual/mod mod_mime.html Log: Enhance AddCharset description. Submitted by: Youichirou Koga <[EMAIL PROTECTED]> PR: 5554 Revision ChangesPath 1.35 +5 -5 apache-1.3/htdocs/manual/mod/mod_mime.html Index: mod_mime.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_mime.html,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mod_mime.html 2000/01/08 19:57:29 1.34 +++ mod_mime.html 2000/02/05 11:34:36 1.35 @@ -139,12 +139,12 @@ -Then the document .ja.jis will be treated as being a +Then the document .ja.jis will be treated as being a Japanese document whose charset is ISO-2022-JP (as will the document -.jis.ja). Although the content charset is reported to -the client, the browser is unlikely to use this information. The -AddCharset directive is more useful for -content negotiation, where +.jis.ja). The AddCharset directive is useful for both +to inform the client about the character encoding of the document so +that the document can be interpreted and displayed appropriately, and +for content negotiation, where the server returns one from several documents based on the client's charset preference.
cvs commit: apache-1.3 configure
rse 00/02/05 01:57:16 Modified:.configure Log: Fix usage: it's '#-1' and not just '-1' Revision ChangesPath 1.118 +1 -1 apache-1.3/configure Index: configure === RCS file: /home/cvs/apache-1.3/configure,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- configure 2000/02/04 23:09:52 1.117 +++ configure 2000/02/05 09:57:15 1.118 @@ -444,7 +444,7 @@ echo " --without-confadjust disable the user/situation adjustments in config" echo " --without-execstripdisable the stripping of executables on installation" echo " --server-uid=UID set the user ID the web server should run as [nobody]" -echo " --server-gid=GID set the group ID the web server UID is a memeber of [-1]" +echo " --server-gid=GID set the group ID the web server UID is a memeber of [#-1]" echo "" echo "suEXEC options:" echo " --enable-suexecenable the suEXEC feature"
cvs commit: apache-1.3/src/support ab.c
rse 00/02/05 01:50:57
Modified:src/support ab.c
Log:
Typo
Revision ChangesPath
1.38 +3 -3 apache-1.3/src/support/ab.c
Index: ab.c
===
RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ab.c 1999/12/10 11:03:40 1.37
+++ ab.c 2000/02/05 09:50:54 1.38
@@ -81,7 +81,7 @@
**- Cleaned up by Ralf S. Engelschall <[EMAIL PROTECTED]>, March 1998
**- POST and verbosity by Kurt Sussman <[EMAIL PROTECTED]>, August
1998
**- HTML table output added by David N. Welton <[EMAIL PROTECTED]>,
January 1999
- **- Added Cookie, Arbitrary header and auth support. <[EMAIL
PROTECTED]>, April 199
+ **- Added Cookie, Arbitrary header and auth support. <[EMAIL
PROTECTED]>, April 1999
**
*/
@@ -884,14 +884,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.37
$> apache-1.3");
+ printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.38
$> apache-1.3");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n";);
printf("Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n";);
printf("\n");
}
else {
printf("\n");
- printf(" This is ApacheBench, Version %s <%s>
apache-1.3\n", VERSION, "$Revision: 1.37 $");
+ printf(" This is ApacheBench, Version %s <%s>
apache-1.3\n", VERSION, "$Revision: 1.38 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
http://www.zeustech.net/\n");
printf(" Copyright (c) 1998-1999 The Apache Group,
http://www.apache.org/\n");
printf("\n\n");
cvs commit: apache-1.3/src CHANGES
lars00/02/04 17:32:36 Modified:src CHANGES Log: added entry to src/CHANGES regarding SUEXEC_BIN Revision ChangesPath 1.1507+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1506 retrieving revision 1.1507 diff -u -r1.1506 -r1.1507 --- CHANGES 2000/02/04 23:05:28 1.1506 +++ CHANGES 2000/02/05 01:32:32 1.1507 @@ -1,5 +1,9 @@ Changes with Apache 1.3.12 + *) The default suexec path was HTTPD_ROOT/sbin/suexec if not + configured via APACI. Changed to HTTPD_ROOT/bin/suexec. + [Lars Eilebrecht] + *) Add an explicit charset=iso-8859-1 to pages generated by ap_send_error_response(), such as the default 404 page. [Marc Slemko]
cvs commit: apache-1.3/src/main http_core.c
jim 00/02/04 16:33:22
Modified:htdocs/manual/mod core.html
src/main http_core.c
Log:
Try to reduce confusion over multiple and possible "conflicting"
versions of the term "default" by changing AddDefaultCharset to
be of the mode Off | On | charset
Revision ChangesPath
1.165 +7 -5 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- core.html 2000/02/03 14:22:25 1.164
+++ core.html 2000/02/05 00:33:18 1.165
@@ -166,13 +166,13 @@
AddDefaultCharset directive
Syntax:
-AddDefaultCharset None / Default / charset
+AddDefaultCharset Off / On / charset
Context:
all
Status:
core
Default:
-AddDefaultCharset None
+AddDefaultCharset Off
Compatibility:
AddDefaultCharset is only available in Apache 1.3.12 and
later
@@ -180,9 +180,11 @@
to any response that does not have any parameter on the content
type in the HTTP headers. This will override any character set specified
in the body of the document via a META tag. A setting
-of AddDefaultCharset None disables this functionality.
-AddDefaultCharset Default is the exact same as
-AddDefaultCharsetName iso-8859-1.
+of AddDefaultCharset Off disables this functionality.
+AddDefaultCharset On enables Apache's internal
+default charset of iso-8859-1 as required by the
+directive. You can also specify an alternate charset to be used;
+e.g. AddDefaultCharset utf-8.
AddModule directive
1.280 +3 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- http_core.c 2000/02/03 14:22:33 1.279
+++ http_core.c 2000/02/05 00:33:21 1.280
@@ -1053,9 +1053,10 @@
if (err != NULL) {
return err;
}
-if (!strcasecmp(arg, "None"))
+if (!strcasecmp(arg, "Off")) {
d->add_default_charset = 0;
-else if (!strcasecmp(arg, "Default")) {
+}
+else if (!strcasecmp(arg, "On")) {
d->add_default_charset = 1;
d->add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
}
