cvs commit: apache-1.3/src/helpers GuessOS
jim 98/10/03 12:28:20 Modified:src CHANGES Configure src/helpers GuessOS Log: Add the DRS 6000 Port Submitted by: Paul Debleecker <[EMAIL PROTECTED]> Revision ChangesPath 1.1098+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1097 retrieving revision 1.1098 diff -u -r1.1097 -r1.1098 --- CHANGES 1998/10/03 16:49:30 1.1097 +++ CHANGES 1998/10/03 19:28:16 1.1098 @@ -1,5 +1,7 @@ Changes with Apache 1.3.3 + *) PORT: DRS 6000 machine. [Paul Debleecker <[EMAIL PROTECTED]>] + *) Add the server signature text (from the core ServerSignature directive) to the list of envariables available to scripts, SSI, and the like. [Ken Coar] 1.297 +6 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- Configure 1998/09/30 15:48:07 1.296 +++ Configure 1998/10/03 19:28:17 1.297 @@ -708,6 +708,12 @@ DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" ;; +drs6000*) +OS='DRS6000' +CFLAGS="$CFLAGS -DSVR4" +DEF_WANTHSREGEX=yes +LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" +;; *) # default: Catch systems we don't know about OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \"$PLAT\" 1.49 +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.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- GuessOS 1998/09/30 15:48:08 1.48 +++ GuessOS 1998/10/03 19:28:19 1.49 @@ -247,8 +247,13 @@ *:4.0:2:*) echo "whatever-unisys-sysv4"; exit 0; ;; + *:*:dcosx:NILE*) echo "pyramid-pyramid-svr4"; exit 0; + ;; + +*:*:*:DRS 6000) +echo "drs6000-whatever-whatever"; exit 0; ;; esac
cvs commit: apache-1.3/src/include ap_mmn.h
marc98/10/03 11:46:02 Modified:src/include ap_mmn.h Log: Sync with things in mmn.txt but not in ap_mmn.h. Revision ChangesPath 1.9 +3 -0 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ap_mmn.h 1998/09/17 20:23:41 1.8 +++ ap_mmn.h 1998/10/03 18:46:01 1.9 @@ -159,6 +159,9 @@ * 4. compat.h-> ap_compat.h * 5. apctype.h -> ap_ctype.h * 19980806 (1.3.2-dev) - add ap_log_rerror() + * - add ap_scan_script_header_err_core() + * - add ap_uuencode() + * - add ap_custom_response() * 19980811 (1.3.2-dev) - added limit_req_line, limit_req_fieldsize, and * limit_req_fields to server_rec. * added limit_req_body to core_dir_config and
cvs commit: apache-1.3/src/main util_script.c
coar98/10/03 09:49:33
Modified:src CHANGES
src/main util_script.c
Log:
Make it even easier for sites to present uniform content by
making the server's signature text, which is added to server-
generated pages, available to all types of requests. Then
scripts, SSI pages, and such can all use the same signature
as the server's generated pages if desired.
Revision ChangesPath
1.1097+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1096
retrieving revision 1.1097
diff -u -r1.1096 -r1.1097
--- CHANGES 1998/10/03 15:33:33 1.1096
+++ CHANGES 1998/10/03 16:49:30 1.1097
@@ -1,5 +1,9 @@
Changes with Apache 1.3.3
+ *) Add the server signature text (from the core ServerSignature directive)
+ to the list of envariables available to scripts, SSI, and the like.
+ [Ken Coar]
+
*) PORT: Fix sys/resource.h handling for SCO 3.x platform.
[M. Laak <[EMAIL PROTECTED]>] PR#3108
1.133 +1 -0 apache-1.3/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- util_script.c 1998/09/21 21:09:48 1.132
+++ util_script.c 1998/10/03 16:49:32 1.133
@@ -262,6 +262,7 @@
#endif
ap_table_addn(e, "PATH", env_path);
+ap_table_setn(e, "SERVER_SIGNATURE", ap_psignature("", r));
ap_table_addn(e, "SERVER_SOFTWARE", ap_get_server_version());
ap_table_addn(e, "SERVER_NAME", ap_get_server_name(r));
ap_table_addn(e, "SERVER_PORT",
cvs commit: apache-1.3/src/include ap_config.h
rse 98/10/03 08:33:36 Modified:src CHANGES src/include ap_config.h Log: PORT: Fix sys/resource.h handling for SCO 3.x platform. Submitted by: M. Laak <[EMAIL PROTECTED]> PR: 3108 Revision ChangesPath 1.1096+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1095 retrieving revision 1.1096 diff -u -r1.1095 -r1.1096 --- CHANGES 1998/10/03 15:24:48 1.1095 +++ CHANGES 1998/10/03 15:33:33 1.1096 @@ -1,4 +1,7 @@ Changes with Apache 1.3.3 + + *) PORT: Fix sys/resource.h handling for SCO 3.x platform. + [M. Laak <[EMAIL PROTECTED]>] PR#3108 *) Fallback from sysconf-based to plain HZ-based `ticks per second' calculation in mod_status for all systems which don't have POSIX 1.239 +1 -0 apache-1.3/src/include/ap_config.h Index: ap_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- ap_config.h 1998/10/03 10:46:50 1.238 +++ ap_config.h 1998/10/03 15:33:35 1.239 @@ -465,6 +465,7 @@ #define NO_WRITEV #include #define HAVE_SYSLOG 1 +#undef HAVE_SYS_RESOURCE_H #elif defined(SCO5)
cvs commit: apache-1.3/src/modules/standard mod_digest.c
coar98/10/03 08:31:59
Modified:src/modules/standard mod_digest.c
Log:
Fix another potentially troublesome LWSP==SP assumption.
Revision ChangesPath
1.40 +2 -2 apache-1.3/src/modules/standard/mod_digest.c
Index: mod_digest.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_digest.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_digest.c 1998/08/09 21:03:25 1.39
+++ mod_digest.c 1998/10/03 15:31:59 1.40
@@ -159,7 +159,7 @@
return AUTH_REQUIRED;
}
-if (strcasecmp(scheme=ap_getword(r->pool, &auth_line, ' '), "Digest")) {
+if (strcasecmp(scheme = ap_getword_white(r->pool, &auth_line),
"Digest")) {
/* Client tried to authenticate using wrong auth scheme */
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
"client used wrong authentication scheme: %s for %s",
@@ -345,7 +345,7 @@
method_restricted = 1;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "valid-user"))
return OK;
else if (!strcmp(w, "user")) {
cvs commit: apache-1.3/src/modules/standard mod_status.c
rse 98/10/03 08:24:51 Modified:src CHANGES src/modules/standard mod_status.c Log: Fallback from sysconf-based to plain HZ-based `ticks per second' calculation in mod_status for all systems which don't have POSIX sysconf() (like UTS 2.1) and not only for the NEXT platform. Submitted by: Dave Dykstra <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 3055 Revision ChangesPath 1.1095+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1094 retrieving revision 1.1095 diff -u -r1.1094 -r1.1095 --- CHANGES 1998/10/03 15:11:50 1.1094 +++ CHANGES 1998/10/03 15:24:48 1.1095 @@ -1,4 +1,9 @@ Changes with Apache 1.3.3 + + *) Fallback from sysconf-based to plain HZ-based `ticks per second' + calculation in mod_status for all systems which don't have POSIX + sysconf() (like UTS 2.1) and not only for the NEXT platform. + [Dave Dykstra <[EMAIL PROTECTED]>] PR#3055 *) Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and mod_auth_db by using ap_getword_white() (which uses ap_isspace()) instead of 1.99 +5 -3 apache-1.3/src/modules/standard/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- mod_status.c 1998/08/12 10:23:46 1.98 +++ mod_status.c 1998/10/03 15:24:51 1.99 @@ -240,10 +240,12 @@ unsigned long bcount = 0; unsigned long kbcount = 0; long req_time; -#if defined(NEXT) -float tick = HZ; -#elif !defined(NO_TIMES) +#ifndef NO_TIMES +#ifdef _SC_CLK_TCK float tick = sysconf(_SC_CLK_TCK); +#else +float tick = HZ; +#endif #endif int short_report = 0; int no_table_report = 0;
cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
rse 98/10/03 08:11:54
Modified:src CHANGES
src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
Log:
Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and mod_auth_db
by using ap_getword_white() (which uses ap_isspace()) instead of
ap_getword(..., ' ') (which parses only according to spaces but not tabs).
Submitted by: James Morris <[EMAIL PROTECTED]>
Reviewed and extended to other mods: Ralf S. Engelschall
PR: 3105
Revision ChangesPath
1.1094+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -r1.1093 -r1.1094
--- CHANGES 1998/10/03 14:42:23 1.1093
+++ CHANGES 1998/10/03 15:11:50 1.1094
@@ -1,5 +1,10 @@
Changes with Apache 1.3.3
+ *) Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and
+ mod_auth_db by using ap_getword_white() (which uses ap_isspace())
instead of
+ ap_getword(..., ' ') (which parses only according to spaces but not
tabs).
+ [James Morris <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#3105
+
*) Fix the SERVER_NAME variable under sub-request situations (where
`UseCanonicalName off' is used) like CGI's called from SSI pages or
RewriteCond variables by adopting r->hostname to sub-requests.
1.40 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_auth.c1998/08/06 17:30:54 1.39
+++ mod_auth.c1998/10/03 15:11:52 1.40
@@ -264,7 +264,7 @@
method_restricted = 1;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "valid-user"))
return OK;
if (!strcmp(w, "user")) {
1.34 +2 -2 apache-1.3/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_auth_db.c 1998/09/19 12:12:36 1.33
+++ mod_auth_db.c 1998/10/03 15:11:52 1.34
@@ -281,7 +281,7 @@
continue;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "group") && sec->auth_dbgrpfile) {
const char *orig_groups, *groups;
@@ -298,7 +298,7 @@
}
orig_groups = groups;
while (t[0]) {
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
groups = orig_groups;
while (groups[0]) {
v = ap_getword(r->pool, &groups, ',');
1.40 +2 -2 apache-1.3/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_auth_dbm.c1998/08/06 17:30:55 1.39
+++ mod_auth_dbm.c1998/10/03 15:11:53 1.40
@@ -266,7 +266,7 @@
continue;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "group") && sec->auth_dbmgrpfile) {
const char *orig_groups, *groups;
@@ -283,7 +283,7 @@
}
orig_groups = groups;
while (t[0]) {
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
groups = orig_groups;
while (groups[0]) {
v = ap_getword(r->pool, &groups, ',');
cvs commit: apache-1.3/src/main http_request.c
rse 98/10/03 07:42:29 Modified:src CHANGES src/main http_request.c Log: Fix the SERVER_NAME variable under sub-request situations (where `UseCanonicalName off' is used) like CGI's called from SSI pages or RewriteCond variables by adopting r->hostname to sub-requests. Submitted by: James Grinter <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall PR: 3111 Revision ChangesPath 1.1093+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1092 retrieving revision 1.1093 diff -u -r1.1092 -r1.1093 --- CHANGES 1998/10/03 14:07:07 1.1092 +++ CHANGES 1998/10/03 14:42:23 1.1093 @@ -1,5 +1,10 @@ Changes with Apache 1.3.3 + *) Fix the SERVER_NAME variable under sub-request situations (where + `UseCanonicalName off' is used) like CGI's called from SSI pages or + RewriteCond variables by adopting r->hostname to sub-requests. + [James Grinter <[EMAIL PROTECTED]>] PR#3111 + *) Fix stderr redirection under syslog-based error logging situation. [Youichirou Koga <[EMAIL PROTECTED]>] PR#3095 1.132 +2 -0 apache-1.3/src/main/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- http_request.c1998/10/01 04:14:42 1.131 +++ http_request.c1998/10/03 14:42:28 1.132 @@ -676,6 +676,7 @@ char *udir; rnew = make_sub_request(r); +rnew->hostname = r->hostname; rnew->request_time = r->request_time; rnew->connection = r->connection; rnew->server = r->server; @@ -753,6 +754,7 @@ char *fdir; rnew = make_sub_request(r); +rnew->hostname = r->hostname; rnew->request_time = r->request_time; rnew->connection = r->connection; rnew->server = r->server;
cvs commit: apache-1.3/src/main http_log.c
rse 98/10/03 07:28:56
Modified:src/main http_log.c
Log:
The second part of the patch from Youichirou Koga <[EMAIL PROTECTED]>
(PR#3095). These are now only coding style fixups, because the bugfix parts
I've already extracted and committed separately.
Revision ChangesPath
1.72 +89 -86apache-1.3/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- http_log.c1998/10/03 14:07:08 1.71
+++ http_log.c1998/10/03 14:28:55 1.72
@@ -154,7 +154,7 @@
{NULL, -1},
};
-static int error_log_child (void *cmd, child_info *pinfo)
+static int error_log_child(void *cmd, child_info *pinfo)
{
/* Child process code for 'ErrorLog "|..."';
* may want a common framework for this, since I expect it will
@@ -165,23 +165,23 @@
ap_cleanup_for_exec();
#ifdef SIGHUP
/* No concept of a child process on Win32 */
-signal (SIGHUP, SIG_IGN);
+signal(SIGHUP, SIG_IGN);
#endif /* ndef SIGHUP */
#if defined(WIN32)
-child_pid = spawnl (_P_NOWAIT, SHELL_PATH, SHELL_PATH, "/c", (char
*)cmd, NULL);
+child_pid = spawnl(_P_NOWAIT, SHELL_PATH, SHELL_PATH, "/c", (char *)cmd,
NULL);
return(child_pid);
#elif defined(OS2)
/* For OS/2 we need to use a '/' */
-execl (SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
+execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
#else
-execl (SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
+execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
#endif
-exit (1);
+exit(1);
/* NOT REACHED */
return(child_pid);
}
-static void open_error_log (server_rec *s, pool *p)
+static void open_error_log(server_rec *s, pool *p)
{
char *fname;
@@ -190,9 +190,9 @@
if (!ap_spawn_child(p, error_log_child, (void *)(s->error_fname+1),
kill_after_timeout, &dummy, NULL, NULL)) {
- perror ("ap_spawn_child");
- fprintf (stderr, "Couldn't fork child for ErrorLog process\n");
- exit (1);
+ perror("ap_spawn_child");
+ fprintf(stderr, "Couldn't fork child for ErrorLog process\n");
+ exit(1);
}
s->error_log = dummy;
@@ -219,8 +219,8 @@
}
#endif
else {
- fname = ap_server_root_relative (p, s->error_fname);
-if(!(s->error_log = ap_pfopen(p, fname, "a"))) {
+ fname = ap_server_root_relative(p, s->error_fname);
+if (!(s->error_log = ap_pfopen(p, fname, "a"))) {
perror("fopen");
fprintf(stderr,"httpd: could not open error log file %s.\n",
fname);
exit(1);
@@ -228,12 +228,12 @@
}
}
-void ap_open_logs (server_rec *s_main, pool *p)
+void ap_open_logs(server_rec *s_main, pool *p)
{
server_rec *virt, *q;
int replace_stderr;
-open_error_log (s_main, p);
+open_error_log(s_main, p);
replace_stderr = 1;
if (s_main->error_log) {
@@ -262,21 +262,23 @@
if (q->error_fname != NULL &&
strcmp(q->error_fname, virt->error_fname) == 0)
break;
- if (q == virt) open_error_log (virt, p);
- else virt->error_log = q->error_log;
+ if (q == virt)
+ open_error_log(virt, p);
+ else
+ virt->error_log = q->error_log;
}
else
virt->error_log = s_main->error_log;
}
}
-API_EXPORT(void) ap_error_log2stderr (server_rec *s) {
+API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
if ( s->error_log != NULL
&& fileno(s->error_log) != STDERR_FILENO)
dup2(fileno(s->error_log), STDERR_FILENO);
}
-static void log_error_core (const char *file, int line, int level,
+static void log_error_core(const char *file, int line, int level,
const server_rec *s, const request_rec *r,
const char *fmt, va_list args)
{
@@ -424,7 +426,7 @@
#endif
}
-API_EXPORT(void) ap_log_error (const char *file, int line, int level,
+API_EXPORT(void) ap_log_error(const char *file, int line, int level,
const server_rec *s, const char *fmt, ...)
{
va_list args;
@@ -457,18 +459,19 @@
va_end(args);
}
-void ap_log_pid (pool *p, char *fname)
+void ap_log_pid(pool *p, char *fname)
{
FILE *pid_file;
struct stat finfo;
static pid_t saved_pid = -1;
pid_t mypid;
-if (!fname) return;
+if (!fname)
+ return;
-fname = ap_server_root_relative (p, fname);
+fname = ap_server_roo
cvs commit: apache-1.3/src/main http_log.c
rse 98/10/03 07:07:09
Modified:src CHANGES
src/main http_log.c
Log:
Fix stderr redirection under syslog-based error logging situation.
PS: This is actually an extracted sub-patch of a large patch which contains
lots of style changes, too. The style changes I'll commit in a second
round (I don't want to commit the stuff mixed together). Only one change
(2->STDERR_FILENO) is committed also now, because it's more like a bugfix.
Submitted by: Youichirou Koga <[EMAIL PROTECTED]>
PR: 3095
Revision ChangesPath
1.1092+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1091
retrieving revision 1.1092
diff -u -r1.1091 -r1.1092
--- CHANGES 1998/10/03 13:38:29 1.1091
+++ CHANGES 1998/10/03 14:07:07 1.1092
@@ -1,5 +1,8 @@
Changes with Apache 1.3.3
+ *) Fix stderr redirection under syslog-based error logging situation.
+ [Youichirou Koga <[EMAIL PROTECTED]>] PR#3095
+
*) Document `ErrorLog syslog:facility' variant of error logging.
[Youichirou Koga <[EMAIL PROTECTED]>] PR#3096
1.71 +4 -3 apache-1.3/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- http_log.c1998/09/25 12:27:05 1.70
+++ http_log.c1998/10/03 14:07:08 1.71
@@ -239,7 +239,7 @@
if (s_main->error_log) {
/* replace stderr with this new log */
fflush(stderr);
- if (dup2(fileno(s_main->error_log), 2) == -1) {
+ if (dup2(fileno(s_main->error_log), STDERR_FILENO) == -1) {
ap_log_error(APLOG_MARK, APLOG_CRIT, s_main,
"unable to replace stderr with error_log");
} else {
@@ -271,8 +271,9 @@
}
API_EXPORT(void) ap_error_log2stderr (server_rec *s) {
-if(fileno(s->error_log) != STDERR_FILENO)
-dup2(fileno(s->error_log),STDERR_FILENO);
+if ( s->error_log != NULL
+&& fileno(s->error_log) != STDERR_FILENO)
+dup2(fileno(s->error_log), STDERR_FILENO);
}
static void log_error_core (const char *file, int line, int level,
cvs commit: apache-1.3/htdocs/manual/mod core.html
rse 98/10/03 06:38:32 Modified:src CHANGES htdocs/manual/mod core.html Log: Document `ErrorLog syslog:facility' variant of error logging. Requested by: Youichirou Koga <[EMAIL PROTECTED]> Performed by: Ralf S. Engelschall PR: 3096 Revision ChangesPath 1.1091+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1090 retrieving revision 1.1091 diff -u -r1.1090 -r1.1091 --- CHANGES 1998/10/03 13:26:00 1.1090 +++ CHANGES 1998/10/03 13:38:29 1.1091 @@ -1,5 +1,8 @@ Changes with Apache 1.3.3 + *) Document `ErrorLog syslog:facility' variant of error logging. + [Youichirou Koga <[EMAIL PROTECTED]>] PR#3096 + *) Fix http://localhost/ hints in top-level INSTALL document. [Rob Jenson <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#3088 1.139 +5 -2 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.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- core.html 1998/09/17 20:23:38 1.138 +++ core.html 1998/10/03 13:38:31 1.139 @@ -812,7 +812,7 @@ Syntax: ErrorLog filename|syslog +>Syntax: ErrorLog >filename|syslog[:facility] Apache 1.3 and above: Using syslog instead of a filename enables logging via syslogd(8) -if the system supports it. +if the system supports it. The default is to use syslog facility +local7, but you can override this by using the +syslog:facility syntax where facility can be +one of the names usually documented in syslog(1). SECURITY: See the
cvs commit: apache-1.3 INSTALL
rse 98/10/03 06:26:02 Modified:src CHANGES .INSTALL Log: Fix http://localhost/ hints in top-level INSTALL document. Submitted by: Rob Jenson <[EMAIL PROTECTED]> Fixed by: Ralf S. Engelschall PR: 3088 Revision ChangesPath 1.1090+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1089 retrieving revision 1.1090 diff -u -r1.1089 -r1.1090 --- CHANGES 1998/10/03 11:04:43 1.1089 +++ CHANGES 1998/10/03 13:26:00 1.1090 @@ -1,5 +1,8 @@ Changes with Apache 1.3.3 + *) Fix http://localhost/ hints in top-level INSTALL document. + [Rob Jenson <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#3088 + *) Quote paths in default configuration files. [Wilfredo Sanchez] *) PORT: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since 1.44 +6 -3 apache-1.3/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache-1.3/INSTALL,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- INSTALL 1998/09/28 19:28:01 1.43 +++ INSTALL 1998/10/03 13:26:02 1.44 @@ -435,8 +435,11 @@ $ PREFIX/sbin/apachectl start and then you should be able to request your first document via URL - http://localhost/. Then stop the server again by running: - + http://localhost/ (when you built and installed Apache as root or at + least used the --without-confadjust option) or http://localhost:8080/ + (when you built and installed Apache as a regular user). Then stop the + server again by running: + $ PREFIX/sbin/apachectl stop 7. Customizing the package @@ -449,7 +452,7 @@ $ vi PREFIX/etc/access.conf $ vi PREFIX/etc/srm.conf - Have a look at the Apache manual under http://localhost/manual/ or + Have a look at the Apache manual under htdocs/manual/ or http://www.apache.org/docs/ for a complete reference of available configuration directives.
cvs commit: apache-1.3 README.NT
fielding98/10/03 05:25:54 Modified:.README.NT Log: Remove the bits that Ben Hyde objected to. Revision ChangesPath 1.13 +0 -4 apache-1.3/README.NT Index: README.NT === RCS file: /home/cvs/apache-1.3/README.NT,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- README.NT 1998/09/20 06:22:46 1.12 +++ README.NT 1998/10/03 12:25:53 1.13 @@ -31,10 +31,6 @@ Apache on Win32 should still be considered beta quality code. It does not meet the normal standards of stability and security that Unix releases do. -There is also a much greater chance of security holes being present in the -Win32 version of Apache, due to the frequent discrepancies between the public -documentation for the various Windows system calls and file system types -and the reality of what is included in Windows system software. Installation or Compilation Instructions
cvs commit: apache-1.3 STATUS
fielding98/10/03 05:11:24 Modified:.STATUS Log: remember that mime.types thing Revision ChangesPath 1.499 +5 -0 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.498 retrieving revision 1.499 diff -u -r1.498 -r1.499 --- STATUS1998/10/03 11:42:03 1.498 +++ STATUS1998/10/03 12:11:22 1.499 @@ -26,6 +26,11 @@ Available Patches: +* Manoj's [PATCH] mime.types update +Message-ID: <[EMAIL PROTECTED]> +Status: Roy thinks we should put a common_mime_types.txt file in +the documentation and remove the unused entries from conf. + * Wilfredo Sanchez's [PATCH] Build outside of source tree Message-ID: <[EMAIL PROTECTED]> Status: Ralf +1 (conceptual, with question)
cvs commit: apache-1.3 STATUS
fielding98/10/03 04:42:04 Modified:.STATUS Log: remove duplicate entry, update others Revision ChangesPath 1.498 +16 -26apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.497 retrieving revision 1.498 diff -u -r1.497 -r1.498 --- STATUS1998/09/30 15:48:06 1.497 +++ STATUS1998/10/03 11:42:03 1.498 @@ -26,6 +26,10 @@ Available Patches: +* Wilfredo Sanchez's [PATCH] Build outside of source tree +Message-ID: <[EMAIL PROTECTED]> +Status: Ralf +1 (conceptual, with question) + * Patches for the DSO/mod_perl problem (see below for description): Ralf's "[PATCH] Fix module init" @@ -35,13 +39,6 @@ Message-ID: <[EMAIL PROTECTED]> Status: Ralf +1, Lars +1 -* 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 - through two new core API functions. - Message-ID: <[EMAIL PROTECTED]> - Status: Ralf +1, Lars +1 - * Paul's patch to add integrated restart/shutdown signalling (Win32) This patch make Apache listen on predictable event names to allow restarts and shutdowns to be initiated. Also adds a new command line @@ -52,17 +49,14 @@ Martin +1 (on concept; the restart switches could be added to the unix version, too) -* Lars' patch to work around a Navigator/Mozilla bug when mod_proxy - is used (broken images). - (Marc doesn't like it and I don't like it either, but people will - blame Apache for it, so...) - Message-ID: <[EMAIL PROTECTED]> - In progress: * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats +* Roy is working on the 100 Continue problem with calls to + ap_discard_request_body() + Needs patch: * Ralf: mod_so doesn't correctly initialise modules. For instance @@ -123,6 +117,13 @@ * proxy_*_canon routines use r->proxyreq incorrectly. See <[EMAIL PROTECTED]> +* work around a Navigator/Mozilla bug when mod_proxy is used + (broken images). + Message-ID: <[EMAIL PROTECTED]> +Status: Lars' patch was vetoed. Roy and Dean think that it is +probably another buffer magic number error and should be +tested to find out and, if so, fixed like it was in core. + Open issues: * Underscores on symbols in DSO situation is broken for NetBSD: @@ -274,6 +275,8 @@ Help: +* proxy module doesn't load on Win95. Why? Good question. PR#1462. + * "Directory /", "Directory C:/" both fail to do anything, while "Directory *" SEGVs. @@ -382,16 +385,6 @@ Delayed until after 1.3.2, unless someone happens to get to it: -* Arnt Gulbrandsen <[EMAIL PROTECTED]> 03 Apr 1998 21:28:17 +0200 - <[EMAIL PROTECTED]> mod_usertrack.c patch: - The patch provides per-domain cookies (which I use to share user-ids - among the *.troll.no web servers) and configurable cookie names. It - also marginally increases the efficiency of Apache when the server - runs with DNS lookups turned off. - - Update: Dean found one part of the patch unacceptable, Arnt is in -the process of updating it. - * TZ should not be dealt with specially any longer now that we have "PassEnv". See <[EMAIL PROTECTED]> @@ -402,9 +395,6 @@ unless we warn people in big nasty letters to add PassEnv TZ to their config files "just in case" and hope they do it :) - -* proxy module doesn't load on Win95. Why? Good question. - PR#1462. * In ap_bclose() there's no test that (fb->fd != -1) -- so it's possible that it'll do something completely bogus when it's
cvs commit: apache-1.3/conf srm.conf-dist
fielding98/10/03 04:13:31 Modified:conf srm.conf-dist Log: @@UserDir@@ does not exist, so back that part of last patch out. Revision ChangesPath 1.28 +1 -1 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- srm.conf-dist 1998/10/03 11:05:06 1.27 +++ srm.conf-dist 1998/10/03 11:13:31 1.28 @@ -17,7 +17,7 @@ # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. -UserDir "@@UserDir@@" +UserDir public_html # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces.
cvs commit: apache-1.3/conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist
fielding98/10/03 04:05:07 Modified:conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist Log: Quote paths in default configuration files. Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by:Roy Fielding, Ralf S. Engelschall Revision ChangesPath 1.16 +2 -2 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- access.conf-dist 1998/09/03 18:04:08 1.15 +++ access.conf-dist 1998/10/03 11:05:05 1.16 @@ -25,7 +25,7 @@ # This should be changed to whatever you set DocumentRoot to. - + # This may also be "None", "All", or any combination of "Indexes", # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews". @@ -51,7 +51,7 @@ # @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. - + AllowOverride None Options None 1.2 +1 -1 apache-1.3/conf/highperformance.conf-dist Index: highperformance.conf-dist === RCS file: /home/cvs/apache-1.3/conf/highperformance.conf-dist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highperformance.conf-dist 1998/03/13 01:32:33 1.1 +++ highperformance.conf-dist 1998/10/03 11:05:05 1.2 @@ -43,7 +43,7 @@ # If this was a real internet server you'd probably want to uncomment this: -# +# #order allow,deny #allow from all # 1.31 +1 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- httpd.conf-dist 1998/09/12 20:16:50 1.30 +++ httpd.conf-dist 1998/10/03 11:05:05 1.31 @@ -63,7 +63,7 @@ # mounted filesystem then please read the LockFile documentation, # you will save yourself a lot of trouble. -ServerRoot @@ServerRoot@@ +ServerRoot "@@ServerRoot@@" # BindAddress: You can support virtual hosts with this option. This option # is used to tell the server which IP address to listen to. It can either 1.27 +4 -4 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- srm.conf-dist 1998/08/30 21:47:08 1.26 +++ srm.conf-dist 1998/10/03 11:05:06 1.27 @@ -12,12 +12,12 @@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. -DocumentRoot @@ServerRoot@@/htdocs +DocumentRoot "@@ServerRoot@@/htdocs" # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. -UserDir public_html +UserDir "@@UserDir@@" # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. @@ -152,12 +152,12 @@ # require it to be present in the URL. So "/icons" isn't aliased in this # example. -Alias /icons/ @@ServerRoot@@/icons/ +Alias /icons/ "@@ServerRoot@@/icons/" # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ +ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/" # If you want to use server side includes, or CGI outside # ScriptAliased directories, uncomment the following lines.
cvs commit: apache-1.3/src CHANGES
fielding98/10/03 04:04:45 Modified:src CHANGES Log: Quote paths in default configuration files. Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by: Roy Fielding, Ralf S. Engelschall Revision ChangesPath 1.1089+2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1088 retrieving revision 1.1089 diff -u -r1.1088 -r1.1089 --- CHANGES 1998/10/03 10:46:49 1.1088 +++ CHANGES 1998/10/03 11:04:43 1.1089 @@ -1,5 +1,7 @@ Changes with Apache 1.3.3 + *) Quote paths in default configuration files. [Wilfredo Sanchez] + *) PORT: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since it is now taken care of properly by the header file tests. [Wilfredo Sanchez <[EMAIL PROTECTED]>]
cvs commit: apache-1.3/src/include ap_config.h
fielding98/10/03 03:46:51 Modified:src CHANGES src/include ap_config.h Log: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since it is now taken care of properly by the header file tests. Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by: Roy Fielding Revision ChangesPath 1.1088+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1087 retrieving revision 1.1088 diff -u -r1.1087 -r1.1088 --- CHANGES 1998/10/02 02:06:14 1.1087 +++ CHANGES 1998/10/03 10:46:49 1.1088 @@ -1,5 +1,9 @@ Changes with Apache 1.3.3 + *) PORT: Remove extra HAVE_SYS_RESOURCE_H define for RHAPSODY since + it is now taken care of properly by the header file tests. + [Wilfredo Sanchez <[EMAIL PROTECTED]>] + *) Fix problem with scripts and finehandle inheritance on Win32. [Ken Parzygnat <[EMAIL PROTECTED]>] PR#2884, 2910 1.238 +0 -1 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.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- ap_config.h 1998/09/29 01:22:57 1.237 +++ ap_config.h 1998/10/03 10:46:50 1.238 @@ -372,7 +372,6 @@ #define USE_MMAP_SCOREBOARD #define MAP_TMPFILE #define HAVE_RESOURCE -#define HAVE_SYS_RESOURCE_H /* apaci should catch this but doesn't */ #define HAVE_SNPRINTF #define JMP_BUF jmp_buf #define USE_LONGJMP
cvs commit: apache-devsite mmn.txt.asis index.html mmn.txt
fielding98/10/03 03:03:22 Modified:.index.html Added: .mmn.txt.asis Removed: .mmn.txt Log: The table of module magic number values has been moved inside ap_mmn.h, so forward developers there rather than keep a duplicate copy. Revision ChangesPath 1.25 +1 -2 apache-devsite/index.html Index: index.html === RCS file: /export/home/cvs/apache-devsite/index.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- index.html1998/08/03 14:48:27 1.24 +++ index.html1998/10/03 10:03:21 1.25 @@ -95,9 +95,8 @@ (last modified on ) Record of changes to the - module magic number + http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h";>module magic number - (last modified on ) 1.1 apache-devsite/mmn.txt.asis Index: mmn.txt.asis === Status: 200 OK Content-type: text/html Module Magic Number Module Magic Number The table of module magic numbers has been moved to the include file http://www.apache.org/websrc/cvsweb.cgi/apache-1.3/src/include/ap_mmn.h";>src/include/ap_mmn.h distributed with the Apache HTTP Server source code.
