cvs commit: apache-apr/pthreads/src/include buff.h httpd.h
dgaudet 99/06/09 15:06:30 Modified:pthreads/src/include buff.h httpd.h Log: BO_TIMEOUT belongs in buff.h Revision ChangesPath 1.7 +1 -0 apache-apr/pthreads/src/include/buff.h Index: buff.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- buff.h1999/06/09 22:03:38 1.6 +++ buff.h1999/06/09 22:06:29 1.7 @@ -141,6 +141,7 @@ /* Options to bset/getopt */ #define BO_BYTECT (1) +#define BO_TIMEOUT (2) /* Stream creation and modification */ API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags); 1.16 +0 -2 apache-apr/pthreads/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/httpd.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- httpd.h 1999/05/24 06:53:32 1.15 +++ httpd.h 1999/06/09 22:06:29 1.16 @@ -1141,8 +1141,6 @@ #endif #define strtoul strtoul_is_not_a_portable_function_use_strtol_instead -#define BO_TIMEOUT 2 - #define ap_is_aborted(abort) (abort->aborted ==1) #ifdef __cplusplus
cvs commit: apache-apr/pthreads/src/test/rename apapi.h
dgaudet 99/06/09 15:03:44
Modified:pthreads/src/include buff.h
pthreads/src/main alloc.c buff.c http_main.c
pthreads/src/modules/proxy proxy_cache.c proxy_ftp.c
proxy_http.c
pthreads/src/test/rename apapi.h
Log:
get rid of "fd_in", it's not needed by anything anymore
Revision ChangesPath
1.6 +1 -2 apache-apr/pthreads/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buff.h1999/06/03 23:46:21 1.5
+++ buff.h1999/06/09 22:03:38 1.6
@@ -116,7 +116,6 @@
/* could also put pointers to the basic I/O routines here */
int fd; /* the file descriptor */
-int fd_in; /* input file descriptor, if different
*/
#ifdef WIN32
HANDLE hFH; /* Windows filehandle */
#endif
@@ -145,7 +144,7 @@
/* Stream creation and modification */
API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
-API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd_in, int fd_out);
+API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd);
/* XXX - unused right now - mvsk */
API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
1.7 +3 -3 apache-apr/pthreads/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alloc.c 1999/05/30 23:48:58 1.6
+++ alloc.c 1999/06/09 22:03:39 1.7
@@ -2452,19 +2452,19 @@
if (pipe_out) {
*pipe_out = ap_bcreate(p, B_RD);
ap_note_cleanups_for_fd(p, fd_out);
- ap_bpushfd(*pipe_out, fd_out, fd_out);
+ ap_bpushfd(*pipe_out, fd_out);
}
if (pipe_in) {
*pipe_in = ap_bcreate(p, B_WR);
ap_note_cleanups_for_fd(p, fd_in);
- ap_bpushfd(*pipe_in, fd_in, fd_in);
+ ap_bpushfd(*pipe_in, fd_in);
}
if (pipe_err) {
*pipe_err = ap_bcreate(p, B_RD);
ap_note_cleanups_for_fd(p, fd_err);
- ap_bpushfd(*pipe_err, fd_err, fd_err);
+ ap_bpushfd(*pipe_err, fd_err);
}
#endif
1.12 +10 -22apache-apr/pthreads/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buff.c1999/06/03 23:46:22 1.11
+++ buff.c1999/06/09 22:03:39 1.12
@@ -239,7 +239,6 @@
fb->bytes_sent = 0;
fb->fd = -1;
-fb->fd_in = -1;
fb->timeout = -1;
#ifdef B_SFIO
@@ -257,10 +256,9 @@
/*
* Push some I/O file descriptors onto the stream
*/
-API_EXPORT(void) ap_bpushfd(BUFF *fb, APRFile fd_in, APRFile fd_out)
+API_EXPORT(void) ap_bpushfd(BUFF *fb, APRFile fd)
{
-fb->fd = fd_out;
-fb->fd_in = fd_in;
+fb->fd = fd;
}
API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval)
@@ -445,7 +443,7 @@
API_EXPORT(int) ap_bfileno(BUFF *fb, int direction)
{
-return (direction == B_RD) ? fb->fd_in : fb->fd;
+return fb->fd;
}
/*
@@ -469,7 +467,7 @@
/* Test the descriptor and flush the output buffer if it looks like
* we will block on the next read.
*
- * Note we assume the caller has ensured that fb->fd_in <= FD_SETSIZE
+ * Note we assume the caller has ensured that fb->fd <= FD_SETSIZE
*/
API_EXPORT(void) ap_bhalfduplex(BUFF *fb)
{
@@ -481,16 +479,16 @@
* or there is something readable in the incoming buffer
* or there is nothing flushable in the output buffer.
*/
-if (fb == NULL || fb->fd_in < 0 || fb->incnt > 0 || fb->outcnt == 0) {
+if (fb == NULL || fb->fd < 0 || fb->incnt > 0 || fb->outcnt == 0) {
return;
}
/* test for a block */
do {
FD_ZERO(&fds);
- FD_SET(fb->fd_in, &fds);
+ FD_SET(fb->fd, &fds);
tv.tv_sec = 0;
tv.tv_usec = 0;
- rv = ap_select(fb->fd_in + 1, &fds, NULL, NULL, &tv);
+ rv = ap_select(fb->fd + 1, &fds, NULL, NULL, &tv);
} while (rv < 0 && errno == EINTR && !(fb->flags & B_EOUT));
/* treat any error as if it would block as well */
@@ -507,7 +505,7 @@
ap_bhalfduplex(fb);
}
do {
- rv = recvwithtimeout(fb->fd_in, buf, nbyte, fb->timeout);
+ rv = recvwithtimeout(fb->fd, buf, nbyte, fb->timeout);
} while (rv == -1 && errno == EINTR && !(fb->flags & B_EOUT));
return (rv);
}
@@ -1309,12 +1307,6 @@
else
rc1 = 0;
cvs commit: apache-1.3 STATUS
coar99/06/09 11:23:39 Modified:.STATUS Log: Some updates to the status of various patches, and a note about the IE issue of replacing too-short error pages (even if CustomError generated) with its own pablum. Revision ChangesPath 1.712 +29 -22apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.711 retrieving revision 1.712 diff -u -r1.711 -r1.712 --- STATUS1999/06/09 11:31:14 1.711 +++ STATUS1999/06/09 18:23:38 1.712 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/09 11:31:14 $] + Last modified at [$Date: 1999/06/09 18:23:38 $] Release: @@ -64,7 +64,7 @@ RELEASE SHOWSTOPPERS: -- graham legget has found that if he uses the 1.3.7-dev core, and +- Graham Legget has found that if he uses the 1.3.7-dev core, and the 1.3.6 proxy code (plus a small patch of his) he doesn't get the hangs he was reporting. Something is broken in the 1.3.7-dev proxy. @@ -72,19 +72,19 @@ RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * mod_rewrite/3874: RewriteLock doesn't work for virtual hosts - => When I find time, I can look at this. But I would appreciate - when someone other already can dive into this. My opinion - is already appended to the PR. -rse + Status: (Ralf): When I find time, I can look at this. But + I would appreciate when someone other already can dive into + this. My opinion is already appended to the PR. -rse * The Vary header field stuff is still broken (multiple entries occur, etc.), for instance also in mod_rewrite. - => I've already started to work on this, but I've not - finished it. I've less time... -rse + Status: (Ralf): I've already started to work on this, but + I've not finished it. I've less time... * long pathnames with many components and no AllowOverride None -Workaround is to define with AllowOverride None, -which is something all sites should do in any case. -Status: Marc was looking at it. + Workaround is to define with AllowOverride None, + which is something all sites should do in any case. + Status: Marc was looking at it. Documentation that needs writing: @@ -92,7 +92,7 @@ Available Patches: * Stipe Tolj's Cygwin32 port -PR#: 2936 + PR#: 2936 Status: Lars +1 (on concept) * Salvador Ortiz Garcia <[EMAIL PROTECTED]>' patch to allow DirectoryIndex @@ -102,24 +102,29 @@ * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: <[EMAIL PROTECTED]> - Status: Jim +1, Mark +1, Dean +1, BenH +1, Randy +1 (please choose name other than "hook") -Doug +1 on concept (untested), Lars +1 on concept + Status: Jim +1, Mark +1, Dean +1, BenH +1, + Randy +1 (please choose name other than "hook") +Doug +1 on concept (untested), Lars +1 on concept, + Ken -1 for pre-2.0 if it will force a new release of + mod_perl or mod_php in order to maintain compatibility * Tony Finch's patch to support mass virtual hosting Message-ID: <[EMAIL PROTECTED]> Message-ID: <[EMAIL PROTECTED]> Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs) Jim +1 + (On hold until Tony revamps the mass-vhosting docco) * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) Message-ID: <[EMAIL PROTECTED]> - Status: Lars +1 (on concept) + Status: Lars +1 (on concept), Ken +1 (on concept) * Aidan Cully's patch to allow assignment of 'ownership' of resources to either the server UID or the file's owner. Message-ID: <[EMAIL PROTECTED]> Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1 + (On hold until Aidan submits an update) * Keith Wannamaker's NT multiple services patch Message-ID: <[EMAIL PROTECTED]> @@ -138,9 +143,9 @@ request, in milli-seconds. Message-ID: PR#2838 Status: Jim +0 (as is, the patch requires rework since it needs - to be aware of NO_GETTIMEOFDAY and NO_TIMES as well as - implement a times() alternative. Not only that, but with - extended_status, we calculate this anyway). + to be aware of NO_GETTIMEOFDAY and NO_TIMES as well as + implement a times() alternative. Not only that, but with + extended_status, we calculate this anyway). * Juan Gallego's patch to add CSH-style modifiers (:h, :r, :t, :e)
cvs commit: apache-1.3/src CHANGES
stoddard99/06/09 10:22:47 Modified:src CHANGES Log: Yeeeoowww it's hot here today! Revision ChangesPath 1.1377+18 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1376 retrieving revision 1.1377 diff -u -r1.1376 -r1.1377 --- CHANGES 1999/06/09 11:27:52 1.1376 +++ CHANGES 1999/06/09 17:22:44 1.1377 @@ -1,5 +1,23 @@ Changes with Apache 1.3.7 + *) Win32: The query switch "apache -S" didn't exit after showing the + vhost settings. That was inconsistent with the other query functions. + [Bill Stoddard - Fixed by Martin on Unix in 1.3.4] + + *) Win32: Changed behaviour of apache -k restart. + Previously, the server would drain all connections in the stack's + listen queue before honoring the restart. On a busy server, this + could take hours. Now, a restart is honored almost immediately. + All connections in Apache's queues are handled but connections in + the stack's listen queue are discarded. Restart triggered by + MaxRequestPerChild is unchanged. + [Bill Stoddard <[EMAIL PROTECTED]>] + + *) Win32: Eliminated unnecessary call to wait_for_multiple_objects in + the accept loop. Good for a 5% performance boost. Cleaned up + parent/child process management code. + [Bill Stoddard <[EMAIL PROTECTED]>] + *) Added ceiling on file size for memory mapped files. [John Giannandrea <[EMAIL PROTECTED]>] PR#4122
cvs commit: apache-apr/include apr_errno.h
rbb 99/06/09 08:55:59
Modified:apr/network_io/unix sendrecv.c
include apr_errno.h
Log:
ap_send and ap_recv need to report back when the time limit has expired. This
requires a new status code, and a small change to the funcs.
Revision ChangesPath
1.10 +10 -2 apache-apr/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sendrecv.c1999/05/25 17:03:48 1.9
+++ sendrecv.c1999/06/09 15:55:55 1.10
@@ -83,8 +83,12 @@
srv = select(FD_SETSIZE, NULL, &fdset, NULL, &tv);
} while (srv == -1 && errno == EINTR);
-if (srv < 1) {
+if (srv == 0) {
(*len) = -1;
+return APR_TIMEUP;
+}
+else if (srv < 0) {
+(*len) = -1;
return errno;
}
else {
@@ -119,7 +123,11 @@
srv = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
} while (srv == -1 && errno == EINTR);
-if (srv < 1) {
+if (srv == 0) {
+(*len) = -1;
+return APR_TIMEUP;
+}
+else if (srv < 0) {
(*len) = -1;
return errno;
}
1.17 +1 -1 apache-apr/include/apr_errno.h
Index: apr_errno.h
===
RCS file: /home/cvs/apache-apr/include/apr_errno.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_errno.h 1999/06/03 19:43:58 1.16
+++ apr_errno.h 1999/06/09 15:55:58 1.17
@@ -399,7 +399,7 @@
#define APR_NOTDETACH 5004
#define APR_CHILD_DONE 5005
#define APR_CHILD_NOTDONE 5006
-
+#define APR_TIMEUP 5007
#ifdef __cplusplus
}
cvs commit: apache-apr/apr/network_io/unix sockopt.c
rbb 99/06/09 08:16:14
Modified:apr/network_io/unix sockopt.c
Log:
Don't return int, return an ap_status_t
Revision ChangesPath
1.10 +1 -1 apache-apr/apr/network_io/unix/sockopt.c
Index: sockopt.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockopt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sockopt.c 1999/06/02 18:44:54 1.9
+++ sockopt.c 1999/06/09 15:16:14 1.10
@@ -65,7 +65,7 @@
#include
#include
-int soblock(int sd)
+ap_status_t soblock(int sd)
{
int fd_flags;
cvs commit: apache-1.3/src/main http_main.c
stoddard99/06/09 06:37:52
Modified:src/main http_main.c
Log:
Exit after dumping vhost settings (apache -S) to be consistent with how
Apache for Unix works.
Revision ChangesPath
1.444 +4 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- http_main.c 1999/06/04 04:43:45 1.443
+++ http_main.c 1999/06/09 13:37:51 1.444
@@ -6317,6 +6317,10 @@
clean_parent_exit(0);
}
+if (ap_dump_settings) {
+clean_parent_exit(0);
+}
+
/* Treat -k start confpath as just -f confpath */
if (signal_to_send && strcasecmp(signal_to_send, "start")) {
send_signal(pconf, signal_to_send);
cvs commit: apache-apr/apr/test testproc.c
rbb 99/06/09 05:57:18
Modified:apr/test testproc.c
Log:
Because we don't include empty directories in tarballs, the testproc program
wasn't working an anything but a cvs extract. This fixes that by having the
prgarm create and remove the directory each time it runs.
Submitted by: David Reid and Ryan Bloom
Revision ChangesPath
1.12 +17 -2 apache-apr/apr/test/testproc.c
Index: testproc.c
===
RCS file: /home/cvs/apache-apr/apr/test/testproc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- testproc.c1999/06/08 15:52:14 1.11
+++ testproc.c1999/06/09 12:57:17 1.12
@@ -84,9 +84,17 @@
teststr = ap_pstrdup(context, "Whooo H\0");
if (argc > 1) {
- fprintf(stdout, "%s", teststr);
+fprintf(stdout, "%s", teststr);
exit(1);
}
+
+fprintf(stdout, "Creating directory for later use...");
+if (ap_make_dir(context, "proctest", APR_UREAD | APR_UWRITE |
APR_UEXECUTE) != APR_SUCCESS) {
+fprintf(stderr, "Could not create dir\n");
+exit(-1);
+}
+fprintf(stdout, "OK\n");
+
fprintf(stdout, "Creating procattr...");
if (ap_createprocattr_init(context, &attr) != APR_SUCCESS) {
fprintf(stderr, "Could not create attr\n");
@@ -142,7 +150,14 @@
else fprintf(stderr, "Uh-Oh\n");
}
else fprintf(stderr, "Read failed.\n");
+
+fprintf(stdout, "Removing directory...");
+if (ap_remove_dir(context, "proctest") != APR_SUCCESS) {
+fprintf(stderr, "Could not remove directory.\n");
+exit(-1);
+}
+fprintf(stdout, "OK\n");
- return(1);
+return(1);
}
cvs commit: apache-1.3 STATUS
rse 99/06/09 04:31:14 Modified:.STATUS Log: Now comitted... Revision ChangesPath 1.711 +1 -5 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- STATUS1999/06/09 11:16:09 1.710 +++ STATUS1999/06/09 11:31:14 1.711 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/09 11:16:09 $] + Last modified at [$Date: 1999/06/09 11:31:14 $] Release: @@ -120,10 +120,6 @@ to either the server UID or the file's owner. Message-ID: <[EMAIL PROTECTED]> Status: Ken +1, Dean +1, Randy +1, Lars +0, Jim +1 - -* John Giannadrea's patch for ceiling on file size for mmap (PR#4122) - Message-ID: <[EMAIL PROTECTED]> - Status: Ken +1, Dean +1, Randy +1, Lars +1, Jim +1 * Keith Wannamaker's NT multiple services patch Message-ID: <[EMAIL PROTECTED]>
cvs commit: apache-1.3/src/main http_core.c
rse 99/06/09 04:27:54
Modified:src CHANGES
src/main http_core.c
Log:
Added ceiling on file size for memory mapped files.
Submitted by: John Giannandrea <[EMAIL PROTECTED]>
Reviewed by: Ken, Dean, Randy, Lars, Jim, Ralf
PR: 4122
Revision ChangesPath
1.1376+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -r1.1375 -r1.1376
--- CHANGES 1999/06/09 11:15:22 1.1375
+++ CHANGES 1999/06/09 11:27:52 1.1376
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Added ceiling on file size for memory mapped files.
+ [John Giannandrea <[EMAIL PROTECTED]>] PR#4122
+
*) Fix ndbm.h include problems with brain-dead glibc >= 2.1 which
has ndbm.h in a non-standard db1/ subdir. PR#4431, PR#4528
[Henri Gomez <[EMAIL PROTECTED]>, Ralf S. Engelschall]
1.262 +4 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- http_core.c 1999/05/07 00:16:12 1.261
+++ http_core.c 1999/06/09 11:27:54 1.262
@@ -90,6 +90,9 @@
#endif
#endif
#endif
+#ifndef MMAP_LIMIT
+#define MMAP_LIMIT (4*1024*1024)
+#endif
/* Server core module... This module provides support for really basic
* server operations, including options and commands which control the
@@ -3032,6 +3035,7 @@
#ifdef USE_MMAP_FILES
ap_block_alarms();
if ((r->finfo.st_size >= MMAP_THRESHOLD)
+ && (r->finfo.st_size < MMAP_LIMIT)
&& (!r->header_only || (d->content_md5 & 1))) {
/* we need to protect ourselves in case we die while we've got the
* file mmapped */
cvs commit: apache-1.3 STATUS
rse 99/06/09 04:16:10 Modified:.STATUS Log: Now solved... Revision ChangesPath 1.710 +1 -7 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.709 retrieving revision 1.710 diff -u -r1.709 -r1.710 --- STATUS1999/06/07 19:42:21 1.709 +++ STATUS1999/06/09 11:16:09 1.710 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/07 19:42:21 $] + Last modified at [$Date: 1999/06/09 11:16:09 $] Release: @@ -64,12 +64,6 @@ RELEASE SHOWSTOPPERS: -- general/4431: mod_rewrite and mod_auth_dbm won't compile on Red - Hat 6.0, and possibly other systems using glibc 2.1. The dbm - libraries are detected, but the ndbm include file was moved to - /usr/include/db1 - Status: Ralf is looking at it - - graham legget has found that if he uses the 1.3.7-dev core, and the 1.3.6 proxy code (plus a small patch of his) he doesn't get the hangs he was reporting. Something is broken in the 1.3.7-dev
cvs commit: apache-1.3/src CHANGES
rse 99/06/09 04:15:23 Modified:src CHANGES Log: Ops, PR#4469 is actually db v2 related... Revision ChangesPath 1.1375+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1374 retrieving revision 1.1375 diff -u -r1.1374 -r1.1375 --- CHANGES 1999/06/09 11:13:53 1.1374 +++ CHANGES 1999/06/09 11:15:22 1.1375 @@ -1,7 +1,7 @@ Changes with Apache 1.3.7 *) Fix ndbm.h include problems with brain-dead glibc >= 2.1 which - has ndbm.h in a non-standard db1/ subdir. PR#4469, PR#4431, PR#4528 + has ndbm.h in a non-standard db1/ subdir. PR#4431, PR#4528 [Henri Gomez <[EMAIL PROTECTED]>, Ralf S. Engelschall] *) Determine AP_BYTE_ORDER for ap_config_auto.h and already
cvs commit: apache-1.3/src/modules/standard mod_rewrite.h mod_auth_dbm.c
rse 99/06/09 04:13:55 Modified:src CHANGES src/modules/standard mod_rewrite.h mod_auth_dbm.c Log: Fix ndbm.h include problems with brain-dead glibc >= 2.1 which has ndbm.h in a non-standard db1/ subdir. We fixed it by explicitly including instead of because adding -I/usr/include/db1 isn't really correct (because it isn't guaranteed that the glibc includes are really under /usr/include). Submitted by: Henri Gomez <[EMAIL PROTECTED]> Cleaned up and corrected by: Ralf S. Engelschall PR: 4469, 4431, 4528 Revision ChangesPath 1.1374+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1373 retrieving revision 1.1374 diff -u -r1.1373 -r1.1374 --- CHANGES 1999/06/09 10:44:59 1.1373 +++ CHANGES 1999/06/09 11:13:53 1.1374 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Fix ndbm.h include problems with brain-dead glibc >= 2.1 which + has ndbm.h in a non-standard db1/ subdir. PR#4469, PR#4431, PR#4528 + [Henri Gomez <[EMAIL PROTECTED]>, Ralf S. Engelschall] + *) Determine AP_BYTE_ORDER for ap_config_auto.h and already use this at least for Expat. [Ralf S. Engelschall] 1.63 +8 -1 apache-1.3/src/modules/standard/mod_rewrite.h Index: mod_rewrite.h === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- mod_rewrite.h 1999/04/22 09:54:37 1.62 +++ mod_rewrite.h 1999/06/09 11:13:55 1.63 @@ -127,8 +127,15 @@ * so we also need to know the file extension */ #ifndef NO_DBM_REWRITEMAP +#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ +&& __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +#include +#else #include -#if defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM)) +#endif +#if defined(DBM_SUFFIX) +#define NDBM_FILE_SUFFIX DBM_SUFFIX +#elif defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM)) #define NDBM_FILE_SUFFIX ".db" #else #define NDBM_FILE_SUFFIX ".pag" 1.46 +5 -0 apache-1.3/src/modules/standard/mod_auth_dbm.c Index: mod_auth_dbm.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mod_auth_dbm.c1999/02/03 16:22:32 1.45 +++ mod_auth_dbm.c1999/06/09 11:13:55 1.46 @@ -74,7 +74,12 @@ #include "http_core.h" #include "http_log.h" #include "http_protocol.h" +#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \ +&& __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +#include +#else #include +#endif #include "ap_md5.h" /*
cvs commit: apache-1.3/src/lib/expat-lite xmltok.c xmltok_impl.c
rse 99/06/09 03:50:10
Modified:src/lib/expat-lite xmltok.c xmltok_impl.c
Log:
Make egcc -Wshadow happy again.
Revision ChangesPath
1.3 +3 -3 apache-1.3/src/lib/expat-lite/xmltok.c
Index: xmltok.c
===
RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmltok.c 1999/06/02 07:15:04 1.2
+++ xmltok.c 1999/06/09 10:50:07 1.3
@@ -930,7 +930,7 @@
const char **nextTokPtr)
{
int c;
- char open;
+ char openchar;
if (ptr == end) {
*namePtr = 0;
return 1;
@@ -981,12 +981,12 @@
*nextTokPtr = ptr;
return 0;
}
- open = c;
+ openchar = c;
ptr += enc->minBytesPerChar;
*valPtr = ptr;
for (;; ptr += enc->minBytesPerChar) {
c = toAscii(enc, ptr, end);
-if (c == open)
+if (c == openchar)
break;
if (!('a' <= c && c <= 'z')
&& !('A' <= c && c <= 'Z')
1.3 +13 -13apache-1.3/src/lib/expat-lite/xmltok_impl.c
Index: xmltok_impl.c
===
RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok_impl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmltok_impl.c 1999/06/02 07:15:04 1.2
+++ xmltok_impl.c 1999/06/09 10:50:08 1.3
@@ -593,7 +593,7 @@
/* fall through */
case BT_EQUALS:
{
- int open;
+ int opentype;
#ifdef XML_NS
hadColon = 0;
#endif
@@ -602,10 +602,10 @@
ptr += MINBPC(enc);
if (ptr == end)
return XML_TOK_PARTIAL;
- open = BYTE_TYPE(enc, ptr);
- if (open == BT_QUOT || open == BT_APOS)
+ opentype = BYTE_TYPE(enc, ptr);
+ if (opentype == BT_QUOT || opentype == BT_APOS)
break;
- switch (open) {
+ switch (opentype) {
case BT_S:
case BT_LF:
case BT_CR:
@@ -622,7 +622,7 @@
if (ptr == end)
return XML_TOK_PARTIAL;
t = BYTE_TYPE(enc, ptr);
- if (t == open)
+ if (t == opentype)
break;
switch (t) {
INVALID_CASES(ptr, nextTokPtr)
@@ -957,7 +957,7 @@
}
static
-int PREFIX(scanLit)(int open, const ENCODING *enc,
+int PREFIX(scanLit)(int opentype, const ENCODING *enc,
const char *ptr, const char *end,
const char **nextTokPtr)
{
@@ -968,7 +968,7 @@
case BT_QUOT:
case BT_APOS:
ptr += MINBPC(enc);
- if (t != open)
+ if (t != opentype)
break;
if (ptr == end)
return XML_TOK_PARTIAL;
@@ -1391,7 +1391,7 @@
{
enum { other, inName, inValue } state = inName;
int nAtts = 0;
- int open = 0;
+ int opentype = 0;
for (ptr += MINBPC(enc);; ptr += MINBPC(enc)) {
switch (BYTE_TYPE(enc, ptr)) {
@@ -1418,9 +1418,9 @@
if (nAtts < attsMax)
atts[nAtts].valuePtr = ptr + MINBPC(enc);
state = inValue;
-open = BT_QUOT;
+opentype = BT_QUOT;
}
- else if (open == BT_QUOT) {
+ else if (opentype == BT_QUOT) {
state = other;
if (nAtts < attsMax)
atts[nAtts].valueEnd = ptr;
@@ -1432,9 +1432,9 @@
if (nAtts < attsMax)
atts[nAtts].valuePtr = ptr + MINBPC(enc);
state = inValue;
-open = BT_APOS;
+opentype = BT_APOS;
}
- else if (open == BT_APOS) {
+ else if (opentype == BT_APOS) {
state = other;
if (nAtts < attsMax)
atts[nAtts].valueEnd = ptr;
@@ -1454,7 +1454,7 @@
&& (ptr == atts[nAtts].valuePtr
|| BYTE_TO_ASCII(enc, ptr) != ' '
|| BYTE_TO_ASCII(enc, ptr + MINBPC(enc)) == ' '
-|| BYTE_TYPE(enc, ptr + MINBPC(enc)) == open))
+|| BYTE_TYPE(enc, ptr + MINBPC(enc)) == opentype))
atts[nAtts].normalized = 0;
break;
case BT_CR: case BT_LF:
cvs commit: apache-1.3/src/lib/expat-lite Makefile.tmpl xmldef.h
rse 99/06/09 03:45:04
Modified:src CHANGES Configure
src/helpers TestCompile
src/lib/expat-lite Makefile.tmpl xmldef.h
Log:
Determine AP_BYTE_ORDER for ap_config_auto.h and already
use this at least for Expat.
Revision ChangesPath
1.1373+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1372
retrieving revision 1.1373
diff -u -r1.1372 -r1.1373
--- CHANGES 1999/06/07 12:05:58 1.1372
+++ CHANGES 1999/06/09 10:44:59 1.1373
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Determine AP_BYTE_ORDER for ap_config_auto.h and already
+ use this at least for Expat. [Ralf S. Engelschall]
+
*) Allow .module files to specify libraries with Lib:.
[Ben Laurie]
1.353 +18 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- Configure 1999/06/07 12:05:35 1.352
+++ Configure 1999/06/09 10:45:00 1.353
@@ -1893,6 +1893,24 @@
echo "#define AP_LONGEST_LONG $AP_LONGEST_LONG" >>$AP_CONFIG_AUTO_H
echo "#endif" >>$AP_CONFIG_AUTO_H
+
+## More building ap_config_auto.h
+##
+## We check for the endianess of the machine
+##
+AP_BYTE_ORDER=`./helpers/TestCompile -r byteorder`
+if [ "x$AP_BYTE_ORDER" = "x21" ]; then
+AP_BYTE_ORDER="21" # big endian
+else
+AP_BYTE_ORDER="12" # little endian
+fi
+
+echo "" >>$AP_CONFIG_AUTO_H
+echo "/* determine: byte order of machine (12: little endian, 21: big
endian) */" >>$AP_CONFIG_AUTO_H
+echo "#ifndef AP_BYTE_ORDER" >>$AP_CONFIG_AUTO_H
+echo "#define AP_BYTE_ORDER $AP_BYTE_ORDER" >>$AP_CONFIG_AUTO_H
+echo "#endif" >>$AP_CONFIG_AUTO_H
+
##
## Now compare the sizes of off_t to long
##
1.31 +27 -0 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TestCompile 1999/06/02 07:02:59 1.30
+++ TestCompile 1999/06/09 10:45:02 1.31
@@ -26,6 +26,10 @@
#Which prints out the sizeof (sure would be nice
#if sizeof could be use in preprocessor if's)
#
+# ./helpers/TestCompile byteorder
+#Which prints out the byte order of the machine
+#(12: little endian, 21: big endian)
+#
# It does these by creating a small mini-makefile, based on
# ../Makefile.config and trying to compile a small dummy
# program. If the compilation succeeds, we assume the test
@@ -102,6 +106,29 @@
#include
int main(void) {
printf("%d\n", sizeof($2));
+return(0);
+}
+EOF
+ ;;
+"byteorder")
+ TLIB=""
+ if [ "x$VERBOSE" = "xyes" ]; then
+ ERRDIR=""
+ else
+ ERRDIR='2>/dev/null'
+ fi
+ TARGET='testfunc'
+ cat
cvs commit: apache-apr/pthreads/src/main http_main.c
manoj 99/06/08 20:14:59 Modified:pthreads/src/include http_conf_globals.h pthreads/src/main http_main.c Log: Clean up some unused variables Revision ChangesPath 1.9 +0 -2 apache-apr/pthreads/src/include/http_conf_globals.h Index: http_conf_globals.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/http_conf_globals.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -u -r1.8 -r1.9 --- http_conf_globals.h 1999/03/15 15:34:49 1.8 +++ http_conf_globals.h 1999/06/09 03:14:57 1.9 @@ -75,8 +75,6 @@ #endif extern int ap_threads_per_child; extern int ap_acceptors_per_child; -extern int ap_idle_thread_threshold; -extern int ap_busy_thread_threshold; extern int ap_max_requests_per_child; extern int ap_excess_requests_per_child; extern struct in_addr ap_bind_address; 1.90 +0 -4 apache-apr/pthreads/src/main/http_main.c Index: http_main.c === RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -u -r1.89 -r1.90 --- http_main.c 1999/06/03 23:46:23 1.89 +++ http_main.c 1999/06/09 03:14:58 1.90 @@ -151,11 +151,7 @@ #endif int ap_threads_per_child; /* Worker threads per child */ int ap_acceptors_per_child; /* Accept threads per child */ - int ap_max_requests_per_child; -int ap_idle_thread_threshold; -int ap_busy_thread_threshold; - char *ap_pid_fname; char *ap_scoreboard_fname; char *ap_lock_fname;
