cvs commit: apachen STATUS
dgaudet 97/12/25 18:58:55
Modified:.STATUS
Log:
new patch
Revision ChangesPath
1.28 +4 -0 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- STATUS1997/12/24 18:32:26 1.27
+++ STATUS1997/12/26 02:58:54 1.28
@@ -56,6 +56,10 @@
Available:
+* [PATCH] mod_digest/1599: proxy authentication using the digest auth
scheme never succeeds (fwd)
+ <[EMAIL PROTECTED]>
+ Status: Dean +1
+
* Ken's [PATCH] for PR#1195 (" in realm names)
<[EMAIL PROTECTED]>
Status: Ken +1, Dean +1
cvs commit: apachen/src/os/win32 os.h
ben 97/12/26 07:08:15
Modified:src/os/unix os-inline.c
src/os/win32 os.h
Log:
Remove redundant test from os_is_path_absolute().
Revision ChangesPath
1.2 +1 -1 apachen/src/os/unix/os-inline.c
Index: os-inline.c
===
RCS file: /export/home/cvs/apachen/src/os/unix/os-inline.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os-inline.c 1997/09/12 07:28:50 1.1
+++ os-inline.c 1997/12/26 15:08:13 1.2
@@ -26,5 +26,5 @@
INLINE int os_is_path_absolute(char *file)
{
- return (file && file[0] == '/' ? 1 : 0);
+ return file[0] == '/';
}
1.9 +1 -1 apachen/src/os/win32/os.h
Index: os.h
===
RCS file: /export/home/cvs/apachen/src/os/win32/os.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- os.h 1997/12/01 12:10:16 1.8
+++ os.h 1997/12/26 15:08:14 1.9
@@ -79,7 +79,7 @@
/* For now, just do the same check that http_request.c and mod_alias.c
* do.
*/
- return file && (file[0] == '/' || file[1] == ':');
+ return file[0] == '/' || file[1] == ':';
}
#define stat(f,ps) os_stat(f,ps)
cvs commit: apachen/src/main http_request.c
ben 97/12/26 07:17:52
Modified:src/main http_request.c
Log:
Replace some absolute path tests.
Revision ChangesPath
1.95 +2 -11 apachen/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- http_request.c1997/11/22 22:23:41 1.94
+++ http_request.c1997/12/26 15:17:50 1.95
@@ -300,12 +300,7 @@
* Fake filenames (i.e. proxy:) only match Directory sections.
*/
-#if defined(__EMX__) || defined(WIN32)
-/* Add OS/2 drive name support */
-if ((test_filename[0] != '/') && (test_filename[1] != ':'))
-#else
-if (test_filename[0] != '/')
-#endif
+if (!os_is_path_absolute(test_filename))
{
void *this_conf, *entry_config;
core_dir_config *entry_core;
@@ -410,11 +405,7 @@
entry_dir = entry_core->d;
if (entry_core->r
-#if defined(__EMX__) || defined(WIN32)
-|| (entry_dir[0] != '/' && entry_dir[1] != ':')
-#else
-|| entry_dir[0] != '/'
-#endif
+ || !os_is_path_absolute(entry_dir)
|| entry_core->d_components > i)
break;
cvs commit: apachen/src/os/win32 util_win32.c
ben 97/12/26 07:29:40 Modified:src/os/win32 util_win32.c Log: Make drive letter lowercase. Revision ChangesPath 1.7 +1 -0 apachen/src/os/win32/util_win32.c Index: util_win32.c === RCS file: /export/home/cvs/apachen/src/os/win32/util_win32.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- util_win32.c 1997/12/14 14:53:47 1.6 +++ util_win32.c 1997/12/26 15:29:40 1.7 @@ -59,6 +59,7 @@ char buf[HUGE_STRING_LEN]; sub_canonical_filename(buf, szFile); +buf[0]=tolower(buf[0]); return pstrdup(pPool, buf); }
cvs commit: apachen/src/main util_script.c
ben 97/12/26 07:52:38
Modified:src CHANGES
src/main util_script.c
Log:
Check for executables by looking at the header.
Submitted by: Jim Patterson <[EMAIL PROTECTED]>
Reviewed by: Ben Laurie
Revision ChangesPath
1.542 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- CHANGES 1997/12/24 04:36:11 1.541
+++ CHANGES 1997/12/26 15:52:35 1.542
@@ -1,5 +1,9 @@
Changes with Apache 1.3b4
+ *) WIN32: Check for binaries by looking for the executable header
+ instead of counting control characters.
+ [Jim Patterson <[EMAIL PROTECTED]>] PR#1340
+
*) ap_snprintf() moved from main/util_snprintf.c to ap/ap_snprintf.c
so the functionality is available to applications other than the
server itself (like the src/support tools). [Ken Coar]
1.87 +4 -17 apachen/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- util_script.c 1997/12/07 21:49:54 1.86
+++ util_script.c 1997/12/26 15:52:37 1.87
@@ -728,23 +728,10 @@
memmove(interpreter+2,interpreter+i,strlen(interpreter+i)+1);
}
else {
- /*
- * check and see how many control chars. On
- * that basis, I will classify it as a text
- * or binary file
- */
- int ctrl = 0;
-
- for (i = 0; i < sz; i++) {
- static char *spec = "\r\n\t";
- if (iscntrl(interpreter[i]) && !strchr(spec,
interpreter[i]))
- ctrl++;
- }
- if (ctrl > sz / 10)
- is_binary = 1;
- else
- is_binary = 0;
-
+/* Check to see if it's a executable */
+IMAGE_DOS_HEADER *hdr = (IMAGE_DOS_HEADER*)interpreter;
+if (hdr->e_magic == IMAGE_DOS_SIGNATURE && hdr->e_cblp < 512)
+is_binary = 1;
}
}
cvs commit: apachen STATUS
jim 97/12/26 08:54:16
Modified:.STATUS
Log:
Additional patch and some votes
Revision ChangesPath
1.29 +8 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- STATUS1997/12/26 02:58:54 1.28
+++ STATUS1997/12/26 16:54:15 1.29
@@ -56,21 +56,25 @@
Available:
+* Jim's [PATCH] ap_cpystrn() function (replace strncpy)
+ <[EMAIL PROTECTED]>
+ Status: Jim +1
+
* [PATCH] mod_digest/1599: proxy authentication using the digest auth
scheme never succeeds (fwd)
<[EMAIL PROTECTED]>
- Status: Dean +1
+ Status: Dean +1, Jim +1
* Ken's [PATCH] for PR#1195 (" in realm names)
<[EMAIL PROTECTED]>
- Status: Ken +1, Dean +1
+ Status: Ken +1, Dean +1, Jim +1
* Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
<[EMAIL PROTECTED]>
- Status: Dean +1, Martin +1
+ Status: Dean +1, Martin +1, Jim +1
* Dean's [PATCH] fix Rasmus' chunking error
<[EMAIL PROTECTED]>
- Status: Dean +1, Rasmus +1
+ Status: Dean +1, Rasmus +1, Jim +1
* Dean's [PATCH] mod_status cleanups
<[EMAIL PROTECTED]>
cvs commit: apachen/src/main http_main.c
dgaudet 97/12/26 10:16:19
Modified:.STATUS
src CHANGES
src/main http_main.c
Log:
Move the gid twiddling into the child so that the parent creates files with
the group that its invoked as.
Submitted by: Gregory A Lundberg <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet, Martin Kraemer, Jim Jagielski
Revision ChangesPath
1.30 +1 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- STATUS1997/12/26 16:54:15 1.29
+++ STATUS1997/12/26 18:16:14 1.30
@@ -53,6 +53,7 @@
* Dean's [PATCH] more useful warning message for fcntl() lock failure
* Dean's [PATCH] ap_snprintf should be more sane (fwd)
* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
+* [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
Available:
@@ -67,10 +68,6 @@
* Ken's [PATCH] for PR#1195 (" in realm names)
<[EMAIL PROTECTED]>
Status: Ken +1, Dean +1, Jim +1
-
-* Dean's [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
- <[EMAIL PROTECTED]>
- Status: Dean +1, Martin +1, Jim +1
* Dean's [PATCH] fix Rasmus' chunking error
<[EMAIL PROTECTED]>
1.543 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- CHANGES 1997/12/26 15:52:35 1.542
+++ CHANGES 1997/12/26 18:16:15 1.543
@@ -1,5 +1,9 @@
Changes with Apache 1.3b4
+ *) Move the gid switching code into the child so that log files
+ and pid files are opened with the root gid.
+ [Gregory A Lundberg <[EMAIL PROTECTED]>]
+
*) WIN32: Check for binaries by looking for the executable header
instead of counting control characters.
[Jim Patterson <[EMAIL PROTECTED]>] PR#1340
1.260 +3 -8 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- http_main.c 1997/12/23 20:33:42 1.259
+++ http_main.c 1997/12/26 18:16:17 1.260
@@ -2227,12 +2227,7 @@
#endif /* ndef WIN32 or __EMX__ */
}
-/* Reset group privileges, after rereading the config files
- * (our uid may have changed, and if so, we want the new perms).
- *
- * Don't reset the uid yet --- we do that only in the child process,
- * so as not to lose any root privs. But we can set the group stuff
- * now, once, as opposed to once per each new child.
+/* Set group privileges.
*
* Note that we use the username as set in the config files, rather than
* the lookup of to uid --- the same uid may have multiple passwd entries,
@@ -2776,6 +2771,7 @@
reopen_scoreboard(pchild);
SAFE_ACCEPT(accept_mutex_child_init(pchild));
+set_group_privs();
#ifdef MPE
/* Only try to switch if we're running as MANAGER.SYS */
if (geteuid() == 1 && user_id > 1) {
@@ -3309,8 +3305,8 @@
server_conf = read_config(pconf, ptrans, server_confname);
setup_listeners(pconf);
open_logs(server_conf, pconf);
+ log_pid(pconf, pid_fname);
init_modules(pconf, server_conf);
- set_group_privs();
SAFE_ACCEPT(accept_mutex_init(pconf));
if (!is_graceful) {
reinit_scoreboard(pconf);
@@ -3323,7 +3319,6 @@
#endif
set_signals();
- log_pid(pconf, pid_fname);
if (daemons_max_free < daemons_min_free + 1)/* Don't thrash... */
daemons_max_free = daemons_min_free + 1;
cvs commit: apachen/src/main buff.c
dgaudet 97/12/26 10:21:47
Modified:.STATUS
src CHANGES
src/main buff.c
Log:
Fix problem with chunking and bputc().
Don't use large_write() when nbytes == 1... otherwise we have really bad
performance at end of buffer with bputc().
Reviewed by: Rasmus Lerdorf, Jim Jagielski
Revision ChangesPath
1.31 +5 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- STATUS1997/12/26 18:16:14 1.30
+++ STATUS1997/12/26 18:21:43 1.31
@@ -54,9 +54,14 @@
* Dean's [PATCH] ap_snprintf should be more sane (fwd)
* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
* [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
+* Dean's [PATCH] fix Rasmus' chunking error
Available:
+* [PATCH] PR#1366: fix result of send_fd_length
+ <[EMAIL PROTECTED]>
+ Status: Dean +1, Dirk +1
+
* Jim's [PATCH] ap_cpystrn() function (replace strncpy)
<[EMAIL PROTECTED]>
Status: Jim +1
@@ -68,10 +73,6 @@
* Ken's [PATCH] for PR#1195 (" in realm names)
<[EMAIL PROTECTED]>
Status: Ken +1, Dean +1, Jim +1
-
-* Dean's [PATCH] fix Rasmus' chunking error
- <[EMAIL PROTECTED]>
- Status: Dean +1, Rasmus +1, Jim +1
* Dean's [PATCH] mod_status cleanups
<[EMAIL PROTECTED]>
1.544 +6 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- CHANGES 1997/12/26 18:16:15 1.543
+++ CHANGES 1997/12/26 18:21:44 1.544
@@ -1,5 +1,11 @@
Changes with Apache 1.3b4
+ *) The large_write() changes tickled a bug in bputc(), this would
+ show up as certain modules not working with Internet Explorer 4.0.
+ Fix this bug, and also fix a performance bug related to bputc()
+ causing a large_write() -- don't do large_write() unless there's
+ at least two bytes to write. [Dean Gaudet]
+
*) Move the gid switching code into the child so that log files
and pid files are opened with the root gid.
[Gregory A Lundberg <[EMAIL PROTECTED]>]
1.53 +13 -3 apachen/src/main/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apachen/src/main/buff.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- buff.c1997/12/23 02:03:54 1.52
+++ buff.c1997/12/26 18:21:46 1.53
@@ -807,9 +807,16 @@
API_EXPORT(int) bflsbuf(int c, BUFF *fb)
{
char ss[1];
+int rc;
ss[0] = c;
-return bwrite(fb, ss, 1);
+rc = bwrite(fb, ss, 1);
+/* We do start_chunk() here so that the bputc macro can be smaller
+ * and faster
+ */
+if (rc == 1 && (fb->flags & B_CHUNK))
+ start_chunk(fb);
+return rc;
}
/*
@@ -1056,9 +1063,12 @@
#ifndef NO_WRITEV
/*
* Detect case where we're asked to write a large buffer, and combine our
- * current buffer with it in a single writev()
+ * current buffer with it in a single writev(). Note we don't consider
+ * the case nbyte == 1 because modules which use rputc() loops will cause
+ * us to use writev() too frequently. In those cases we really should just
+ * start a new buffer.
*/
-if (fb->outcnt > 0 && nbyte + fb->outcnt >= fb->bufsiz) {
+if (fb->outcnt > 0 && nbyte > 1 && nbyte + fb->outcnt >= fb->bufsiz) {
return large_write(fb, buf, nbyte);
}
#endif
cvs commit: apachen/src/main http_protocol.c
dgaudet 97/12/26 10:27:00
Modified:.STATUS
src CHANGES
src/main http_protocol.c
Log:
send_fd_length() did not calculate total_bytes_sent properly.
PR: 1366
Submitted by: Ben Reser <[EMAIL PROTECTED]>
Reviewed by: Dean Gaudet, Dirk-Willem van Gulik, Jim Jagielski
Revision ChangesPath
1.32 +1 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- STATUS1997/12/26 18:21:43 1.31
+++ STATUS1997/12/26 18:26:56 1.32
@@ -55,12 +55,9 @@
* Jim's/Ken's move of main/util_snprintf.c to ap/ap_snprintf.c
* [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs
* Dean's [PATCH] fix Rasmus' chunking error
+* [PATCH] PR#1366: fix result of send_fd_length
Available:
-
-* [PATCH] PR#1366: fix result of send_fd_length
- <[EMAIL PROTECTED]>
- Status: Dean +1, Dirk +1
* Jim's [PATCH] ap_cpystrn() function (replace strncpy)
<[EMAIL PROTECTED]>
1.545 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- CHANGES 1997/12/26 18:21:44 1.544
+++ CHANGES 1997/12/26 18:26:57 1.545
@@ -1,4 +1,7 @@
Changes with Apache 1.3b4
+
+ *) send_fd_length() did not calculate total_bytes_sent properly.
+ [Ben Reser <[EMAIL PROTECTED]>] PR#1366
*) The large_write() changes tickled a bug in bputc(), this would
show up as certain modules not working with Internet Explorer 4.0.
1.172 +1 -1 apachen/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- http_protocol.c 1997/12/21 08:18:16 1.171
+++ http_protocol.c 1997/12/26 18:26:59 1.172
@@ -1638,12 +1638,12 @@
break;
}
o = 0;
-total_bytes_sent += n;
while (n && !r->connection->aborted) {
w = bwrite(r->connection->client, &buf[o], n);
if (w > 0) {
reset_timeout(r); /* reset timeout after successful write
*/
+ total_bytes_sent += w;
n -= w;
o += w;
}
cvs commit: apachen STATUS
jim 97/12/26 12:18:57 Modified:.STATUS Log: update M-ID on ap_cpystrn Revision ChangesPath 1.33 +3 -3 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- STATUS1997/12/26 18:26:56 1.32 +++ STATUS1997/12/26 20:18:56 1.33 @@ -59,9 +59,9 @@ Available: -* Jim's [PATCH] ap_cpystrn() function (replace strncpy) - <[EMAIL PROTECTED]> - Status: Jim +1 +* Jim's [PATCH] ap_cpystrn() function (replace strncpy) Take II + <[EMAIL PROTECTED]> + Status: Jim +1, Dirk +1, Marc wants to think about the name * [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) <[EMAIL PROTECTED]>
cvs commit: apachen/src/main multithread.h
dgaudet 97/12/26 15:22:11 Modified:.STATUS src CHANGES src/main multithread.h Log: added destroy_mutex to non-win32 portion Submitted by: Ben Hyde <[EMAIL PROTECTED]> Reviewed by: Dean Gaudet, Jim Jagielski Revision ChangesPath 1.34 +1 -4 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- STATUS1997/12/26 20:18:56 1.33 +++ STATUS1997/12/26 23:22:07 1.34 @@ -56,6 +56,7 @@ * [PATCH] Re: [BUGFIXES] Wrong GID for PID file and UMASK for logs * Dean's [PATCH] fix Rasmus' chunking error * [PATCH] PR#1366: fix result of send_fd_length +* Ben Hyde's [PATCH] Finish suite of mutex ops for non-threaded platforms Available: @@ -87,10 +88,6 @@ (take 2) <[EMAIL PROTECTED]> Status: Dean +1, Jim +1 - -* Ben Hyde's [PATCH] Finish suite of mutex ops for non-threaded platforms - <[EMAIL PROTECTED]> - Status: Jim +1, Dean +1 * Dean's [PATCH] child_timeouts set wrong <[EMAIL PROTECTED]> 1.546 +2 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.545 retrieving revision 1.546 diff -u -r1.545 -r1.546 --- CHANGES 1997/12/26 18:26:57 1.545 +++ CHANGES 1997/12/26 23:22:09 1.546 @@ -1,5 +1,7 @@ Changes with Apache 1.3b4 + *) non-WIN32 was missing destroy_mutex definition. [Ben Hyde] + *) send_fd_length() did not calculate total_bytes_sent properly. [Ben Reser <[EMAIL PROTECTED]>] PR#1366 1.7 +1 -0 apachen/src/main/multithread.h Index: multithread.h === RCS file: /export/home/cvs/apachen/src/main/multithread.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- multithread.h 1997/09/16 00:41:33 1.6 +++ multithread.h 1997/12/26 23:22:10 1.7 @@ -50,6 +50,7 @@ #define create_mutex(name) ((mutex *)dummy_mutex) #define acquire_mutex(mutex_id) ((int)MULTI_OK) #define release_mutex(mutex_id) ((int)MULTI_OK) +#define destroy_mutex(mutex_id) (0) #endif /* ndef MULTITHREAD */
cvs commit: apachen/src/main alloc.c
dgaudet 97/12/26 15:25:47
Modified:.STATUS
src CHANGES
src/main alloc.c
Log:
Interim (slow) fix for p->sub_pool critical sections in alloc.c.
Affects win32 only.
Submitted by: Ben Hyde
Reviewed by: Dean Gaudet, Jim Jagielski
Revision ChangesPath
1.35 +1 -9 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- STATUS1997/12/26 23:22:07 1.34
+++ STATUS1997/12/26 23:25:43 1.35
@@ -57,6 +57,7 @@
* Dean's [PATCH] fix Rasmus' chunking error
* [PATCH] PR#1366: fix result of send_fd_length
* Ben Hyde's [PATCH] Finish suite of mutex ops for non-threaded platforms
+* Ben Hyde's [PATCH] Serialize the update to pool.sub_* in destroy_pool
(take 2)
Available:
@@ -83,15 +84,6 @@
* Martin's [PATCH] 36kB: Make apache compile & run on an EBCDIC mainframe
<[EMAIL PROTECTED]>
Status: Martin +1, Dean +1
-
-* Ben Hyde's [PATCH] Serialize the update to pool.sub_* in destroy_pool
- (take 2)
- <[EMAIL PROTECTED]>
- Status: Dean +1, Jim +1
-
-* Dean's [PATCH] child_timeouts set wrong
- <[EMAIL PROTECTED]>
- Status: Jim +1, Dean +1
* Marc's [PATCH] PR#1543: suexec logging exec failures
<[EMAIL PROTECTED]>
1.547 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- CHANGES 1997/12/26 23:22:09 1.546
+++ CHANGES 1997/12/26 23:25:44 1.547
@@ -1,4 +1,7 @@
Changes with Apache 1.3b4
+
+ *) Interim (slow) fix for p->sub_pool critical sections in
+ alloc.c (affects win32 only). [Ben Hyde]
*) non-WIN32 was missing destroy_mutex definition. [Ben Hyde]
1.62 +9 -3 apachen/src/main/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apachen/src/main/alloc.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- alloc.c 1997/12/14 20:48:54 1.61
+++ alloc.c 1997/12/26 23:25:46 1.62
@@ -376,11 +376,13 @@
{
block_alarms();
+(void) acquire_mutex(alloc_mutex);
+{
while (a->sub_pools)
destroy_pool(a->sub_pools);
-
-a->sub_pools = NULL;
-
+}
+(void) release_mutex(alloc_mutex);
+/* Don't hold the mutex during cleanups. */
run_cleanups(a->cleanups);
a->cleanups = NULL;
free_proc_chain(a->subprocesses);
@@ -413,6 +415,8 @@
block_alarms();
clear_pool(a);
+(void) acquire_mutex(alloc_mutex);
+{
if (a->parent) {
if (a->parent->sub_pools == a)
a->parent->sub_pools = a->sub_next;
@@ -421,6 +425,8 @@
if (a->sub_next)
a->sub_next->sub_prev = a->sub_prev;
}
+}
+(void) release_mutex(alloc_mutex);
free_blocks(a->first);
unblock_alarms();
cvs commit: apachen STATUS
dgaudet 97/12/26 15:36:27 Modified:.STATUS Log: foo Revision ChangesPath 1.36 +8 -2 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- STATUS1997/12/26 23:25:43 1.35 +++ STATUS1997/12/26 23:36:26 1.36 @@ -63,7 +63,7 @@ * Jim's [PATCH] ap_cpystrn() function (replace strncpy) Take II <[EMAIL PROTECTED]> - Status: Jim +1, Dirk +1, Marc wants to think about the name + Status: Jim +1, Dirk +1, Marc wants to think about the name, Dean +1 * [PATCH] mod_digest/1599: proxy authentication using the digest auth scheme never succeeds (fwd) <[EMAIL PROTECTED]> @@ -88,7 +88,7 @@ * Marc's [PATCH] PR#1543: suexec logging exec failures <[EMAIL PROTECTED]> Status: Marc +1, Dean +1, Jim +1, Martin +1 - + * Ben Hyde's [PATCH] WIN32 deserves a pid log file <[EMAIL PROTECTED]> Status: Jim +1 @@ -154,6 +154,12 @@ * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support so we need to watch the library ordering. + + Dean notes: Check rev 1.72 -> rev 1.73 of + src/Configuration.tmpl. I re-ordered mod_auth_dbm and + mod_auth_db at this time, and I'm pretty sure it was to + deal with this issue. But I think I still ran into + troubles if I automatically looked for gdbm. * What do we call the binary: apache or httpd? Under UNIX it's httpd, under Win32 it's apache. Maybe rename it
