cvs commit: apache-1.3 Makefile.tmpl
rse 99/05/03 03:23:46 Modified:src CHANGES .Makefile.tmpl Log: Add contributors name (Yitzchak Scott-Thoennes) and make install-quiet consistent. Revision ChangesPath 1.1340+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1339 retrieving revision 1.1340 diff -u -r1.1339 -r1.1340 --- CHANGES 1999/05/02 02:57:59 1.1339 +++ CHANGES 1999/05/03 10:23:44 1.1340 @@ -59,7 +59,7 @@ *) Add support for OS/2 (case insenstive filesystem, .exe suffix, etc) to APACI files and related scripts. - [?? <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#4269 + [Yitzchak Scott-Thoennes <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#4269 *) Add support for standalone mode in TPF [Joe Moenich <[EMAIL PROTECTED]>] 1.81 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- Makefile.tmpl 1999/05/02 16:42:30 1.80 +++ Makefile.tmpl 1999/05/03 10:23:46 1.81 @@ -242,7 +242,7 @@ # the non-verbose variant for package maintainers install-quiet: - @$(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) QUIET=1 install + @$(MAKE) -f $(TOP)/$(MKF) $(MFLAGS) $(MFWD) QUIET=1 install-all # create the installation tree install-mktree:
cvs commit: apache-1.3/src/main http_protocol.c
coar99/05/03 08:09:08 Modified:src CHANGES src/main http_protocol.c Log: If we're removing Vary from the response header, force the response to HTTP/1.0 for cache friendliness. Submitted by: Dmitry Khrustalev <[EMAIL PROTECTED]> Reviewed by: Ken Coar Revision ChangesPath 1.1341+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1340 retrieving revision 1.1341 diff -u -r1.1340 -r1.1341 --- CHANGES 1999/05/03 10:23:44 1.1340 +++ CHANGES 1999/05/03 15:09:04 1.1341 @@ -34,7 +34,7 @@ *) Add "force-no-vary" envariable to allow servers to work around clients that choke on "Vary" fields in the response header. - [Ken Coar] PR#4118 + [Ken Coar, Dmitry Khrustalev <[EMAIL PROTECTED]>] PR#4118 *) Fixed a bug in mod_dir that causes a child process will infinitely recurse when it attemps to handle a request for a directory wnd the 1.267 +4 -0 apache-1.3/src/main/http_protocol.c Index: http_protocol.c === RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- http_protocol.c 1999/04/29 15:06:52 1.266 +++ http_protocol.c 1999/05/03 15:09:07 1.267 @@ -1476,9 +1476,13 @@ /* * Remove the 'Vary' header field if the client can't handle it. + * Since this will have nasty effects on HTTP/1.1 caches, force + * the response into HTTP/1.0 mode. */ if (ap_table_get(r->subprocess_env, "force-no-vary") != NULL) { ap_table_unset(r->headers_out, "Vary"); + r->proto_num = HTTP_VERSION(1,0); + ap_table_set(r->subprocess_env, "force-response-1.0", "1"); } ap_hard_timeout("send headers", r);
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/05/03 12:05:19 Modified:src CHANGES src/modules/standard mod_autoindex.c Log: Rip loose another piece of mod_autoindex's configuration hairball, breaking the description handling free from the path/filename paradigm used for most of the stuff. Make AddDescription work as documented. PR: 1898, 3072 Revision ChangesPath 1.1342+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1341 retrieving revision 1.1342 diff -u -r1.1341 -r1.1342 --- CHANGES 1999/05/03 15:09:04 1.1341 +++ CHANGES 1999/05/03 19:05:11 1.1342 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Modify mod_autoindex's handling of AddDescription so that the + behaviour matches the documentation. [Ken Coar] PR#1898, 3072. + *) Add functionality to the install-bindist.sh script created by binbuild.sh to use tar when copying distribution files to the serverroot. This allows upgrading an existing installation 1.105 +76 -6 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- mod_autoindex.c 1999/05/01 17:13:04 1.104 +++ mod_autoindex.c 1999/05/03 19:05:17 1.105 @@ -72,6 +72,7 @@ #include "http_log.h" #include "http_main.h" #include "util_script.h" +#include "fnmatch.h" module MODULE_VAR_EXPORT autoindex_module; @@ -131,6 +132,12 @@ char *data; }; +typedef struct ai_desc_t { +char *pattern; +char *description; +int full_path; +} ai_desc_t; + typedef struct autoindex_config_struct { char *default_icon; @@ -143,8 +150,12 @@ int icon_height; char *default_order; -array_header *icon_list, *alt_list, *desc_list, *ign_list; -array_header *hdr_list, *rdme_list; +array_header *icon_list; +array_header *alt_list; +array_header *desc_list; +array_header *ign_list; +array_header *hdr_list; +array_header *rdme_list; } autoindex_config_rec; @@ -257,10 +268,31 @@ return NULL; } +/* + * Add description text for a filename pattern. Prefix the pattern + * with a wildcard unless it begins with '/' signifying an absolute + * path. If the pattern contains a '/' anywhere, add a slash to the + * prefix so that "bar/bletch" won't be matched by "foobar/bletch", + * and make a note that there's a delimiter; the matching routine + * simplifies to just the actual filename whenever it can. This allows + * definitions in parent directories to be made for files in subordinate + * ones using relative paths. Always postfix with a wildard so that + * partial or leading names will match. + */ static const char *add_desc(cmd_parms *cmd, void *d, char *desc, char *to) { -push_item(((autoindex_config_rec *) d)->desc_list, cmd->info, to, - cmd->path, desc); +autoindex_config_rec *dcfg = (autoindex_config_rec *) d; +ai_desc_t *desc_entry; +char *prefix = ""; + +desc_entry = (ai_desc_t *) ap_push_array(dcfg->desc_list); +desc_entry->full_path = (strchr(to, '/') == NULL) ? 0 : 1; +if (*to != '/') { + prefix = desc_entry->full_path ? "*/" : "*"; +} +desc_entry->pattern = ap_pstrcat(dcfg->desc_list->pool, + prefix, to, "*", NULL); +desc_entry->description = ap_pstrdup(dcfg->desc_list->pool, desc); return NULL; } @@ -530,7 +562,7 @@ new->name_adjust = K_UNSET; new->icon_list = ap_make_array(p, 4, sizeof(struct item)); new->alt_list = ap_make_array(p, 4, sizeof(struct item)); -new->desc_list = ap_make_array(p, 4, sizeof(struct item)); +new->desc_list = ap_make_array(p, 4, sizeof(ai_desc_t)); new->ign_list = ap_make_array(p, 4, sizeof(struct item)); new->hdr_list = ap_make_array(p, 4, sizeof(struct item)); new->rdme_list = ap_make_array(p, 4, sizeof(struct item)); @@ -688,7 +720,6 @@ #define find_icon(d,p,t) find_item(p,d->icon_list,t) #define find_alt(d,p,t) find_item(p,d->alt_list,t) -#define find_desc(d,p) find_item(p,d->desc_list,0) #define find_header(d,p) find_item(p,d->hdr_list,0) #define find_readme(d,p) find_item(p,d->rdme_list,0) @@ -705,6 +736,45 @@ r.content_type = r.content_encoding = NULL; return find_item(&r, d->icon_list, 1); +} + +/* + * Look through the list of pattern/description pairs and return the first one + * if any) that matches the filename in the re
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/05/03 13:48:44 Modified:src/modules/standard mod_autoindex.c Log: Improve the filename pattern matching so that we only do wildcard processing when we must, and simple scanning when we can. Revision ChangesPath 1.106 +49 -13apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- mod_autoindex.c 1999/05/03 19:05:17 1.105 +++ mod_autoindex.c 1999/05/03 20:48:43 1.106 @@ -136,6 +136,7 @@ char *pattern; char *description; int full_path; +int wildcards; } ai_desc_t; typedef struct autoindex_config_struct { @@ -269,16 +270,27 @@ } /* - * Add description text for a filename pattern. Prefix the pattern - * with a wildcard unless it begins with '/' signifying an absolute - * path. If the pattern contains a '/' anywhere, add a slash to the - * prefix so that "bar/bletch" won't be matched by "foobar/bletch", - * and make a note that there's a delimiter; the matching routine - * simplifies to just the actual filename whenever it can. This allows - * definitions in parent directories to be made for files in subordinate - * ones using relative paths. Always postfix with a wildard so that - * partial or leading names will match. + * Add description text for a filename pattern. If the pattern has + * wildcards already (or we need to add them), add leading and + * trailing wildcards to it to ensure substring processing. If the + * pattern contains a '/' anywhere, force wildcard matching mode, + * add a slash to the prefix so that "bar/bletch" won't be matched + * by "foobar/bletch", and make a note that there's a delimiter; + * the matching routine simplifies to just the actual filename + * whenever it can. This allows definitions in parent directories + * to be made for files in subordinate ones using relative paths. */ + +/* + * Absent a strcasestr() function, we have to force wildcards on + * systems for which "AAA" and "aaa" mean the same file. + */ +#ifdef CASE_BLIND_FILESYSTEM +#define WILDCARDS_REQUIRED 1 +#else +#define WILDCARDS_REQUIRED 0 +#endif + static const char *add_desc(cmd_parms *cmd, void *d, char *desc, char *to) { autoindex_config_rec *dcfg = (autoindex_config_rec *) d; @@ -287,11 +299,17 @@ desc_entry = (ai_desc_t *) ap_push_array(dcfg->desc_list); desc_entry->full_path = (strchr(to, '/') == NULL) ? 0 : 1; -if (*to != '/') { +desc_entry->wildcards = (WILDCARDS_REQUIRED + || desc_entry->full_path + || ap_is_fnmatch(to)); +if (desc_entry->wildcards) { prefix = desc_entry->full_path ? "*/" : "*"; + desc_entry->pattern = ap_pstrcat(dcfg->desc_list->pool, + prefix, to, "*", NULL); } -desc_entry->pattern = ap_pstrcat(dcfg->desc_list->pool, - prefix, to, "*", NULL); +else { + desc_entry->pattern = ap_pstrdup(dcfg->desc_list->pool, to); +} desc_entry->description = ap_pstrdup(dcfg->desc_list->pool, desc); return NULL; } @@ -745,6 +763,13 @@ * same as the order in which directives were processed, earlier matching * directives will dominate. */ + +#ifdef CASE_BLIND_FILESYSTEM +#define MATCH_FLAGS FNM_CASE_BLIND +#else +#define MATCH_FLAGS 0 +#endif + static char *find_desc(autoindex_config_rec *dcfg, request_rec *r) { int i; @@ -765,12 +790,23 @@ } for (i = 0; i < dcfg->desc_list->nelts; ++i) { ai_desc_t *tuple = &list[i]; + int found; /* * Only use the full-path filename if the pattern contains '/'s. */ filename = (tuple->full_path) ? filename_full : filename_only; - if (ap_fnmatch(tuple->pattern, filename, 0) == 0) { + /* + * Make the comparison using the cheapest method; only do + * wildcard checking if we must. + */ + if (tuple->wildcards) { + found = (ap_fnmatch(tuple->pattern, filename, MATCH_FLAGS) == 0); + } + else { + found = (strstr(filename, tuple->pattern) != NULL); + } + if (found) { return tuple->description; } }
cvs commit: apache-1.3 STATUS
coar99/05/03 14:38:02 Modified:.STATUS Log: What the hey, I'll raise my hand. Revision ChangesPath 1.683 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.682 retrieving revision 1.683 diff -u -r1.682 -r1.683 --- STATUS1999/04/17 08:43:26 1.682 +++ STATUS1999/05/03 21:38:01 1.683 @@ -1,9 +1,9 @@ 1.3 STATUS: - Last modified at [$Date: 1999/04/17 08:43:26 $] + Last modified at [$Date: 1999/05/03 21:38:01 $] Release: -1.3.7-dev: current. +1.3.7-dev: current. Ken volunteers to be release manager. 1.3.6. Tagged and rolled on Mar. 22. Released and announced on 24th. 1.3.5: Not released.
cvs commit: apache-1.3/htdocs/manual dso.html
randy 99/05/03 15:47:09 Modified:htdocs/manual dso.html Log: Update some supported platforms. Revision ChangesPath 1.11 +4 -4 apache-1.3/htdocs/manual/dso.html Index: dso.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/dso.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dso.html 1998/12/06 16:14:19 1.10 +++ dso.html 1999/05/03 22:47:08 1.11 @@ -174,15 +174,15 @@ (actually tested versions in parenthesis) -o FreeBSD(2.1.5, 2.2.5, 2.2.6) +o FreeBSD(2.1.5, 2.2.x, 3.x, 4.x) o OpenBSD(2.x) o NetBSD (1.3.1) -o BSDI (4.0) +o BSDI (3.x, 4.x) o Linux (Debian/1.3.1, RedHat/4.2) -o Solaris(2.4, 2.5.1, 2.6) +o Solaris(2.4, 2.5, 2.6, 2.7) o SunOS (4.1.3) o Digital UNIX (4.0) -o IRIX (6.2) +o IRIX (5.3, 6.2) o HP/UX (10.20) o UnixWare (2.01, 2.1.2) o SCO(5.0.4)
cvs commit: apache-1.3 config.layout
wsanchez99/05/03 16:02:57 Modified:.config.layout Log: Rename Rhapsody layout to Mac OS X Server. Set install locations to those appropriate for custom user built Apache. Revision ChangesPath 1.7 +5 -5 apache-1.3/config.layout Index: config.layout === RCS file: /home/cvs/apache-1.3/config.layout,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config.layout 1999/04/27 19:16:27 1.6 +++ config.layout 1999/05/03 23:02:57 1.7 @@ -62,17 +62,17 @@ # Apple's Mac OS X Server Layout - + prefix:/Local/Library/WebServer -exec_prefix: /usr +exec_prefix: /usr/local bindir:$exec_prefix/bin sbindir: $exec_prefix/sbin -libexecdir:/System/Library/Apache/Modules +libexecdir:/Local/Library/Apache/Modules mandir:$exec_prefix/share/man sysconfdir:$prefix/Configuration datadir: $prefix -includedir: /System/Library/Frameworks/Apache.framework/Versions/1.3/Headers -localstatedir: /private/var +includedir: /Local/Library/Frameworks/Apache.framework/Versions/1.3/Headers +localstatedir: /var runtimedir:$prefix/Logs logfiledir:$prefix/Logs proxycachedir: $prefix/ProxyCache
cvs commit: apache-1.3/src/os/unix os.h
wsanchez99/05/03 16:03:46 Modified:src/os/unix os.h Log: On Mac OS, say "Mac OS", not "Unix". Revision ChangesPath 1.40 +4 -0 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- os.h 1999/05/02 14:01:03 1.39 +++ os.h 1999/05/03 23:03:45 1.40 @@ -60,7 +60,11 @@ #include "ap_config.h" +#ifdef MAC_OS +#define PLATFORM "Mac OS" +#else #define PLATFORM "Unix" +#endif /* * This file in included in all Apache source code. It contains definitions
cvs commit: apache-1.3/src/os/unix os.c
wsanchez99/05/03 16:06:06 Modified:src/os/unix os.c Log: Use macro "HAVE_DYLD" instead of "RHAPSODY" for dyld-specific code. Add macro "DYLD_CANT_UNLOAD" around workaround for dyld-unloading-is-a-noop. Revision ChangesPath 1.16 +15 -8 apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- os.c 1998/09/16 06:49:44 1.15 +++ os.c 1999/05/03 23:06:05 1.16 @@ -26,8 +26,15 @@ * dynamic shared object (DSO) mechanism */ -#ifdef RHAPSODY +#ifdef HAVE_DYLD /* NeXT/Apple dynamic linker */ #include + +/* + * NSUnlinkModule() is a noop in old versions of dyld. + * Let's install an error handler to deal with "multiply defined + * symbol" runtime errors. + */ +#ifdef DYLD_CANT_UNLOAD #include "httpd.h" #include "http_log.h" @@ -49,7 +56,6 @@ * every time we reload a module. Workaround here is to just * rebind to the new symbol, and forget about the old one. * This is crummy, because it's basically a memory leak. - * (See Radar 2262020 against dyld). */ #ifdef DEBUG @@ -73,11 +79,12 @@ abort(); } -#endif /*RHAPSODY*/ +#endif /* DYLD_CANT_UNLOAD */ +#endif /* HAVE_DYLD */ void ap_os_dso_init(void) { -#if defined(RHAPSODY) +#if defined(HAVE_DYLD) && defined(DYLD_CANT_UNLOAD) NSLinkEditErrorHandlers handlers; handlers.undefined = undefined_symbol_handler; @@ -95,7 +102,7 @@ handle = shl_load(path, BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L); return (void *)handle; -#elif defined(RHAPSODY) +#elif defined(HAVE_DYLD) NSObjectFileImage image; if (NSCreateObjectFileImageFromFile(path, &image) != NSObjectFileImageSuccess) @@ -116,7 +123,7 @@ #if defined(HPUX) || defined(HPUX10) shl_unload((shl_t)handle); -#elif defined(RHAPSODY) +#elif defined(HAVE_DYLD) NSUnLinkModule(handle,FALSE); #else @@ -138,7 +145,7 @@ status = shl_findsym((shl_t *)&handle, symname, TYPE_DATA, &symaddr); return (status == -1 ? NULL : symaddr); -#elif defined(RHAPSODY) +#elif defined(HAVE_DYLD) NSSymbol symbol; char *symname2 = (char*)malloc(sizeof(char)*(strlen(symname)+2)); sprintf(symname2, "_%s", symname); @@ -163,7 +170,7 @@ { #if defined(HPUX) || defined(HPUX10) return strerror(errno); -#elif defined(RHAPSODY) +#elif defined(HAVE_DYLD) return NULL; #else return dlerror();
cvs commit: apache-1.3/src/include ap_config.h hsregex.h
wsanchez99/05/03 16:07:54 Modified:src Configure src/helpers GuessOS src/include ap_config.h hsregex.h Log: Add support for Mac OS (versions 10.0 and greater), using macro MAC_OS. Rename RHAPSODY macro to MAC_OS_X_SERVER. Revision ChangesPath 1.340 +7 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- Configure 1999/04/29 18:48:53 1.339 +++ Configure 1999/05/03 23:07:42 1.340 @@ -490,9 +490,14 @@ ;; *-apple-rhapsody*) OS='Mac OS X Server' - CFLAGS="$CFLAGS -DRHAPSODY" + CFLAGS="$CFLAGS -DMAC_OS_X_SERVER" DEF_WANTHSREGEX=yes ;; +*-apple-macos*) + OS='Mac OS' + CFLAGS="$CFLAGS -DMAC_OS" + DEF_WANTHSREGEX=yes + ;; *-dec-osf*) OS='DEC OSF/1' CFLAGS="$CFLAGS -DOSF1" @@ -999,7 +1004,7 @@ LDFLAGS_SHLIB="-shared" LDFLAGS_SHLIB_EXPORT="-rdynamic" ;; - *-apple-rhapsody*) + *-apple-rhapsody* | *-apple-macos* ) LD_SHLIB="cc" CFLAGS_SHLIB="" LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress' 1.60 +6 -1 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- GuessOS 1999/04/21 14:30:25 1.59 +++ GuessOS 1999/05/03 23:07:45 1.60 @@ -243,9 +243,14 @@ Rhapsody:*:*:*) case "${MACHINE}" in - Power*) MACHINE=powerpc ;; + "Power Macintosh") MACHINE=powerpc ;; esac echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0 + ;; + +"Mac OS":*:*:*) + MACHINE=`uname -p` + echo "${MACHINE}-apple-macos${RELEASE}"; exit 0 ;; "RISC iX":*) 1.256 +41 -9 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- ap_config.h 1999/04/27 20:36:29 1.255 +++ ap_config.h 1999/05/03 23:07:52 1.256 @@ -384,12 +384,18 @@ #define NO_USE_SIGACTION #define HAVE_SYSLOG 1 -#elif defined(RHAPSODY) /* Mac OS X Server */ +#elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and Mac OS X Server (<= 5.x) */ +#define HAVE_DYLD +#ifdef MAC_OS_X_SERVER +#define DYLD_CANT_UNLOAD +#endif /* MAC_OS_X_SERVER */ #define HAVE_GMTOFF #define HAVE_MMAP #define USE_MMAP_FILES #define USE_MMAP_SCOREBOARD +#ifdef MAC_OS_X_SERVER #define MAP_TMPFILE +#endif /* MAC_OS_X_SERVER */ #define HAVE_RESOURCE #define HAVE_SNPRINTF #define JMP_BUF jmp_buf @@ -397,26 +403,52 @@ #define USE_FLOCK_SERIALIZED_ACCEPT #define SINGLE_LISTEN_UNSERIALIZED_ACCEPT /* - * If you are using APACI, (you should be on Rhapsody) these - * values are set at configure time. These are here as reference; - * the apache that is built into Rhapsody is configured with - * these values. + * If you are using APACI, (you probably should be on Mac OS) these + * values are set at configure time. */ -#if 0 +#ifndef HTTPD_ROOT #define HTTPD_ROOT "/Local/Library/WebServer" +#endif +#ifndef DOCUMENT_LOCATION #define DOCUMENT_LOCATION HTTPD_ROOT "/Documents" +#endif +#ifndef DEFAULT_XFERLOG #define DEFAULT_XFERLOG "Logs/Access" +#endif +#ifndef DEFAULT_ERRORLOG #define DEFAULT_ERRORLOG"Logs/Errors" +#endif +#ifndef DEFAULT_PIDLOG #define DEFAULT_PIDLOG "Logs/Process" +#endif +#ifndef DEFAULT_SCOREBOARD #define DEFAULT_SCOREBOARD "Logs/Status" +#endif +#ifndef DEFAULT_LOCKFILE #define DEFAULT_LOCKFILE"Logs/Lock" +#endif +#ifndef SERVER_CONFIG_FILE #define SERVER_CONFIG_FILE "Configuration/Server" +#endif +#ifndef RESOURCE_CONFIG_FILE #define RESOURCE_CONFIG_FILE"Configuration/Resources" +#endif +#ifndef TYPES_CONFIG_FILE #define TYPES_CONFIG_FILE "Configuration/MIME" +#endif +#ifndef ACCESS_CONFIG_FILE #define ACCESS_CONFIG_FILE "Configuration/Access" +#endif +#ifndef DEFAULT_USER_DIR #define DEFAULT_USER_DIR"Library/Web Documents" -#define DEFAULT_USER"nobody" -#define DEFAULT_GROUP "nogroup" +#endif +#ifndef DEFAULT_USER +#define DEFAULT_USER"www" +#endif +#ifndef DEFAULT_GROUP +#define DEFAULT_GROUP "www" +#endif +#ifndef DEFAULT
cvs commit: apache-1.3/htdocs/manual dso.html
wsanchez99/05/03 16:23:04 Modified:htdocs/manual dso.html Log: Add Apple platforms. Update the date. Revision ChangesPath 1.12 +3 -1 apache-1.3/htdocs/manual/dso.html Index: dso.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/dso.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dso.html 1999/05/03 22:47:08 1.11 +++ dso.html 1999/05/03 23:23:03 1.12 @@ -166,7 +166,7 @@ Apache's src/Configure script currently has only limited but adequate built-in knowledge on how to compile DSO files, because as already mentioned this is heavily platform-dependent. Nevertheless all major Unix -platforms are supported. The definitive current state (May 1998) is this: +platforms are supported. The definitive current state (May 1999) is this: @@ -189,6 +189,8 @@ o AIX(3.2, 4.1.5, 4.2, 4.3) o ReliantUNIX/SINIX (5.43) o SVR4 (-) +o Mac OS X Server(1.0) +o Mac OS (10.0 preview 1)
cvs commit: apache-1.3 STATUS
wsanchez99/05/03 16:49:26 Modified:.STATUS Log: Revision ChangesPath 1.684 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.683 retrieving revision 1.684 diff -u -r1.683 -r1.684 --- STATUS1999/05/03 21:38:01 1.683 +++ STATUS1999/05/03 23:49:25 1.684 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/03 21:38:01 $] + Last modified at [$Date: 1999/05/03 23:49:25 $] Release: @@ -84,6 +84,12 @@ Available Patches: + +* Fred's patch for changing the default layout on Mac OS and Mac + OS X Server. +Message-ID: <[EMAIL PROTECTED]> + Status: Ralf -1 + Alexei, Randy, Greg +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: <[EMAIL PROTECTED]>