cvs commit: apache-1.3/src/modules/standard mod_userdir.c
dgaudet 98/02/20 16:50:05
Modified:src/modules/standard mod_userdir.c
Log:
Fix multiple UserDir problem introduced during 1.3b4-dev.
Revision ChangesPath
1.29 +4 -1 apache-1.3/src/modules/standard/mod_userdir.c
Index: mod_userdir.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_userdir.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_userdir.c 1998/02/14 03:26:58 1.28
+++ mod_userdir.c 1998/02/21 00:50:02 1.29
@@ -313,7 +313,10 @@
*/
if (filename (!*userdirs || stat(filename, statbuf) != -1)) {
r-filename = pstrcat(r-pool, filename, dname, NULL);
- if (*userdirs)
+ /* when statbuf contains info on r-filename we can save a syscall
+ * by copying it to r-finfo
+ */
+ if (*userdirs dname[0] == 0)
r-finfo = statbuf;
return OK;
}
cvs commit: apache-1.3/src CHANGES
dgaudet 98/02/20 16:50:42 Modified:src CHANGES Log: Fix multiple UserDir problem introduced during 1.3b4-dev. Revision ChangesPath 1.644 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.643 retrieving revision 1.644 diff -u -r1.643 -r1.644 --- CHANGES 1998/02/20 19:21:20 1.643 +++ CHANGES 1998/02/21 00:50:39 1.644 @@ -1,5 +1,7 @@ Changes with Apache 1.3b6 + *) Fix multiple UserDir problem introduced during 1.3b4-dev. [Dean Gaudet] + *) ap_cpystrn() had an off-by-1 error. [Charles Fu [EMAIL PROTECTED]] PR#1847
cvs commit: apache-1.3/src/main http_protocol.c
dgaudet 98/02/20 17:18:29
Modified:src CHANGES
src/main http_protocol.c
Log:
Fix http://host1; without trailing /.
Revision ChangesPath
1.645 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -r1.644 -r1.645
--- CHANGES 1998/02/21 00:50:39 1.644
+++ CHANGES 1998/02/21 01:18:25 1.645
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Fix problems with absoluteURIs. [Dean Gaudet,
+ Alvaro Martinez Echevarria [EMAIL PROTECTED]]
+
*) Fix multiple UserDir problem introduced during 1.3b4-dev. [Dean Gaudet]
*) ap_cpystrn() had an off-by-1 error.
1.190 +10 -4 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- http_protocol.c 1998/02/18 11:59:20 1.189
+++ http_protocol.c 1998/02/21 01:18:28 1.190
@@ -628,6 +628,7 @@
char *host, *proto, *slash, *colon;
int plen;
unsigned port;
+const char *res_uri;
/* This routine parses full URLs, if they match the server */
proto = http_method(r);
@@ -664,15 +665,20 @@
return uri;
/* Save it for later use */
-r-hostname = pstrdup(r-pool, host);
+r-hostname = host;
r-hostlen = plen + 3 + slash - host;
+res_uri = uri + r-hostlen;
+/* deal with http://host; */
+if (*res_uri == '\0') {
+ res_uri = /;
+}
/* The easy cases first */
if (!strcasecmp(host, r-server-server_hostname)) {
-return (uri + r-hostlen);
+return res_uri;
}
else if (!strcmp(host, inet_ntoa(r-connection-local_addr.sin_addr))) {
-return (uri + r-hostlen);
+return res_uri;
}
else {
/* Now things get a bit trickier - check the IP address(es) of
@@ -685,7 +691,7 @@
for (n = 0; hp-h_addr_list[n] != NULL; n++) {
if (r-connection-local_addr.sin_addr.s_addr ==
(((struct in_addr *) (hp-h_addr_list[n]))-s_addr)) {
-return (uri + r-hostlen);
+return res_uri;
}
}
}
cvs commit: apache-1.3/src/main http_main.c
dgaudet 98/02/20 17:38:35
Modified:src CHANGES
src/main http_main.c
Log:
Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
In particular the handlers could trigger themselves into an infinite
loop if RLimitMem was used with a small amount of memory -- too small
for the signal stack frame to be set up.
Revision ChangesPath
1.646 +6 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -r1.645 -r1.646
--- CHANGES 1998/02/21 01:18:25 1.645
+++ CHANGES 1998/02/21 01:38:29 1.646
@@ -1,5 +1,10 @@
Changes with Apache 1.3b6
+ *) Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
+ In particular the handlers could trigger themselves into an infinite
+ loop if RLimitMem was used with a small amount of memory -- too small
+ for the signal stack frame to be set up. [Dean Gaudet]
+
*) Fix problems with absoluteURIs. [Dean Gaudet,
Alvaro Martinez Echevarria [EMAIL PROTECTED]]
@@ -18,7 +23,7 @@
processor. httpd children now unbind themselves from that cpu
and re-bind to one selected at random via bindprocessor()
[Doug MacEachern]
-
+
*) Linux 2.0 and above implement RLIMIT_AS, RLIMIT_DATA has almost no
effect. Work around it by using RLIMIT_AS for the RLimitMEM
directive. [Enrik Berkhan [EMAIL PROTECTED]] PR#1816
1.293 +6 -0 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.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- http_main.c 1998/02/18 22:41:53 1.292
+++ http_main.c 1998/02/21 01:38:32 1.293
@@ -2228,6 +2228,11 @@
if (!one_process) {
sa.sa_handler = sig_coredump;
+#if defined(SA_ONESHOT)
+ sa.sa_flags = SA_ONESHOT;
+#elif defined(SA_RESETHAND)
+ sa.sa_flags = SA_RESETHAND;
+#endif
if (sigaction(SIGSEGV, sa, NULL) 0)
aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
sigaction(SIGSEGV));
#ifdef SIGBUS
@@ -2242,6 +2247,7 @@
if (sigaction(SIGABRT, sa, NULL) 0)
aplog_error(APLOG_MARK, APLOG_WARNING, server_conf,
sigaction(SIGABRT));
#endif
+ sa.sa_flags = 0;
}
sa.sa_handler = sig_term;
if (sigaction(SIGTERM, sa, NULL) 0)
cvs commit: apache-1.3/src/main http_core.c util_script.c
dgaudet 98/02/20 17:42:41
Modified:src/include conf.h http_core.h
src/main http_core.c util_script.c
Log:
RLIMIT_AS is part of Single Unix... and presumably posix as well. So it
makes sense to support it everywhere rather than just on Linux. So treat
it like RLIMIT_VMEM and RLIMIT_DATA.
Revision ChangesPath
1.182 +0 -7 apache-1.3/src/include/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- conf.h1998/02/18 20:52:55 1.181
+++ conf.h1998/02/21 01:42:36 1.182
@@ -372,13 +372,6 @@
typedef int rlim_t;
#endif
-/* Linux 2.0 and above implement the new posix RLIMIT_AS rather than the
- * older BSD semantics (some would actually call this a bug, like me -djg).
- */
-#ifndef RLIMIT_VMEM
-#define RLIMIT_VMEM RLIMIT_AS
-#endif
-
/* flock is faster ... but hasn't been tested on 1.x systems */
#define USE_FLOCK_SERIALIZED_ACCEPT
1.36 +1 -1 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- http_core.h 1998/02/02 19:46:55 1.35
+++ http_core.h 1998/02/21 01:42:36 1.36
@@ -202,7 +202,7 @@
#ifdef RLIMIT_CPU
struct rlimit *limit_cpu;
#endif
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
+#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
struct rlimit *limit_mem;
#endif
#ifdef RLIMIT_NPROC
1.162 +10 -8 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.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- http_core.c 1998/02/20 10:51:34 1.161
+++ http_core.c 1998/02/21 01:42:39 1.162
@@ -127,7 +127,7 @@
#ifdef RLIMIT_CPU
conf-limit_cpu = NULL;
#endif
-#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM)
+#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
conf-limit_mem = NULL;
#endif
#ifdef RLIMIT_NPROC
@@ -207,7 +207,7 @@
#ifdef RLIMIT_CPU
if (new-limit_cpu) conf-limit_cpu = new-limit_cpu;
#endif
-#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM)
+#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
if (new-limit_mem) conf-limit_mem = new-limit_mem;
#endif
#ifdef RLIMIT_NPROC
@@ -1560,7 +1560,7 @@
}
-#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) ||
defined(RLIMIT_NPROC)
+#if defined(RLIMIT_CPU) || defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) ||
defined(RLIMIT_NPROC) || defined(RLIMIT_AS)
static void set_rlimit(cmd_parms *cmd, struct rlimit **plimit, const char
*arg,
const char * arg2, int type)
{
@@ -1612,7 +1612,7 @@
}
#endif
-#if !defined (RLIMIT_CPU) || !(defined (RLIMIT_DATA) || defined
(RLIMIT_VMEM)) || !defined (RLIMIT_NPROC)
+#if !defined (RLIMIT_CPU) || !(defined (RLIMIT_DATA) || defined
(RLIMIT_VMEM) || defined(RLIMIT_AS)) || !defined (RLIMIT_NPROC)
static const char *no_set_limit (cmd_parms *cmd, core_dir_config *conf,
char *arg, char *arg2)
{
@@ -1630,12 +1630,14 @@
}
#endif
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
+#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
const char *set_limit_mem (cmd_parms *cmd, core_dir_config *conf, char *arg,
char * arg2)
{
-#ifdef RLIMIT_DATA
+#if defined(RLIMIT_AS)
+set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_AS);
+#elif defined(RLIMIT_DATA)
set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_DATA);
-#else
+#else defined(RLIMIT_VMEM)
set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_VMEM);
#endif
return NULL;
@@ -1898,7 +1900,7 @@
#endif
OR_ALL, TAKE12, soft/hard limits for max CPU usage in seconds },
{ RLimitMEM,
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
+#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined (RLIMIT_AS)
set_limit_mem, (void*)XtOffsetOf(core_dir_config, limit_mem),
#else
no_set_limit, NULL,
1.95 +10 -6 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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- util_script.c 1998/02/01 22:05:38 1.94
+++ util_script.c
cvs commit: apache-1.3/src CHANGES
dgaudet 98/02/21 02:43:44 Modified:src CHANGES Log: mention pr# Revision ChangesPath 1.647 +2 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.646 retrieving revision 1.647 diff -u -r1.646 -r1.647 --- CHANGES 1998/02/21 01:38:29 1.646 +++ CHANGES 1998/02/21 10:43:42 1.647 @@ -8,7 +8,8 @@ *) Fix problems with absoluteURIs. [Dean Gaudet, Alvaro Martinez Echevarria [EMAIL PROTECTED]] - *) Fix multiple UserDir problem introduced during 1.3b4-dev. [Dean Gaudet] + *) Fix multiple UserDir problem introduced during 1.3b4-dev. + [Dean Gaudet] PR#1850 *) ap_cpystrn() had an off-by-1 error. [Charles Fu [EMAIL PROTECTED]] PR#1847
cvs commit: apache-1.3/htdocs/manual/misc known_bugs.html
dgaudet 98/02/21 02:46:02 Modified:htdocs/manual/misc known_bugs.html Log: document pr 1847 and 1850 Revision ChangesPath 1.46 +13 -0 apache-1.3/htdocs/manual/misc/known_bugs.html Index: known_bugs.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/known_bugs.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- known_bugs.html 1998/02/15 18:28:27 1.45 +++ known_bugs.html 1998/02/21 10:46:01 1.46 @@ -34,6 +34,19 @@ and A HREF=known_client_problems.htmlour list of known client problems./A/P HR +H2Apache 1.3b5 Bugs/H2 + +ol +liCertain mod_rewrite configurations do not work correctly. Apply +a href=http://www.apache.org/dist/patches/apply_to_1.3b5/PR1847.patch;this +patch/a to fix the problem. See +a href=http://bugs.apache.org/index/full/1847;PR#1847/a for more details. +liUsing multiple arguments to UserDir does not work correctly. Apply +a href=http://www.apache.org/dist/patches/apply_to_1.3b5/PR1850.patch;this +patch/a to fix the problem. See +a href=http://bugs.apache.org/index/full/1850;PR#1850/a for more details. +/ol + H2Apache 1.3b3 Bugs/H2 OL
cvs commit: apache-1.3/src/include util_script.h
dgaudet 98/02/21 03:05:19
Modified:src/main util_script.c
src/include util_script.h
Log:
long live const
Revision ChangesPath
1.96 +1 -1 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.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- util_script.c 1998/02/21 01:42:40 1.95
+++ util_script.c 1998/02/21 11:05:17 1.96
@@ -271,7 +271,7 @@
* and find as much of the two that match as possible.
*/
-API_EXPORT(int) find_path_info(char *uri, char *path_info)
+API_EXPORT(int) find_path_info(const char *uri, const char *path_info)
{
int lu = strlen(uri);
int lp = strlen(path_info);
1.28 +1 -1 apache-1.3/src/include/util_script.h
Index: util_script.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/util_script.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- util_script.h 1998/01/21 19:17:45 1.27
+++ util_script.h 1998/02/21 11:05:18 1.28
@@ -63,7 +63,7 @@
#endif
API_EXPORT(char **) create_environment(pool *p, table *t);
-API_EXPORT(int) find_path_info(char *uri, char *path_info);
+API_EXPORT(int) find_path_info(const char *uri, const char *path_info);
API_EXPORT(void) add_cgi_vars(request_rec *r);
API_EXPORT(void) add_common_vars(request_rec *r);
#define scan_script_header(a1,a2) scan_script_header_err(a1,a2,NULL)
cvs commit: apache-1.3/src/main http_config.c
dgaudet 98/02/21 03:08:31
Modified:src/main http_config.c
Log:
The prototype of set_file_slot already includes API_EXPORT_NONSTD... fix
the declaration.
BTW, I think _NONSTD is only required for functions which have variable
length parameter lists. i.e. bputs and rputs... but *not* vbprintf since
that has a fixed parameter list.
Revision ChangesPath
1.97 +1 -1 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- http_config.c 1998/02/06 18:19:56 1.96
+++ http_config.c 1998/02/21 11:08:30 1.97
@@ -920,7 +920,7 @@
return NULL;
}
-const char *set_file_slot(cmd_parms *cmd, char *struct_ptr, char *arg)
+API_EXPORT_NONSTD(const char *) set_file_slot(cmd_parms *cmd, char
*struct_ptr, char *arg)
{
/* Prepend server_root to relative arg.
This allows .htaccess to be independent of server_root,
cvs commit: apache-1.2/src CHANGES mod_include.c
dgaudet 98/02/21 03:44:11
Modified:src CHANGES mod_include.c
Log:
Work around a broken cpp.
PR: 1717
Revision ChangesPath
1.297 +5 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- CHANGES 1998/02/17 01:45:57 1.296
+++ CHANGES 1998/02/21 11:44:08 1.297
@@ -1,3 +1,8 @@
+Changes with Apache 1.2.7
+
+ *) Work around a broken C preprocessor in mod_include.
+ [Dean Gaudet] PR#1717
+
Changes with Apache 1.2.6
*) Increase the robustness of the child_main loop. When unexpected
1.37 +3 -1 apache-1.2/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mod_include.c 1998/02/03 10:00:49 1.36
+++ mod_include.c 1998/02/21 11:44:09 1.37
@@ -1023,9 +1023,11 @@
}
else {
int l, x;
-#if defined(BSD) BSD 199305
+#if defined(BSD)
+#if BSD 199305
/* ap_snprintf can't handle %qd */
sprintf(tag, %qd, finfo.st_size);
+#endif
#else
ap_snprintf(tag, sizeof(tag), %ld, finfo.st_size);
#endif
cvs commit: apache-1.3/src/modules/standard mod_include.c
dgaudet 98/02/21 03:46:00
Modified:src CHANGES
src/modules/standard mod_include.c
Log:
Work around a broken cpp.
PR: 1717
Revision ChangesPath
1.648 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -r1.647 -r1.648
--- CHANGES 1998/02/21 10:43:42 1.647
+++ CHANGES 1998/02/21 11:45:56 1.648
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Work around a broken C preprocessor in mod_include.
+ [Dean Gaudet] PR#1717
+
*) Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
In particular the handlers could trigger themselves into an infinite
loop if RLimitMem was used with a small amount of memory -- too small
1.72 +3 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mod_include.c 1998/02/03 09:30:48 1.71
+++ mod_include.c 1998/02/21 11:45:59 1.72
@@ -1049,9 +1049,11 @@
}
else {
int l, x;
-#if defined(BSD) BSD 199305
+#if defined(BSD)
+#if BSD 199305
/* ap_snprintf can't handle %qd */
sprintf(tag, %qd, finfo.st_size);
+#endif
#else
ap_snprintf(tag, sizeof(tag), %ld, finfo.st_size);
#endif
cvs commit: apache-1.2/src CHANGES mod_include.c
dgaudet 98/02/21 04:25:43
Modified:src CHANGES mod_include.c
Log:
boy that was a dumb patch, back it out
Revision ChangesPath
1.298 +0 -5 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- CHANGES 1998/02/21 11:44:08 1.297
+++ CHANGES 1998/02/21 12:25:40 1.298
@@ -1,8 +1,3 @@
-Changes with Apache 1.2.7
-
- *) Work around a broken C preprocessor in mod_include.
- [Dean Gaudet] PR#1717
-
Changes with Apache 1.2.6
*) Increase the robustness of the child_main loop. When unexpected
1.38 +1 -3 apache-1.2/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_include.c 1998/02/21 11:44:09 1.37
+++ mod_include.c 1998/02/21 12:25:41 1.38
@@ -1023,11 +1023,9 @@
}
else {
int l, x;
-#if defined(BSD)
-#if BSD 199305
+#if defined(BSD) BSD 199305
/* ap_snprintf can't handle %qd */
sprintf(tag, %qd, finfo.st_size);
-#endif
#else
ap_snprintf(tag, sizeof(tag), %ld, finfo.st_size);
#endif
cvs commit: apache-1.3/src/modules/standard mod_include.c
dgaudet 98/02/21 04:26:23
Modified:src CHANGES
src/modules/standard mod_include.c
Log:
boy that was a dumb patch, back it out
Revision ChangesPath
1.649 +0 -3 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- CHANGES 1998/02/21 11:45:56 1.648
+++ CHANGES 1998/02/21 12:26:20 1.649
@@ -1,8 +1,5 @@
Changes with Apache 1.3b6
- *) Work around a broken C preprocessor in mod_include.
- [Dean Gaudet] PR#1717
-
*) Use SA_RESETHAND or SA_ONESHOT when installing the coredump handlers.
In particular the handlers could trigger themselves into an infinite
loop if RLimitMem was used with a small amount of memory -- too small
1.73 +1 -3 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mod_include.c 1998/02/21 11:45:59 1.72
+++ mod_include.c 1998/02/21 12:26:22 1.73
@@ -1049,11 +1049,9 @@
}
else {
int l, x;
-#if defined(BSD)
-#if BSD 199305
+#if defined(BSD) BSD 199305
/* ap_snprintf can't handle %qd */
sprintf(tag, %qd, finfo.st_size);
-#endif
#else
ap_snprintf(tag, sizeof(tag), %ld, finfo.st_size);
#endif
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/02/21 07:32:59 Modified:src CHANGES src/modules/standard mod_status.c Log: PR: 1448 Obtained from: M.D. Parker [EMAIL PROTECTED] Submitted by: Jim Reviewed by: Jim Add SERVER_VERSION and SERVER_BUILT info to the mod_status Status report Revision ChangesPath 1.651 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.650 retrieving revision 1.651 diff -u -r1.650 -r1.651 --- CHANGES 1998/02/21 15:00:37 1.650 +++ CHANGES 1998/02/21 15:32:56 1.651 @@ -1,5 +1,8 @@ Changes with Apache 1.3b6 + *) Have the mod_status Status page report server version and + built data [M.D. Parker [EMAIL PROTECTED]] PR#1448 + *) [PORT] Recognize FreeBSD-3 so we can use the OS regex as well as handling unsigned-chars [Andrey Chernov [EMAIL PROTECTED] and Jim] PR#1450 1.73 +2 -0 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.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- mod_status.c 1998/01/29 20:36:13 1.72 +++ mod_status.c 1998/02/21 15:32:58 1.73 @@ -315,6 +315,8 @@ rputs(HTMLHEAD\nTITLEApache Status/TITLE\n/HEADBODY\n, r); rputs(H1Apache Server Status for , r); rvputs(r, server-server_hostname, /H1\n\n, NULL); + rvputs(r, Server Version:, SERVER_VERSION, br\n, NULL); + rvputs(r, Server Built:, SERVER_BUILT, br\nhr\n, NULL); rvputs(r, Current Time: , asctime(localtime(nowtime)), br\n, NULL); rvputs(r, Restart Time: , asctime(localtime(restart_time)), br\n, NULL);
cvs commit: apache-1.3/src Configure
jim 98/02/21 09:22:57 Modified:src Configure Log: Oops... wrong quotes :) Revision ChangesPath 1.188 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- Configure 1998/02/21 17:19:47 1.187 +++ Configure 1998/02/21 17:22:56 1.188 @@ -359,7 +359,7 @@ ;; *-freebsd*) PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` - OS='FreeBSD $PLATOSVERS' + OS=FreeBSD $PLATOSVERS case $PLATOSVERS in [23]*) DEF_WANTHSREGEX=no
cvs commit: apache-1.3/src/main http_core.c
dgaudet 98/02/21 12:32:08 Modified:src/main http_core.c Log: fix typo Revision ChangesPath 1.163 +1 -1 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.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- http_core.c 1998/02/21 01:42:39 1.162 +++ http_core.c 1998/02/21 20:32:06 1.163 @@ -1637,7 +1637,7 @@ set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_AS); #elif defined(RLIMIT_DATA) set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_DATA); -#else defined(RLIMIT_VMEM) +#elif defined(RLIMIT_VMEM) set_rlimit(cmd,conf-limit_mem,arg,arg2,RLIMIT_VMEM); #endif return NULL;
