cvs commit: apache-1.3 STATUS
jim 98/05/06 05:27:34 Modified:.STATUS Log: Yep to Ralf's Patch Revision ChangesPath 1.378 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- STATUS1998/05/06 04:46:27 1.377 +++ STATUS1998/05/06 12:27:33 1.378 @@ -16,7 +16,7 @@ order is correct even when the DSO mechanism is used. This is mainly achieved by fixing the AddModule command. See: http://www.engelschall.com/sw/apache/ [dsoexecorder] - Status: Ralf +1, Brian +1. + Status: Ralf +1, Brian +1, Jim +1 * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines
cvs commit: apache-1.3 STATUS
jim 98/05/06 19:48:24 Modified:.STATUS Log: Add Ken's patch Revision ChangesPath 1.380 +6 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- STATUS1998/05/06 15:17:56 1.379 +++ STATUS1998/05/07 02:48:22 1.380 @@ -56,6 +56,12 @@ Available Patches: +* Ken's Adding the OS Type Patch + [EMAIL PROTECTED] + Status: Ken +1, Jim +1 (with Brian's suggested changes), + Martin +1, Brian +1 (change 'add_component' and + 'add_platform' to something a bit more clear) + * Ed Korthof's patch to fix protocol issues surrounding 400, 408, and 414 responses. [EMAIL PROTECTED]
cvs commit: apache-1.3/src/ap ap_snprintf.c
jim 98/05/07 06:13:54
Modified:src/ap ap_snprintf.c
Log:
Seems silly to remove the decimal point if we
know we'll be adding it later
Revision ChangesPath
1.23 +31 -30apache-1.3/src/ap/ap_snprintf.c
Index: ap_snprintf.c
===
RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ap_snprintf.c 1998/05/07 09:39:42 1.22
+++ ap_snprintf.c 1998/05/07 13:13:53 1.23
@@ -68,6 +68,33 @@
#include stdlib.h
#include math.h
+typedef enum {
+NO = 0, YES = 1
+} boolean_e;
+
+#define FALSE0
+#define TRUE 1
+#define NUL '\0'
+#define INT_NULL ((int *)0)
+#define WIDE_INT long
+
+typedef WIDE_INT wide_int;
+typedef unsigned WIDE_INT u_wide_int;
+typedef int bool_int;
+
+#define S_NULL (null)
+#define S_NULL_LEN 6
+
+#define FLOAT_DIGITS 6
+#define EXPONENT_LENGTH 10
+
+/*
+ * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
+ *
+ * XXX: this is a magic number; do not decrease it
+ */
+#define NUM_BUF_SIZE 512
+
/*
* cvt.c - IEEE floating point formatting routines for FreeBSD
* from GNU libc-4.6.27. Modified to be thread safe.
@@ -171,7 +198,7 @@
* minimal length string
*/
-static char *ap_gcvt(double number, int ndigit, char *buf)
+static char *ap_gcvt(double number, int ndigit, char *buf, boolean_e altform)
{
int sign, decpt;
register char *p1, *p2;
@@ -224,39 +251,12 @@
*p2++ = '.';
}
}
-if (p2[-1] == '.')
+if (p2[-1] == '.' !altform)
p2--;
*p2 = '\0';
return (buf);
}
-typedef enum {
-NO = 0, YES = 1
-} boolean_e;
-
-#define FALSE0
-#define TRUE 1
-#define NUL '\0'
-#define INT_NULL ((int *)0)
-#define WIDE_INT long
-
-typedef WIDE_INT wide_int;
-typedef unsigned WIDE_INT u_wide_int;
-typedef int bool_int;
-
-#define S_NULL (null)
-#define S_NULL_LEN 6
-
-#define FLOAT_DIGITS 6
-#define EXPONENT_LENGTH 10
-
-/*
- * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
- *
- * XXX: this is a magic number; do not decrease it
- */
-#define NUM_BUF_SIZE 512
-
/*
* The INS_CHAR macro inserts a character in the buffer and writes
* the buffer back to disk if necessary
@@ -799,7 +799,8 @@
/*
* * We use num_buf[ 1 ], so that we have room for the sign
*/
- s = ap_gcvt(va_arg(ap, double), precision, num_buf[1]);
+ s = ap_gcvt(va_arg(ap, double), precision, num_buf[1],
+ alternate_form);
if (*s == '-')
prefix_char = *s++;
else if (print_sign)
cvs commit: apache-1.3/src CHANGES
jim 98/05/07 08:04:16 Modified:src CHANGES Log: The code still allows for SERVER_SUBVERSION Revision ChangesPath 1.832 +1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.831 retrieving revision 1.832 diff -u -r1.831 -r1.832 --- CHANGES 1998/05/07 12:24:22 1.831 +++ CHANGES 1998/05/07 15:04:14 1.832 @@ -2,7 +2,7 @@ *) Added the AddVersionComponent and AddVersionPlatform core directives. The first allows the addition of arbitrary text to the Server-Version - response header field value, replacing the SERVER_SUBVERSION define in + response header field value, augmenting the SERVER_SUBVERSION define in the Configuration file with run-time settings (more useful in a loadable-module environment). AddVersionPlatform inserts a comment such as (UNIX) or (Win32) into the server version string.
cvs commit: apache-1.3 STATUS
jim 98/05/08 04:55:11 Modified:.STATUS Log: Changes Revision ChangesPath 1.384 +6 -20 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- STATUS1998/05/08 03:17:00 1.383 +++ STATUS1998/05/08 11:55:11 1.384 @@ -142,7 +142,12 @@ apdefines.h: Open issues: - + +* What do to about SERVER_SUBVERSION now? + STATUS: + o Scrap it now that modules can use ap_add_version_component + Jim +1 (make sure this is clear :) ), Brian +1 + * Paul would like to see a 'gdbm' option because he uses it a lot. @@ -189,25 +194,6 @@ * Should we re-enable nagle now that we're non-buffering CGIs? See various messages from Marc in March 98. -* Listing the operating system's generic name (e.g. Irix, Win32) in - SERVER_VERSION: - o Looks like we want to do this... -Implementation: New API function, ap_add_version_component() -that takes a 'const char *' and tacks it onto the end -of the string returned by ap_get_server_version(). Would allow -modules to add their info at run-time, more closely tracking -reality for dynamically-loaded modules. - - o Do we want to scrap -DSERVER_SUBVERSION if modules can add -their contribution strings at run-time? - +1: Brian - -1: Ken - - o Debate: - Unix:Win32:OS/2 in '()' comment - +1: Jim, Martin, Alexei, Ken, Brian - Irix:AIX:FreeBSD in '()' comment - Win32 specific issues: In progress:
cvs commit: apache-1.3 STATUS
jim 98/05/08 06:36:10 Modified:.STATUS Log: Revision ChangesPath 1.386 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- STATUS1998/05/08 12:09:44 1.385 +++ STATUS1998/05/08 13:36:09 1.386 @@ -31,7 +31,7 @@ mod_mime MIME-file, IMAP handler imap-file and digest password file. What others are we concerned about? Dean: ap_pcfg_openfile() should use pfopen() instead of - fopen(). Jim agrees. + fopen(). WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3 STATUS
jim 98/05/08 09:31:10 Modified:.STATUS Log: Have a patch which handles all the comments about the ap_pcfg_openfile 'family' Revision ChangesPath 1.387 +2 -12 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- STATUS1998/05/08 13:36:09 1.386 +++ STATUS1998/05/08 16:31:09 1.387 @@ -20,18 +20,8 @@ * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. - PATCH: Make the code wrapped by unvoted_DISALLOW_DEVICE_ACCESS - the default in ap_pcfg_openfile() - Status: Martin +1, Jim +1 -Brian: This still doesn't fix it for htpasswd files... - how about other files like the mime types file? -Jim: It looks like it does fix it for htpasswd (assuming - htpasswd files are accessed via get_pw()), and group - files (assuming accessed by groups_for_user()), the - mod_mime MIME-file, IMAP handler imap-file and digest - password file. What others are we concerned about? -Dean: ap_pcfg_openfile() should use pfopen() instead of - fopen(). + PATCH: [EMAIL PROTECTED] + Status: Jim +1 WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3 STATUS
jim 98/05/08 14:53:25 Modified:.STATUS Log: Latest version of the patch Revision ChangesPath 1.389 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- STATUS1998/05/08 19:06:08 1.388 +++ STATUS1998/05/08 21:53:25 1.389 @@ -20,7 +20,7 @@ * The DoS issue about symlinks to /dev/zero is still present. A device checker patch had been sent to the list a while ago. - PATCH: [EMAIL PROTECTED] + PATCH: [EMAIL PROTECTED] Status: Jim +1 Dean: -0 I really don't like the API change.
cvs commit: apache-1.3/src/main http_main.c
jim 98/05/08 15:06:10
Modified:src/main http_main.c
Log:
Keep SERVER_SUBVERSION available
Revision ChangesPath
1.337 +3 -7 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.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- http_main.c 1998/05/08 15:57:28 1.336
+++ http_main.c 1998/05/08 22:06:08 1.337
@@ -391,10 +391,10 @@
static void ap_set_version()
{
if (ap_note_platform) {
-ap_add_version_component(SERVER_BASEVERSION ( PLATFORM ));
+ap_add_version_component(SERVER_VERSION ( PLATFORM ));
}
else {
-ap_add_version_component(SERVER_BASEVERSION);
+ap_add_version_component(SERVER_VERSION);
}
version_locked++;
}
@@ -3012,14 +3012,10 @@
static void show_compile_settings(void)
{
-#ifdef SERVER_SUBVERSION
printf(Server base version: %s\n, SERVER_BASEVERSION);
printf(Server sub-version: %s\n, SERVER_SUBVERSION);
+printf(Server Full version: %s\n, ap_get_server_version());
printf(Server built:%s\n, ap_get_server_built());
-#else
-printf(Server version: %s\n, ap_get_server_version());
-printf(Server built: %s\n, ap_get_server_built());
-#endif
printf(Server's Module Magic Number: %u\n, MODULE_MAGIC_NUMBER);
printf(Server compiled with\n);
#ifdef BIG_SECURITY_HOLE
cvs commit: apache-1.3/src/main http_main.c
jim 98/05/08 18:21:48
Modified:src/main http_main.c
Log:
Fix the order of how the server_version string is built... All extra
components are tacked to the _end_ of the string. The front of the
server_version string is always SERVER_BASEVERSION. So if we have
Apache/1.3b7-dev (FreeBSD)
and the code gets ap_add_version_component(PHP/3.0) we'd get:
Apache/1.3b7-dev (FreeBSD) PHP/3.0
Revision ChangesPath
1.340 +4 -4 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.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- http_main.c 1998/05/08 23:58:36 1.339
+++ http_main.c 1998/05/09 01:21:47 1.340
@@ -378,7 +378,7 @@
/*
* Prepend the given component identifier to the existing string
*/
- server_version = ap_pstrcat(pconf, component, , server_version,
+ server_version = ap_pstrcat(pconf, server_version, , component,
NULL);
}
}
@@ -390,15 +390,15 @@
*/
static void ap_set_version()
{
-#ifdef SERVER_SUBVERSION
-ap_add_version_component(SERVER_SUBVERSION);
-#endif
if (ap_note_platform) {
ap_add_version_component(SERVER_BASEVERSION ( PLATFORM ));
}
else {
ap_add_version_component(SERVER_BASEVERSION);
}
+#ifdef SERVER_SUBVERSION
+ap_add_version_component(SERVER_SUBVERSION);
+#endif
version_locked++;
}
cvs commit: apache-1.3/src/main util.c
jim 98/05/09 07:27:27
Modified:.STATUS
src CHANGES
src/include httpd.h
src/main util.c
Log:
Submitted by: Jim Jagielski
Reviewed by: Dean Gaudet, Martin Kraemer, Brian Behlendorf
Disallow non-/dev/null device files to be used for ``configuration''
files (this includes htaccess, htpasswd and the mod_mime file). Also,
open these using ap_pfopen to better handle timeouts.
Revision ChangesPath
1.393 +0 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- STATUS1998/05/09 02:28:31 1.392
+++ STATUS1998/05/09 14:27:22 1.393
@@ -18,11 +18,6 @@
o Jim's looked over the ap_snprintf() stuff (the changes that Dean
did to make thread-safe) and they look fine.
-* The DoS issue about symlinks to /dev/zero is still present.
- A device checker patch had been sent to the list a while ago.
- PATCH: [EMAIL PROTECTED]
- Status: Jim +1, Brian +1, Dean +1 (ASSUMED: the API is intact)
-
WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
* SECURITY: check if the magic con/aux/nul/etc names do anything
1.838 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- CHANGES 1998/05/09 03:25:40 1.837
+++ CHANGES 1998/05/09 14:27:24 1.838
@@ -1,5 +1,11 @@
Changes with Apache 1.3b7
+ *) When opening configuration files (like httpd.conf, htaccess
+ and htpasswd), Apache will not allow them to be non-/dev/null
+ device files. This closes a DoS hole. At the same time,
+ we use ap_pfopen to open these files to handle timeouts.
+ [Jim Jagielski, Martin Kraemer]
+
*) Apache will now log the reason its httpd children exit if they exit
due to an unexpected signal. (It requires a new porting define,
SYS_SIGLIST, which if defined should point to a list of text
1.211 +10 -4 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- httpd.h 1998/05/07 12:24:24 1.210
+++ httpd.h 1998/05/09 14:27:26 1.211
@@ -905,12 +905,18 @@
typedef struct {
int (*getch) (void *param); /* a getc()-like function */
void *(*getstr) (void *buf, size_t bufsiz, void *param); /* a
fgets()-like function */
-int (*close) (void *param); /* a fclose()-like function */
-void *param; /* the argument passed to getc()/close()/gets()
*/
+int (*close) (void *param); /* a close hander function */
+void *param; /* the argument passed to getch/getstr/close */
const char *name;/* the filename / description */
unsigned line_number;/* current line number, starting at 1 */
} configfile_t;
+/* Common structure that holds the file and pool for ap_pcfg_openfile */
+typedef struct {
+struct pool *pool;
+FILE *file;
+} poolfile_t;
+
/* Open a configfile_t as FILE, return open configfile_t struct pointer */
API_EXPORT(configfile_t *) ap_pcfg_openfile(pool *p, const char *name);
@@ -919,7 +925,7 @@
void *param,
int(*getc_func)(void*),
void *(*gets_func) (void *buf, size_t bufsiz, void *param),
-int(*close_func)(void*));
+int(*close_func)(void *param));
/* Read one line from open configfile_t, strip LF, increase line number */
API_EXPORT(int) ap_cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
@@ -928,7 +934,7 @@
API_EXPORT(int) ap_cfg_getc(configfile_t *cfp);
/* Detach from open configfile_t, calling the close handler */
-API_EXPORT(int) ap_cfg_closefile(configfile_t *fp);
+API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp);
#ifdef NEED_STRERROR
char *strerror(int err);
1.115 +41 -25apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- util.c1998/05/06 19:47:08 1.114
+++ util.c1998/05/09 14:27:27 1.115
@@ -698,15 +698,39 @@
return res;
}
+API_EXPORT(int) ap_cfg_closefile(configfile_t *cfp)
+{
+#ifdef DEBUG
+ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, Done with
config file %s
cvs commit: apache-1.3 STATUS
jim 98/05/10 10:19:03 Modified:.STATUS Log: I think this whole Server/SUBVERSION debate needs to be hashed out before we release (?) Revision ChangesPath 1.394 +10 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- STATUS1998/05/09 14:27:22 1.393 +++ STATUS1998/05/10 17:19:01 1.394 @@ -18,6 +18,16 @@ o Jim's looked over the ap_snprintf() stuff (the changes that Dean did to make thread-safe) and they look fine. +* The whole SERVER_SUBVERSION, Server: token debate. + Problem: currently the additional tokens show up in the + reverse order that they were added. Also, no real control + over whether to display them or not. Keeping SERVER_SUBVERSION + available conflicts with the new ap_add_version_component() + function. + Available patch: + [EMAIL PROTECTED] + Status: + WIN32 1.3 FINAL RELEASE SHOWSTOPPERS: * SECURITY: check if the magic con/aux/nul/etc names do anything
cvs commit: apache-1.3/src/main http_core.c http_main.c
jim 98/05/11 13:08:10
Modified:.STATUS
htdocs/manual new_features_1_3.html
htdocs/manual/mod core.html
src CHANGES
src/include http_conf_globals.h httpd.h
src/main http_core.c http_main.c
Log:
Submitted by: Jim Jagielski
Replace the AddVersionPlatform directive with ServerTokens directive
which allow for either Minimal (Apache/1.3.0), OS (Apache/1.3.0 (UNIX))
or Full (Apache/1.3.0 (UNIX) PHP/3.0) type Server headers.
SERVER_SUBVERSION is no longer supported.
Revision ChangesPath
1.395 +0 -10 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- STATUS1998/05/10 17:19:01 1.394
+++ STATUS1998/05/11 20:08:02 1.395
@@ -18,16 +18,6 @@
o Jim's looked over the ap_snprintf() stuff (the changes that Dean
did to make thread-safe) and they look fine.
-* The whole SERVER_SUBVERSION, Server: token debate.
- Problem: currently the additional tokens show up in the
- reverse order that they were added. Also, no real control
- over whether to display them or not. Keeping SERVER_SUBVERSION
- available conflicts with the new ap_add_version_component()
- function.
- Available patch:
- [EMAIL PROTECTED]
- Status:
-
WIN32 1.3 FINAL RELEASE SHOWSTOPPERS:
* SECURITY: check if the magic con/aux/nul/etc names do anything
1.58 +8 -9 apache-1.3/htdocs/manual/new_features_1_3.html
Index: new_features_1_3.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- new_features_1_3.html 1998/05/09 04:42:25 1.57
+++ new_features_1_3.html 1998/05/11 20:08:03 1.58
@@ -639,18 +639,17 @@
configuration.
/li
LIA
- HREF=mod/core.html#addversionplatform
+ HREF=mod/core.html#servertokens
STRONGIncluding the operating system in the server
identity/STRONG/A
BR
- A new directive, SAMPAddVersionPlatform/SAMP, allows the Webmaster
- to change the value of
- the SAMPServer/SAMP response header field which is sent back
- to clients. The SAMPAddVersionPlatform/SAMP directive controls
- whether the server will
- include a non-specific note in the server identity about the type of
- operating system on which the server is running. As of Apache 1.3, this
- additional information is included by default.
+ A new directive, SAMPServerTokens/SAMP, allows the Webmaster
+ to change the value of the SAMPServer/SAMP response header
+ field which is sent back to clients. The SAMPServerTokens/SAMP
+ directive controls whether the server will include a non-specific
+ note in the server identity about the type of operating system on
+ which the server is running as well as included module information.
+ As of Apache 1.3, this additional information is included by default.
/LI
/UL
1.116 +51 -47apache-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.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- core.html 1998/05/09 04:42:27 1.115
+++ core.html 1998/05/11 20:08:04 1.116
@@ -24,7 +24,6 @@
LIA HREF=#accessconfigAccessConfig/A
LIA HREF=#accessfilenameAccessFileName/A
LIA HREF=#addmoduleAddModule/A
-LIA HREF=#addversionplatformAddVersionPlatform/A
LIA HREF=#allowoverrideAllowOverride/A
LIA HREF=#authnameAuthName/A
LIA HREF=#authtypeAuthType/A
@@ -78,6 +77,7 @@
LIA HREF=#serverpathServerPath/A
LIA HREF=#serverrootServerRoot/A
LIA HREF=#serversignatureServerSignature/A
+LIA HREF=#servertokensServerTokens/A
LIA HREF=#servertypeServerType/A
LIA HREF=#startserversStartServers/A
LIA HREF=#threadsperchildThreadsPerChild/A
@@ -179,52 +179,6 @@
be cleared with the A HREF=#clearmodulelistClearModuleList/A
directive.PHR
-H2A name=addversionplatformAddVersionPlatform directive/A/H2
-!--%plaintext lt;?INDEX {\tt AddVersionPlatform} directivegt; --
-A
- HREF=directive-dict.html#Syntax
- REL=Help
-STRONGSyntax:/STRONG/A AddVersionPlatform EMOn|Off/EMBR
-A
- HREF=directive-dict.html#Context
- REL=Help
-STRONGContext:/STRONG/A server config BR
-A
- HREF=directive-dict.html#Status
- REL=Help
-STRONGStatus:/STRONG/A coreBR
-A
- HREF=directive-dict.html#Compatibility
- REL=Help
-STRONGCompatibility:/STRONG/A AddVersionPlatform
cvs commit: apache-1.3/src/os/unix os.h
jim 98/05/13 18:22:52 Modified:src/os/unix os.h Log: Avoid nasty trademarks Revision ChangesPath 1.24 +1 -1 apache-1.3/src/os/unix/os.h Index: os.h === RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- os.h 1998/05/07 12:24:30 1.23 +++ os.h 1998/05/14 01:22:52 1.24 @@ -58,7 +58,7 @@ #ifndef APACHE_OS_H #define APACHE_OS_H -#define PLATFORM UNIX +#define PLATFORM Unix /* * This file in included in all Apache source code. It contains definitions
cvs commit: apache-1.3/src/main http_core.c
jim 98/05/28 08:28:14 Modified:src/main http_core.c Log: Oops... it's called ServerTokens now Revision ChangesPath 1.203 +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.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- http_core.c 1998/05/27 14:01:33 1.202 +++ http_core.c 1998/05/28 15:28:13 1.203 @@ -1873,7 +1873,7 @@ /* * Handle a request to include the server's OS platform in the Server - * response header field (the AddVersionPlatform directive). Unfortunately + * response header field (the ServerTokens directive). Unfortunately * this requires a new global in order to communicate the setting back to * http_main so it can insert the information in the right place in the * string.
cvs commit: apache-1.3/htdocs/manual new_features_1_3.html
jim 98/05/29 05:07:06 Modified:htdocs/manual new_features_1_3.html Log: Some new-stuff notes Revision ChangesPath 1.66 +13 -6 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- new_features_1_3.html 1998/05/28 22:09:41 1.65 +++ new_features_1_3.html 1998/05/29 12:07:05 1.66 @@ -463,6 +463,14 @@ CODEap_spawn_child/CODE and CODEspawn_child_err_buff/CODE with simply CODEap_bspawn_child/CODE. +DTSTRONGCODEap_add_version_component()/CODE/STRONG +DDThis API function allows for modules to add their own additional +server tokens which are printed on the on the CODEServer:/CODE +header line. Previous 1.3beta versions had used a +CODESERVER_SUBVERSION/CODE compile-time CODE#define/CODE +to perform this function. Whether the tokens are actually displayed +is controlled by the new CODEServerTokens/CODE directive. + /DL PHR @@ -573,12 +581,11 @@ system in the server identity/STRONG/ABR DDA new directive, CODEServerTokens/CODE, allows the Webmaster to change the value of the CODEServer/CODE response header -field which is sent back to clients. The -CODEServerTokens/CODE directive controls whether the server -will include a non-specific note in the server identity about the -type of operating system on which the server is running as well as -included module information. As of Apache 1.3, this additional -information is included by default. +field which is sent back to clients. The CODEServerTokens/CODE +directive controls whether the server will include a non-specific +note in the server identity about the type of operating system on +which the server is running as well as included module information. +As of Apache 1.3, this additional information is included by default. /DL
cvs commit: apache-1.3/htdocs/manual/misc perf-bsd44.html
jim 98/05/29 08:33:20 Modified:htdocs/manual/misc perf-bsd44.html Log: Have people use sysctl to adjust somaxconn instead of the bogus and incorrect method we suggested before Revision ChangesPath 1.12 +21 -5 apache-1.3/htdocs/manual/misc/perf-bsd44.html Index: perf-bsd44.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-bsd44.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perf-bsd44.html 1998/05/20 20:21:30 1.11 +++ perf-bsd44.html 1998/05/29 15:33:19 1.12 @@ -112,7 +112,6 @@ # Network options. NMBCLUSTERS defines the number of mbuf clusters and # defaults to 256. This machine is a server that handles lots of traffic, # so we crank that value. -options SOMAXCONN=256 # max pending connects options NMBCLUSTERS=4096# mbuf clusters at 4096 # @@ -122,10 +121,6 @@ options OPEN_MAX=512# maximum fds (breaks RPC svcs) /PRE -SOMAXCONN is not derived from maxusers, so you'll always need to increase -that yourself. We used a value guaranteed to be larger than Apache's -default for the listen() of 128, currently. - P In many cases, NMBCLUSTERS must be set much larger than would appear @@ -160,6 +155,27 @@ files). If you've got a lot of other activity besides httpd on the same machine, you'll have to set NPROC higher still. In this example, the NPROC value derived from maxusers proved sufficient for our load. + +P + +To increase the size of the CODElisten()/CODE queue, you need to +adjust the value of SOMAXCONN. SOMAXCONN is not derived from maxusers, +so you'll always need to increase that yourself. We use a value guaranteed +to be larger than Apache's default for the listen() of 128, currently. +The actual value for SOMAXCONN is set in CODEsys/socket.h/CODE. +The best way to adjust this parameter is run-time, rather than changing +it in this header file and thus hardcoding a value in the kernel and +elsewhere. To do this, edit CODE/etc/rc.local/CODE and add the +following line: +PRE +/usr/sbin/sysctl -w kern.somaxconn=256 +/PRE + +P + +We used CODE256/CODE but you can tune it for your own setup. In +many cases, however, even the default value of CODE128/CODE (for +later versions of FreeBSD) is OK. P
cvs commit: apache-1.3 STATUS
jim 98/05/29 17:13:05 Modified:.STATUS Log: Update Revision ChangesPath 1.410 +5 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.409 retrieving revision 1.410 diff -u -r1.409 -r1.410 --- STATUS1998/05/29 09:27:21 1.409 +++ STATUS1998/05/30 00:13:04 1.410 @@ -2,8 +2,11 @@ Release: -1.3.0: Shoot for June 1st, 1998 Release - Brian to be RM, Jim will do announcements +1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern) + and then release it on the 5th. Jim will roll and tag +on the 1st. Everyone should test the tarball so we're +sure the tarball is ready for the 5th. Jim will announce +as well. 1.3b7: Released 26/5/98. If no major errors, will become 1.3.0
cvs commit: apache-1.3 STATUS
jim 98/05/30 07:00:31 Modified:.STATUS Log: Clarify that we'll be using 1.3b8-dev Revision ChangesPath 1.412 +6 -5 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.411 retrieving revision 1.412 diff -u -r1.411 -r1.412 --- STATUS1998/05/30 11:29:17 1.411 +++ STATUS1998/05/30 14:00:30 1.412 @@ -3,12 +3,13 @@ Release: 1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern) - and then release it on the 5th. Jim will roll and tag -on the 1st. Everyone should test the tarball so we're -sure the tarball is ready for the 5th. Jim will announce -as well. + and then release it on the 5th. The tarball will be the + current CVS tree (1.3b8-dev) as of that date/time. + Jim will roll and tag on the 1st. Everyone should test + the tarball so we're sure the tarball is ready for the 5th. + Jim will announce as well. -1.3b7: Released 26/5/98. If no major errors, will become 1.3.0 +1.3b7: Tagged and Released 26/5/98. 2.0 : In pre-alpha development, see apache-2.0 repository
cvs commit: apache-1.3/src/main util.c
jim 98/06/01 11:20:31
Modified:src/main util.c
Log:
WIN32/NT uses 'nul' as it's universal
'/dev/null' file, so we should special-case that for valid config-file
device files
Revision ChangesPath
1.118 +7 -3 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- util.c1998/05/28 19:57:11 1.117
+++ util.c1998/06/01 18:20:30 1.118
@@ -753,9 +753,13 @@
if (file == NULL)
return NULL;
-if (strcmp(name, /dev/null) != 0
-fstat(fileno(file), stbuf) == 0
-!S_ISREG(stbuf.st_mode)) {
+if (fstat(fileno(file), stbuf) == 0
+!S_ISREG(stbuf.st_mode)
+#ifdef WIN32
+strcasecmp(name, nul) != 0) {
+#else
+strcmp(name, /dev/null) != 0) {
+#endif
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,
Access to file %s denied by server: not a regular file,
name);
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:18:44
Modified:.Announcement
src/include httpd.h
src/os/win32 registry.c
Log:
Ready to tag and roll 1.3.0
Revision ChangesPath
1.23 +9 -56 apache-1.3/Announcement
Index: Announcement
===
RCS file: /export/home/cvs/apache-1.3/Announcement,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Announcement 1998/05/21 20:45:23 1.22
+++ Announcement 1998/06/01 22:18:42 1.23
@@ -1,15 +1,9 @@
- Apache 1.3 Beta 7 Released
- ==
+ Apache 1.3.0 Released
+ =
- The Apache Group is pleased to announce the release of the 1.3b7 version
- of Apache, the latest beta release of the Apache HTTP server. 1.3b7 is
- a second release candidate for Apache 1.3.0.
-
- This version is stable under UNIX but remains beta-level under Win32. No
- new features are expected between 1.3b7 and 1.3.0, so please give this
- version a good thrashing in order to provide as much feedback as possible
- to the Apache Group before the release of 1.3.0.
+ The Apache Group is pleased to announce the release of the long
+ awaited 1.3.0 version of the Apache HTTP server.
To grab the latest Apache distribution, check out
http://www.apache.org/dist/
@@ -18,52 +12,11 @@
For a full list of specific code changes see src/CHANGES.
- For an overview of new features in 1.2 please read the CHANGES file
+ For an overview of new features in 1.3 please read the CHANGES file
in the distribution and the New Features with Apache 1.3 document at
http://www.apache.org/docs/new_features_1_3.html
- Major changes with this beta:
- HTTP: fixes for 400 and 408 error codes.
- WIN32: Child process spawning now uses native Win32 API.
-This should address many problems people have had
- on Win32 - it also forced us to modify the
- related child_spawn calls in the Apache API.
- Other various stability fixes.
- Extensive overhaul of the way UNCs are handled.
- Various mod_rewrite fixes.
- Various makefile cleanups.
- Various APACI changes.
- Various DSO cleanups, better support for AIX, OpenBSD, NetBSD
- Server's OS family now reported in Server: strings.
- PORT: added support for NCR MP/RAS 3.0
- Security: we now make sure all config files opened by Apache are not
-special devices.
- Added -s command line option to dump out vhost settings.
-
- Contributing code to this beta:
- Ralf S. Engelschall [EMAIL PROTECTED]
- Ed Korthof [EMAIL PROTECTED]
- Rick Ohnemus [EMAIL PROTECTED]
- Brian Behlendorf [EMAIL PROTECTED]
- Bob Beck [EMAIL PROTECTED]
- Ben Laurie [EMAIL PROTECTED]
- Bill Stoddard [EMAIL PROTECTED]
- Ernst Kloppenburg [EMAIL PROTECTED]
- John Withers [EMAIL PROTECTED]
- Jim Patterson [EMAIL PROTECTED]
- Jim Jagielski [EMAIL PROTECTED]
- Martin Kraemer [EMAIL PROTECTED]
- Dean Gaudet [EMAIL PROTECTED]
- Paul Eggert [EMAIL PROTECTED]
- Lars Eilebrecht [EMAIL PROTECTED]
- [EMAIL PROTECTED]
- Kari Likovuori [EMAIL PROTECTED]
- Michael Anderson's [EMAIL PROTECTED]
- Jaromir Dolecek [EMAIL PROTECTED]
- Roy Fielding [EMAIL PROTECTED]
- David MacKenzie [EMAIL PROTECTED]
- Francisco Tomei [EMAIL PROTECTED]
- Jens Schleusener [EMAIL PROTECTED]
- Jeff Earickson [EMAIL PROTECTED]
- Marc Slemko [EMAIL PROTECTED]
-
+ In general, Apache 1.3.0 offers several substantial improvements
+ over previous versions, including better performance, reliability
+ and a wider-range of supported platforms, including Windows95 and
+ NT.
1.219 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- httpd.h 1998/05/29 00:15:56 1.218
+++ httpd.h 1998/06/01 22:18:43 1.219
@@ -382,7 +382,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3b8-dev/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.0/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
-#define APACHE_RELEASE 1030007
+#define APACHE_RELEASE 103
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.4 +1 -1 apache-1.3/src/os/win32/registry.c
Index
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/01 15:23:42
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
And bump up
Revision ChangesPath
1.220 +2 -2 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- httpd.h 1998/06/01 22:18:43 1.219
+++ httpd.h 1998/06/01 22:23:40 1.220
@@ -382,7 +382,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.0/* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.1-b1 /* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
@@ -397,7 +397,7 @@
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
*/
-#define APACHE_RELEASE 103
+#define APACHE_RELEASE 1030101
#define SERVER_PROTOCOL HTTP/1.1
#ifndef SERVER_SUPPORT
1.5 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- registry.c1998/06/01 22:18:44 1.4
+++ registry.c1998/06/01 22:23:42 1.5
@@ -28,7 +28,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.0
+#define VERSION 1.3.1 beta
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3/src/os/win32 registry.c
jim 98/06/02 04:24:39
Modified:src/include httpd.h
src/os/win32 registry.c
Log:
Oops... wrong naming scheme
Revision ChangesPath
1.221 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- httpd.h 1998/06/01 22:23:40 1.220
+++ httpd.h 1998/06/02 11:24:38 1.221
@@ -382,7 +382,7 @@
* Example: Apache/1.1.0 MrWidget/0.1-alpha
*/
-#define SERVER_BASEVERSION Apache/1.3.1-b1 /* SEE COMMENTS ABOVE */
+#define SERVER_BASEVERSION Apache/1.3.1-dev/* SEE COMMENTS ABOVE */
#define SERVER_VERSION SERVER_BASEVERSION
enum server_token_type {
SrvTk_MIN, /* eg: Apache/1.3.0 */
1.6 +1 -1 apache-1.3/src/os/win32/registry.c
Index: registry.c
===
RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- registry.c1998/06/01 22:23:42 1.5
+++ registry.c1998/06/02 11:24:39 1.6
@@ -28,7 +28,7 @@
#define VENDOR Apache Group
#define SOFTWARE Apache
-#define VERSION 1.3.1 beta
+#define VERSION 1.3.1 dev
#define REGKEY SOFTWARE\\ VENDOR \\ SOFTWARE \\ VERSION
cvs commit: apache-1.3 Announcement
jim 98/06/05 13:54:50 Modified:.Announcement Log: The quote Revision ChangesPath 1.24 +3 -1 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Announcement 1998/06/01 22:18:42 1.23 +++ Announcement 1998/06/05 20:54:49 1.24 @@ -3,7 +3,9 @@ = The Apache Group is pleased to announce the release of the long - awaited 1.3.0 version of the Apache HTTP server. + awaited 1.3.0 version of the Apache HTTP server. 18 months, 1500 + bug reports, 500 patches, and 150 total code contributors helped + make the release of 1.3.0 a reality. To grab the latest Apache distribution, check out http://www.apache.org/dist/
cvs commit: apache-1.3 Announcement
jim 98/06/05 14:03:39 Modified:.Announcement Log: More copy Revision ChangesPath 1.25 +14 -3 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Announcement 1998/06/05 20:54:49 1.24 +++ Announcement 1998/06/05 21:03:38 1.25 @@ -7,18 +7,29 @@ bug reports, 500 patches, and 150 total code contributors helped make the release of 1.3.0 a reality. + Apache 1.3.0 is the most stable version of Apache currently available; + everyone running 1.2.X servers or earlier should upgrade to 1.3, as we + will stop providing support for the 1.2.X tree, though we may make a + release of 1.2.7. At present, the Win95/NT port of Apache is not + as stable as the UNIX version. Further releases of the 1.3.x tree + will bring the Win95/NT port closer to parity. + To grab the latest Apache distribution, check out http://www.apache.org/dist/ and the huge list of available International Mirror Sites at http://www.apache.org/mirrors/ - For a full list of specific code changes see src/CHANGES. - For an overview of new features in 1.3 please read the CHANGES file - in the distribution and the New Features with Apache 1.3 document at + in the distribution and the New Features with Apache 1.3 document at: + + http://www.apache.org/dist/CHANGES http://www.apache.org/docs/new_features_1_3.html In general, Apache 1.3.0 offers several substantial improvements over previous versions, including better performance, reliability and a wider-range of supported platforms, including Windows95 and NT. + + Apache is the most popular web-server in the known universe; over + half of the servers on the Internet are running Apache or one of it's + variants.
cvs commit: apache-1.3 Announcement
jim 98/06/05 18:02:26 Modified:.Announcement Log: be fuzzy Revision ChangesPath 1.26 +3 -3 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Announcement 1998/06/05 21:03:38 1.25 +++ Announcement 1998/06/06 01:02:25 1.26 @@ -3,9 +3,9 @@ = The Apache Group is pleased to announce the release of the long - awaited 1.3.0 version of the Apache HTTP server. 18 months, 1500 - bug reports, 500 patches, and 150 total code contributors helped - make the release of 1.3.0 a reality. + awaited 1.3.0 version of the Apache HTTP server. 12 months, hundreds + of patches and several dozen of total code contributors helped make the + release of 1.3.0 a reality. Apache 1.3.0 is the most stable version of Apache currently available; everyone running 1.2.X servers or earlier should upgrade to 1.3, as we
cvs commit: apache-1.3/src/include httpd.h
jim 98/06/06 18:22:37 Modified:src/include httpd.h Log: Formalise in the comments the use of betaseq Revision ChangesPath 1.222 +2 -0 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- httpd.h 1998/06/02 11:24:38 1.221 +++ httpd.h 1998/06/07 01:22:36 1.222 @@ -396,6 +396,8 @@ /* Numeric release version identifier: major minor bugfix betaseq * Always increases along the same track as the source branch. + * For a final release, 'betaseq' should be set to '99'. + * For example, Apache 1.4.2 should be '1040299' */ #define APACHE_RELEASE 1030101
cvs commit: apache-1.3/htdocs/manual/misc FAQ.html
jim 98/06/06 18:33:57 Modified:htdocs/manual/misc FAQ.html Log: Most will ask this when going to 1.3.0 Revision ChangesPath 1.120 +3 -3 apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- FAQ.html 1998/06/06 15:39:26 1.119 +++ FAQ.html 1998/06/07 01:33:52 1.120 @@ -14,7 +14,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.119 $ ($Date: 1998/06/06 15:39:26 $) + $Revision: 1.120 $ ($Date: 1998/06/07 01:33:52 $) /P P The latest version of this FAQ is always available from the main @@ -260,7 +260,7 @@ /LI LIA HREF=#year2000Is Apache Year 2000 compliant?/A /LI - LIA HREF=#namevhostI upgraded to Apache 1.3b and now my + LIA HREF=#namevhostI upgraded to Apache 1.3.0 and now my virtual hosts don't work!/A /LI LIA HREF=#redhatI'm using RedHat Linux and I have problems with httpd @@ -2040,7 +2040,7 @@ /LI LIA NAME=namevhost - STRONGI upgraded to Apache 1.3b and now my virtual hosts don't + STRONGI upgraded to Apache 1.3.0 and now my virtual hosts don't work!/STRONG /A P
cvs commit: apache-devsite binbuild.sh
jim 98/06/06 18:37:31 Modified:.binbuild.sh Log: Update for 1.3.0 and recall that stuff in support needs libs from the actual httpd build, so move it down to after httpd is built Revision ChangesPath 1.4 +8 -9 apache-devsite/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-devsite/binbuild.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- binbuild.sh 1998/01/06 00:39:38 1.3 +++ binbuild.sh 1998/06/07 01:37:30 1.4 @@ -14,7 +14,7 @@ #releases. # # -# $Id: binbuild.sh,v 1.3 1998/01/06 00:39:38 marc Exp $ +# $Id: binbuild.sh,v 1.4 1998/06/07 01:37:30 jim Exp $ # Marc Slemko ([EMAIL PROTECTED]) # # Script to make Apache binary releases. The below variables must be @@ -29,7 +29,7 @@ # release is the release of the Apache version that is being built. # It must also be the base name of the tarball and the name of the # directory that it is untarred into -release=apache_1.2.5 +release=apache_1.3.0 dir=$release # conf is the Configuration file that you wish to use to build httpd conf=Configuration @@ -55,22 +55,21 @@ # particularily nice names but because it is easy system=`./$release/src/helpers/GuessOS | sed 's/\//_/g'` || exit 1 -cp $conf $dir/src/Configuration || exit 1 cd $dir/src || exit 1 echo running Configure ./Configure || exit 1 -echo making binaries in support -cd ../support || exit 1 -# no, we don't make suexec or worry too much about errors here -# Marc is lazy. -make -cd ../src || exit 1 echo attempting to make httpd make 21 | tee ../../make.out-$system if [ ! -f httpd ] ; then echo error: httpd binary not made exit 1 fi +echo making binaries in support +cd ./support || exit 1 +# no, we don't make suexec or worry too much about errors here +# Marc is lazy. +make +cd .. || exit 1 echo make succeeded, saving the binary and doing a make clean mv httpd httpd-$system make clean || exit 1
cvs commit: apache-devsite how-to-release.html
jim 98/06/06 18:49:59 Modified:.how-to-release.html Log: Some changes Revision ChangesPath 1.41 +11 -3 apache-devsite/how-to-release.html Index: how-to-release.html === RCS file: /export/home/cvs/apache-devsite/how-to-release.html,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- how-to-release.html 1998/06/06 14:03:50 1.40 +++ how-to-release.html 1998/06/07 01:49:58 1.41 @@ -71,7 +71,10 @@ HR STRONG[ Posting the Announcement ]/STRONGBR P - LIOnce built, CODEAnnouncement/CODE should be + LIOnce the tarball is built, give the mirrors a good 24 hours + to get up to sync. This is really important if this this + a final (i.e.: non-beta) release. + LINow, CODEAnnouncement/CODE should be posted to the following places: UL LIUnmoderated UseNet newsgroups (should be crossposted) @@ -91,6 +94,10 @@ /UL /UL P + LIMake sure that CODEAnnouncement.txt/CODE and + CODEAnnouncement.html/CODE in CODEapache-site/CODE + in the CODEdist/CODE directory are updated to include + these changes. LIBask in the glow /OL @@ -125,8 +132,9 @@ from ``CODEApache/1.X.Y-dev/CODE'' to ``CODEApache/1.X.Y/CODE''. Then also change CODEAPACHE_RELEASE/CODE in same file from - ``CODE1XXYYZZ/CODE'' to ``CODE1XXYY99/CODE''. The format is - something like CODEprintf(%d%02d%02d%02d, major, minor, bugfix, + ``CODE1XXYYZZ/CODE'' to ``CODE1XXYYSTRONG99/STRONG/CODE''. + The format is something like + CODEprintf(%d%02d%02d%02d, major, minor, bugfix, betaseq)/CODE.BR CODESTRONG$ vi src/include/httpd.h/STRONG/CODEBR CODESTRONG$ cvs commit src/include/httpd.h/STRONG/CODE
cvs commit: apache-1.3 STATUS
jim 98/06/07 08:13:20 Modified:.STATUS Log: Some updates to STATUS Revision ChangesPath 1.418 +13 -24apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.417 retrieving revision 1.418 diff -u -r1.417 -r1.418 --- STATUS1998/06/05 21:13:28 1.417 +++ STATUS1998/06/07 15:13:19 1.418 @@ -2,31 +2,10 @@ Release: -1.3.0: Tagged and rolled on June 1. - - Plan now is to release it on the 5th. Everyone should test the - tarball so we're sure the tarball is ready for the 5th. Jim will - announce as well. Already known successful platform tests for the - 1.3.0 tarball follow: - - o Linux / Red Hat 5.0, 5.1 Manoj Kasichainula - o Linux / Debian 2.0 (hamm) Alvaro Martinez Echevarria - o Linux / Debian 1.3.1 Ralf S. Engelschall - o FreeBSD 2.2.5 Dirk-Willem van Gulik - o FreeBSD 2.2.6 Ralf S. Engelschall, Dirk-Willem v.Gulik - o FreeBSD 3.0-CURRENT Ralf S. Engelschall, Dirk-Willem v.Gulik - o Sparc-Linux Lars Eilebrecht - o Linux (glibc6)Lars Eilebrecht - o AIX 4.1 Lars Eilebrecht, Dirk-Willem van Gulik - o Solaris 2.4, 2.5 Dirk-Willem van Gulik - o Solaris 2.6 Lars Eilebrecht - o Digital Unix 4.0 Lars Eilebrecht, Dirk-Willem van Gulik - o IRIX 5.3 Dirk-Willem van Gulik - o IRIX 6.2 Mark Cox - o SINIX 5.41/5.42/5.43 Martin Kraemer - o ReliantUNIX 5.44 64bitMartin Kraemer (requires -DNET_SIZE_T=int) - o BS2000/OSD V2.0/V3.0 Martin Kraemer +1.3.1: In development +1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. + 1.3b7: Tagged and Released 26/5/98. 2.0 : In pre-alpha development, see apache-2.0 repository @@ -162,6 +141,16 @@ apdefines.h: Open issues: + +* Redefine APACHE_RELEASE. Add another 'bit' to signify whether + it's a beta or final release. Maybe 'MMNNFFRBB' which means: +MM: Major release # + NN: Minor release # + FF: fix level + R: 0 if beta, 1 if final release + BB: beta number + + See: [EMAIL PROTECTED] * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines
cvs commit: apache-1.3 STATUS
jim 98/06/09 07:23:51 Modified:.STATUS Log: Let's try to get 1.2.1 out in a week-and-a-half Revision ChangesPath 1.419 +3 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.418 retrieving revision 1.419 diff -u -r1.418 -r1.419 --- STATUS1998/06/07 15:13:19 1.418 +++ STATUS1998/06/09 14:23:50 1.419 @@ -2,7 +2,9 @@ Release: -1.3.1: In development +1.3.1: In development. Plan to release on June 19, 1998 to + incorporate the latest additions plus WIN32 compile problems. + Jim offers to be RM. 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th.
cvs commit: apache-1.3 STATUS
jim 98/06/11 05:46:56 Modified:.STATUS Log: Keep up to date Revision ChangesPath 1.424 +8 -3 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.423 retrieving revision 1.424 diff -u -r1.423 -r1.424 --- STATUS1998/06/11 09:55:20 1.423 +++ STATUS1998/06/11 12:46:55 1.424 @@ -42,12 +42,14 @@ * Wilfredo Sanchez's port to Rhapsody 5.1 for 1.2.6 - forward port to 1.3? [EMAIL PROTECTED] + Jim: Hmmm... Rhapsody is not really any longer in Apple's + game-plan. The focus is OS X now. * Ralf's configure generates config.status: A tiny addition for the APACI configure script to provide an easy way (like GNU Autoconf) to re-create the configuration See: http://www.engelschall.com/sw/apache/ [configstatus] - Status (for 1.3.1-dev): Ralf +1, Martin +1 + Status (for 1.3.1-dev): Ralf +1, Martin +1, Jim +1 * Ralf's IfDefine.../IfDefine: This patch adds a useful IfDefine.../IfDefine section to the core @@ -64,7 +66,7 @@ tests to remove some of the classical hurdles for new users when setting up Apache. See: http://www.engelschall.com/sw/apache/ [substconfparam] - Status (for 1.3.1-dev): Ralf +1 + Status (for 1.3.1-dev): Ralf +1, Jim +1 * Ralf's linking DSO modules against possible libraries from $(LIBS): This patch is a first step for a more powerful and less restrictive DSO @@ -78,7 +80,7 @@ to add an extra Makefile dependency for the httpd target, for instance to external third-party libraries, etc. See: http://www.engelschall.com/sw/apache/ [extradeps] - Status (for 1.3.1-dev): Ralf +1, Marc +1 + Status (for 1.3.1-dev): Ralf +1, Marc +1, Jim +1 * Paul's patch to add integrated restart/shutdown signalling (Win32) This patch make Apache listen on predictable event names to allow @@ -144,6 +146,7 @@ Open issues: * How should an Apache binary release tarball look? + NOTE: This should be resolved before 1.3.1 !! 1. The old way where it is just a source release tarball plus a pre-compiled src/httpd-gnutriple. It is created @@ -190,6 +193,7 @@ BB: beta number See: [EMAIL PROTECTED] + Status: Jim +1, Ben +1, Martin +1 * Someone other than Dean has to do a security/correctness review on psprintf(), bprintf(), and ap_snprintf(). In particular these routines @@ -200,6 +204,7 @@ o Laura La Gassa's looked over ap_vformatter other related code o Martin did a source review as well. o Could still use 1 or 2 more sets of eyeballs. + Status: Is this still valid?? * Paul would like to see a 'gdbm' option because he uses it a lot.
cvs commit: apache-1.3 STATUS
jim 98/06/19 06:14:57 Modified:.STATUS Log: Give us some time Revision ChangesPath 1.432 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.431 retrieving revision 1.432 diff -u -r1.431 -r1.432 --- STATUS1998/06/17 12:03:39 1.431 +++ STATUS1998/06/19 13:14:56 1.432 @@ -2,7 +2,7 @@ Release: -1.3.1: In development. Plan to release on June 19, 1998 to +1.3.1: In development. Plan to release on June 24, 1998 to incorporate the latest additions plus WIN32 compile problems. Jim offers to be RM.
cvs commit: apache-1.3/src/main http_main.c
jim 98/06/25 14:06:05 Modified:src CHANGES src/main http_main.c Log: Add SIGILL to our dumpable signals Revision ChangesPath 1.933 +2 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.932 retrieving revision 1.933 diff -u -r1.932 -r1.933 --- CHANGES 1998/06/25 19:51:53 1.932 +++ CHANGES 1998/06/25 21:06:01 1.933 @@ -1,5 +1,7 @@ Changes with Apache 1.3.1 + *) We now attempt to dump core when we get SIGILL. [Jim Jagielski] + *) PORT: remove broken test for MAP_FILE in http_main.c. [Wilfredo Sanchez [EMAIL PROTECTED]] 1.367 +7 -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.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- http_main.c 1998/06/25 19:51:55 1.366 +++ http_main.c 1998/06/25 21:06:03 1.367 @@ -2546,6 +2546,10 @@ if (sigaction(SIGABRT, sa, NULL) 0) ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, sigaction(SIGABRT)); #endif +#ifdef SIGILL + if (sigaction(SIGILL, sa, NULL) 0) + ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, sigaction(SIGILL)); +#endif sa.sa_flags = 0; } sa.sa_handler = sig_term; @@ -2586,6 +2590,9 @@ #ifdef SIGABRT signal(SIGABRT, sig_coredump); #endif /* SIGABRT */ +#ifdef SIGILL + signal(SIGILL, sig_coredump); +#endif /* SIGILL */ #ifdef SIGXCPU signal(SIGXCPU, SIG_DFL); #endif /* SIGXCPU */
cvs commit: apache-1.3/src/include http_config.h
jim 98/06/29 12:02:04 Modified:src CHANGES src/include http_config.h Log: Hmmm... This name change involves an API change. For example, PHP3.0.1-dev now barfs (Rasmus, hint hint :) ) Revision ChangesPath 1.940 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.939 retrieving revision 1.940 diff -u -r1.939 -r1.940 --- CHANGES 1998/06/29 12:21:01 1.939 +++ CHANGES 1998/06/29 19:01:59 1.940 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) API: Name changes of table_elts to ap_table_elts and is_table_empty + to ap_is_table_empty. [Ben Laurie] + *) PORT: Add UnixWare 7 support [Vadim Kostoglodoff [EMAIL PROTECTED]] PR#2463 1.88 +1 -1 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- http_config.h 1998/05/27 14:01:31 1.87 +++ http_config.h 1998/06/29 19:02:03 1.88 @@ -275,7 +275,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19980527 +#define MODULE_MAGIC_NUMBER 19980627 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-devsite mmn.txt
jim 98/06/29 12:04:25 Modified:.mmn.txt Log: Document MMN bump for tables Revision ChangesPath 1.25 +3 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mmn.txt 1998/05/27 23:07:41 1.24 +++ mmn.txt 1998/06/29 19:04:25 1.25 @@ -66,3 +66,6 @@ This string will be printed in place of the canned error responses, and will be propagated to ErrorDocuments or cgi scripts in the (REDIRECT_)ERROR_NOTES variable. +19980627 (1.3.1-dev) - More renaming that we forgot/bypassed. In particular: +table_elts -- ap_table_elts +is_table_empty -- ap_is_table_empty
cvs commit: apache-1.3/src/include compat.h
jim 98/06/29 12:06:19 Modified:src/include compat.h Log: Be backwards compatible Revision ChangesPath 1.11 +2 -0 apache-1.3/src/include/compat.h Index: compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- compat.h 1998/05/28 22:09:46 1.10 +++ compat.h 1998/06/29 19:06:18 1.11 @@ -176,6 +176,7 @@ #define is_fnmatch ap_is_fnmatch #define is_initial_req ap_is_initial_req #define is_matchexpap_is_matchexp +#define is_table_empty ap_is_table_empty #define is_url ap_is_url #define keepalive_timeout ap_keepalive_timeout #define kill_cleanup ap_kill_cleanup @@ -379,6 +380,7 @@ #define table_add ap_table_add #define table_addn ap_table_addn #define table_do ap_table_do +#define table_elts ap_table_elts #define table_get ap_table_get #define table_mergeap_table_merge #define table_mergen ap_table_mergen
cvs commit: apache-1.3/src/include conf.h
jim 98/07/07 17:23:43 Modified:src CHANGES src/include conf.h Log: PR:2398 Submitted by: Kristian Kraemmer Nielsen [EMAIL PROTECTED] Reviewed by: Jim Jagielski Change 'nobody' to 'nogroup for DEFAULT_GROUP under AIX Revision ChangesPath 1.951 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.950 retrieving revision 1.951 diff -u -r1.950 -r1.951 --- CHANGES 1998/07/07 23:19:22 1.950 +++ CHANGES 1998/07/08 00:23:39 1.951 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP. + [Kristian Kraemmer Nielsen [EMAIL PROTECTED]] PR#2398 + *) suexec's error messages have been clarified a little bit. [Ken Coar] *) PORT: Apache is not 8-bit clean in many settings, a problem we're 1.218 +1 -1 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.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- conf.h1998/06/20 11:20:38 1.217 +++ conf.h1998/07/08 00:23:41 1.218 @@ -242,7 +242,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 #ifndef DEFAULT_GROUP -#define DEFAULT_GROUP nobody +#define DEFAULT_GROUP nogroup #endif #endif #ifndef DEFAULT_USER
cvs commit: apache-1.3/src/include conf.h
jim 98/07/07 17:46:06 Modified:src CHANGES src/include conf.h Log: Why the flying fuck even bother... Revision ChangesPath 1.952 +0 -3 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.951 retrieving revision 1.952 diff -u -r1.951 -r1.952 --- CHANGES 1998/07/08 00:23:39 1.951 +++ CHANGES 1998/07/08 00:46:03 1.952 @@ -1,8 +1,5 @@ Changes with Apache 1.3.1 - *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP. - [Kristian Kraemmer Nielsen [EMAIL PROTECTED]] PR#2398 - *) suexec's error messages have been clarified a little bit. [Ken Coar] *) PORT: Apache is not 8-bit clean in many settings, a problem we're 1.219 +1 -1 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.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- conf.h1998/07/08 00:23:41 1.218 +++ conf.h1998/07/08 00:46:05 1.219 @@ -242,7 +242,7 @@ #define USE_MMAP_FILES #define HAVE_SYSLOG 1 #ifndef DEFAULT_GROUP -#define DEFAULT_GROUP nogroup +#define DEFAULT_GROUP nobody #endif #endif #ifndef DEFAULT_USER
cvs commit: apache-1.3/src/include apctype.h
jim 98/07/08 10:57:39 Modified:src/include apctype.h Log: Don't think it applies here Revision ChangesPath 1.2 +0 -3 apache-1.3/src/include/apctype.h Index: apctype.h === RCS file: /export/home/cvs/apache-1.3/src/include/apctype.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apctype.h 1998/07/08 17:46:59 1.1 +++ apctype.h 1998/07/08 17:57:38 1.2 @@ -53,9 +53,6 @@ * For more information on the Apache Group and the Apache HTTP server * project, please see http://www.apache.org/. * - * This code is based on, and used with the permission of, the - * SIO stdio-replacement strx_* functions by Panos Tsirigotis - * [EMAIL PROTECTED] for xinetd. */ #ifndef APACHE_APCTYPE_H
cvs commit: apache-1.3/src Configure
jim 98/07/12 06:32:51
Modified:src Configure
Log:
Oops... gotta recall that older (and esp. SysV-based) tr's require the
'[]' method. This works fine with BSD tr's since it maps the [ to [
and the ] to ]. Cover all bases.
Revision ChangesPath
1.275 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- Configure 1998/07/11 10:24:05 1.274
+++ Configure 1998/07/12 13:32:50 1.275
@@ -1217,7 +1217,7 @@
echo $CONF_AUTO_H
for header in $CHECK_FOR_HEADERS; do
echo /* $header */ $CONF_AUTO_H
-name=`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr 'a-z' 'A-Z'`
+name=`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`
if ./helpers/TestCompile header $header; then
eval HAVE_${name}=1
echo #ifndef HAVE_${name} $CONF_AUTO_H
cvs commit: apache-1.3/src/include conf.h
jim 98/07/12 07:38:04 Modified:src/include conf.h Log: Hmmm... A/UX has sys/resource.h but no rlimit() functions to read/write the values. The rub is that it's sys/resource.h file DOES define RLIMIT_CPU, which causes http_core.c to barf. S we just don't include the header Revision ChangesPath 1.223 +1 -0 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.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- conf.h1998/07/12 09:07:31 1.222 +++ conf.h1998/07/12 14:38:03 1.223 @@ -467,6 +467,7 @@ #define NO_LINGCLOSE #define NO_SLACK #define HAVE_SYSLOG 1 +#undef HAVE_SYS_RESOURCE_H /* exists but does not provide *rlimit funcs */ #elif defined(SVR4) #define NO_KILLPG
cvs commit: apache-1.3/src PORTING
jim 98/07/13 05:31:05 Modified:src PORTING Log: Some doc changes about the header rename Revision ChangesPath 1.31 +17 -11apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- PORTING 1998/06/04 20:18:27 1.30 +++ PORTING 1998/07/13 12:31:04 1.31 @@ -97,7 +97,7 @@ for the port: ./Configure - ./include/conf.h + ./include/ap_config.h Configure: == @@ -117,7 +117,7 @@ The 'OS' variable is used to define the system Apache is being built for. You will also note that 'CFLAGS' defines -DAUX. In this case, -'AUX' is a magic cookie used by the Apache code (mainly conf.h [see +'AUX' is a magic cookie used by the Apache code (mainly ap_config.h [see below]) to handle OS-specific code. Each code that has and requires such OS-specific code will require a unique system cookie defined in 'CFLAGS'. You will also note that Configure also goes ahead and @@ -129,9 +129,9 @@ than any system supplied regex. It's been our experience that system supplied regex libraries are generally buggy, and should be avoided. -conf.h: +ap_config.h: === -The Apache code, specifically in conf.h, uses a variety of #defines to +The Apache code, specifically in ap_config.h, uses a variety of #defines to control how the code is compiled and what options are available for each supported OS. One of the hardest parts about the porting process is determining which of the following are applicable for your system and @@ -152,7 +152,7 @@ are not strictly required, but are a Good Idea anyway). The following several lines provide a list and short description -of these #defines. By correctly #defining the ones you need in conf.h +of these #defines. By correctly #defining the ones you need in ap_config.h (wrapped by the above mentioned system cookie), you can fine tune the build for your OS. @@ -187,15 +187,21 @@ Define if the OS supports the getrlimit()/setrlimit() functions HAVE_CRYPT_H: - Define if the OS has the crypt.h header file. + Defined if the OS has the crypt.h header file. This is set + automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. HAVE_SYS_SELECT_H: - Define if the OS has the sys/select.h header file. + Defined if the OS has the sys/select.h header file. This is + set automatically during the Configure process and stored in the + src/include/ap_config_auto.h header file. HAVE_SYS_RESOURCE_H: - Define if the OS has and supports the getrlimit/setrlimit + Defined if the OS has and supports the getrlimit/setrlimit family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT - is found and used. + is found and used. This is set automatically during the Configure + process and stored in the src/include/ap_config_auto.h header + file. -- USE_*: @@ -338,8 +344,8 @@ NET_SIZE_T: Some functions such as accept(), getsockname(), getpeername() take an int *len on some architectures and a size_t *len on others. - If left undefined apache will default it to int. See include/conf.h - for a description of NET_SIZE_T. + If left undefined apache will default it to int. See + include/ap_config.h for a description of NET_SIZE_T. NEED_HASHBANG_EMUL: The execve()/etc. functions on this platform do not deal with #!,
cvs commit: apache-1.3/src/include ap_config.h
jim 98/07/13 05:35:54 Modified:src PORTING src/include ap_config.h Log: Remove some dead code and add notes that if the sys/resource.h file exists, we assume that the rlimit() funcs do as well Revision ChangesPath 1.32 +3 -5 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- PORTING 1998/07/13 12:31:04 1.31 +++ PORTING 1998/07/13 12:35:51 1.32 @@ -183,9 +183,6 @@ HAVE_GMTOFF: Define if the OS's tm struct has the tm_gmtoff element -HAVE_RESOURCE: - Define if the OS supports the getrlimit()/setrlimit() functions - HAVE_CRYPT_H: Defined if the OS has the crypt.h header file. This is set automatically during the Configure process and stored in the @@ -199,8 +196,9 @@ HAVE_SYS_RESOURCE_H: Defined if the OS has and supports the getrlimit/setrlimit family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT - is found and used. This is set automatically during the Configure - process and stored in the src/include/ap_config_auto.h header + is found and used. This also assumes that the getrlimit()/setrlimit() + functions are available as well. This is set automatically during the + Configure process and stored in the src/include/ap_config_auto.h header file. -- 1.226 +0 -4 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.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- ap_config.h 1998/07/13 11:32:33 1.225 +++ ap_config.h 1998/07/13 12:35:53 1.226 @@ -216,7 +216,6 @@ #define HAVE_SHMGET #define USE_SHMGET_SCOREBOARD #undef HAVE_GMTOFF -#define HAVE_RESOURCE #define USE_FCNTL_SERIALIZED_ACCEPT /* feeling brave? want to try using POSIX mutexes? */ /* #define HAVE_MMAP */ @@ -510,7 +509,6 @@ #define NEED_STRCASECMP #define NEED_STRNCASECMP #define bzero(a,b) memset(a,0,b) -#define HAVE_RESOURCE 1 #define HAVE_MMAP 1 #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES @@ -630,7 +628,6 @@ #elif defined(LYNXOS) #undef HAVE_GMTOFF -#define HAVE_RESOURCE 1 #undef USE_MMAP_SCOREBOARD #undef USE_SHMGET_SCOREBOARD #undef USE_FCNTL_SERIALIZED_ACCEPT @@ -651,7 +648,6 @@ #undef HAVE_GMTOFF #define NO_KILLPG #undef NO_SETSID -#define HAVE_RESOURCE 1 #define bzero(a,b) memset(a,0,b) #define USE_FCNTL_SERIALIZED_ACCEPT #define HAVE_MMAP 1
cvs commit: apache-1.3/src Configure
jim 98/07/17 10:59:53
Modified:src Configure
Log:
Move some uses of TestCompile down to where they make the most sense:
down to a place where Makefile.config is almost totally built (except
for $LIBS, which is good since that's what we will be adjusting :) )
Revision ChangesPath
1.277 +78 -73apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- Configure 1998/07/13 11:32:29 1.276
+++ Configure 1998/07/17 17:59:52 1.277
@@ -1077,41 +1077,6 @@
fi
-## Some OS-related stuff for the DSO mechanism:
-## Finding the vendor DSO functions
-##
-if [ x$using_shlib = x1 ] ; then
-DL_LIB=
-case $PLAT in
-*-ibm-aix* )
-DL_LIB=-lld
-;;
-*-hp-hpux*)
-if ./helpers/TestCompile func shl_load; then
-:
-else
-if ./helpers/TestCompile lib dld; then
-DL_LIB=-ldld
-fi
-fi
-;;
-* )
-if ./helpers/TestCompile func dlopen; then
-:
-else
-if ./helpers/TestCompile lib dl; then
-DL_LIB=-ldl
-fi
-fi
-;;
-esac
-if [ .$DL_LIB != . ]; then
-LIBS=$LIBS $DL_LIB
-echo + using $DL_LIB for vendor DSO support
-fi
-fi
-
-
## Now we do some OS specific adjustments... for some OSs, we need
## to adjust CFLAGS and/or OPTIM depending on which compiler we
## are going to use. This is easy, since this can be gleamed from
@@ -1203,38 +1168,6 @@
;;
esac
-
-## Now check for existance of non-standard system header files
-## and start generation of the ap_config_auto.h header
-##
-AP_CONFIG_AUTO_H=include/ap_config_auto.h
-echo /* $AP_CONFIG_AUTO_H
-echo * ap_config_auto.h -- Automatically determined configuration stuff
$AP_CONFIG_AUTO_H
-echo * THIS FILE WAS AUTOMATICALLY GENERATED - DO NOT EDIT!
$AP_CONFIG_AUTO_H
-echo */ $AP_CONFIG_AUTO_H
-echo $AP_CONFIG_AUTO_H
-echo #ifndef AP_CONFIG_AUTO_H $AP_CONFIG_AUTO_H
-echo #define AP_CONFIG_AUTO_H $AP_CONFIG_AUTO_H
-
-echo + checking for system header files
-CHECK_FOR_HEADERS=dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h
sys/select.h sys/processor.h
-for header in $CHECK_FOR_HEADERS; do
-echo $AP_CONFIG_AUTO_H
-echo /* check: #include $header */ $AP_CONFIG_AUTO_H
-name=`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]'
'[A-Z]'`
-if ./helpers/TestCompile header $header; then
-eval HAVE_${name}=1
-echo #ifndef HAVE_${name} $AP_CONFIG_AUTO_H
-echo #define HAVE_${name} 1 $AP_CONFIG_AUTO_H
-echo #endif $AP_CONFIG_AUTO_H
-else
-eval HAVE_${name}=0
-echo #ifdef HAVE_${name} $AP_CONFIG_AUTO_H
-echo #undef HAVE_${name} $AP_CONFIG_AUTO_H
-echo #endif $AP_CONFIG_AUTO_H
-fi
-done
-
# SOCKS4 support:
# We assume that if they are using SOCKS4, then they've
# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
@@ -1643,25 +1576,88 @@
fi
-## Continue building Makefile.config.
+## Continue building Makefile.config. Fill in all entries except
+## for $LIBS at this point. This implies that anything below
+## can only alter $LIBS
##
echo CFLAGS1=$CFLAGS Makefile.config
echo OSDIR=\$(SRCDIR)/$OSDIR Makefile.config
echo INCDIR=\$(SRCDIR)/include Makefile.config
echo INCLUDES0=-I\$(OSDIR) -I\$(INCDIR) Makefile.config
echo INCLUDES1=$INCLUDES Makefile.config
-echo LIBS1=$LIBS Makefile.config
echo LDFLAGS1=$LDFLAGS Makefile.config
echo MFLAGS_STATIC=$MFLAGS_STATIC Makefile.config
echo REGLIB=$REGLIB Makefile.config
echo RANLIB=$RANLIB Makefile.config
echo SHELL=$SHELL Makefile.config
-echo ## Makefile.config
-echo ## (End of automatically generated section) Makefile.config
-echo ## Makefile.config
-echo Makefile.config
+## Some OS-related stuff for the DSO mechanism:
+## Finding the vendor DSO functions
+##
+if [ x$using_shlib = x1 ] ; then
+DL_LIB=
+case $PLAT in
+*-ibm-aix* )
+DL_LIB=-lld
+;;
+*-hp-hpux*)
+if ./helpers/TestCompile func shl_load
cvs commit: apache-1.3 STATUS
jim 98/07/17 13:34:36 Modified:.STATUS Log: I'll be on vacation next week so PS: What about that new APACHE_RELEASE stuff mentioned in STATUS? It's got 3 votes. Should we do this for 1.3.1?? Revision ChangesPath 1.440 +0 -12 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.439 retrieving revision 1.440 diff -u -r1.439 -r1.440 --- STATUS1998/07/16 08:30:30 1.439 +++ STATUS1998/07/17 20:34:35 1.440 @@ -6,8 +6,6 @@ evening, with release a day or two later. This depends on Win32 working and being ready. - Does Jim offer to be RM? - 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. 2.0 : In pre-alpha development, see apache-2.0 repository @@ -152,16 +150,6 @@ * proxy_*_canon routines use r-proxyreq incorrectly. See [EMAIL PROTECTED] - -* LynxOS has system-level conf.h file - Seems that Lynx has a system level conf.h file that ours overrules, - so it doesn't compile correctly. To accomodate, we would need to - rename our conf.h to something safe. Possible choices: - - apconf.h : - applatforms.h : - apdefaults.h : - apdefines.h: Open issues:
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
jim 98/07/18 08:30:47 Modified:src/helpers TestCompile src/include ap_config.h src/modules/standard mod_rewrite.c Log: Submitted by: Brian Havard [EMAIL PROTECTED] Reviewed by: Jim Jagielski EMX OS/2 Port Revision ChangesPath 1.13 +1 -1 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- TestCompile 1998/07/11 10:24:07 1.12 +++ TestCompile 1998/07/18 15:30:41 1.13 @@ -1,6 +1,6 @@ #!/bin/sh exstat=1 -trap 'rm -f Makefile dummy testfunc.c testfunc; exit $exstat' 0 1 2 3 15 +trap 'rm -f Makefile dummy dummy.exe testfunc.c testfunc testfunc.exe; exit $exstat' 0 1 2 3 15 # # Yet another Apache Configure helper script. # This script tests certain aspects of the compilation 1.227 +2 -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.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- ap_config.h 1998/07/13 12:35:53 1.226 +++ ap_config.h 1998/07/18 15:30:43 1.227 @@ -662,6 +662,8 @@ #define NEED_STRNCASECMP #define NO_SETSID #define NO_TIMES +/* ap_config_auto.h gets this wrong, force sys/select.h to be included */ +#define HAVE_SYS_SELECT_H #define CASE_BLIND_FILESYSTEM /* Add some drive name support */ #define chdir _chdir2 1.125 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- mod_rewrite.c 1998/07/12 15:47:39 1.124 +++ mod_rewrite.c 1998/07/18 15:30:46 1.125 @@ -3213,7 +3213,7 @@ file %s, conf-rewritelockfile); exit(1); } -#ifndef WIN32 +#if !defined(__EMX__) !defined(WIN32) /* make sure the childs have access to this file */ if (geteuid() == 0 /* is superuser */) chown(conf-rewritelockfile, ap_user_id, -1 /* no gid change */);
cvs commit: apache-1.3/src CHANGES Configure
jim 98/08/03 12:59:58 Modified:src CHANGES Configure Log: PR: 2736 Submitted by: Alain St-Denis [EMAIL PROTECTED] [Idea] Reviewed by: Jim Jagielski IRIXN32 rule was being ignored... Noted in the above PR although the suggested Fix was more than what was required. Revision ChangesPath 1.1000+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.999 retrieving revision 1.1000 diff -u -r1.999 -r1.1000 --- CHANGES 1998/08/03 09:36:03 1.999 +++ CHANGES 1998/08/03 19:59:55 1.1000 @@ -1,5 +1,9 @@ Changes with Apache 1.3.2 + *) The IRIXN32 Rule was being ignored. Configure now correctly adds + -n32 only if IRIXN32 says to. [Jim Jagielski, Alain St-Denis + [EMAIL PROTECTED]] PR#2736 + *) Clean up a warning in mod_proxy. [Ralf S. Engelschall] *) Renamed __EMX__ (internal define of the gcc port under OS/2) to OS2 1.283 +34 -12apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- Configure 1998/08/03 09:14:44 1.282 +++ Configure 1998/08/03 19:59:56 1.283 @@ -888,6 +888,24 @@ fi LDFLAGS_SHLIB_EXPORT= ;; +*-sgi-irix64) +case $CC in +*/gcc|gcc ) + CFLAGS_SHLIB=-fpic + N32FLAG= + ;; +*/cc|cc ) + CFLAGS_SHLIB=-KPIC + N32FLAG=-n32 + ;; +esac +if [ $RULE_IRIXN32 = yes ]; then +LDFLAGS_SHLIB=$N32FLAG -shared +else +LDFLAGS_SHLIB=-shared +fi +LDFLAGS_SHLIB_EXPORT= +;; *-sgi-irix) case $CC in */gcc|gcc ) CFLAGS_SHLIB=-fpic ;; @@ -1095,20 +1113,24 @@ esac ;; *IRIX-64*) - case $CC in - */cc|cc ) - CFLAGS=$CFLAGS -n32 - LDFLAGS=$LDFLAGS -n32 - ;; - esac + if [ $RULE_IRIXN32 = yes ]; then + case $CC in + */cc|cc ) + CFLAGS=$CFLAGS -n32 + LDFLAGS=$LDFLAGS -n32 + ;; + esac + fi ;; *IRIX-32*) - case $CC in - */cc|cc ) - CFLAGS=$CFLAGS -n32 - LDFLAGS=$LDFLAGS -n32 - ;; - esac + if [ $RULE_IRIXN32 = yes ]; then + case $CC in + */cc|cc ) + CFLAGS=$CFLAGS -n32 + LDFLAGS=$LDFLAGS -n32 + ;; + esac + fi ;; IBM?AIX?4.[123]) case $CC in
cvs commit: apache-1.3/src/helpers PrintPath PrintPathOS2 TestCompile
jim 98/08/03 14:51:41 Modified:src CHANGES src/helpers PrintPath PrintPathOS2 TestCompile Log: Update PrintPath family... Revision ChangesPath 1.1001+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1000 retrieving revision 1.1001 diff -u -r1.1000 -r1.1001 --- CHANGES 1998/08/03 19:59:55 1.1000 +++ CHANGES 1998/08/03 21:51:37 1.1001 @@ -1,5 +1,10 @@ Changes with Apache 1.3.2 + *) Cleanup of the PrintPath/PrintPathOS2 helper functions. Avoid + the ugly use of an env. variable and use command-line args for + alternate $PATH. Make more like advanced 'type's as well. + [Jim Jagielski] + *) The IRIXN32 Rule was being ignored. Configure now correctly adds -n32 only if IRIXN32 says to. [Jim Jagielski, Alain St-Denis [EMAIL PROTECTED]] PR#2736 1.11 +44 -26apache-1.3/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PrintPath 1998/04/11 15:45:59 1.10 +++ PrintPath 1998/08/03 21:51:40 1.11 @@ -1,18 +1,43 @@ #!/bin/sh -# Look for $1 somewhere in $PATH. As an extra bonus, -# if $AP_PPSEARCHPATH is set, this will look for $i -# in there instead. Will print out the full pathname unless -# called with the '-s' option +# Look for program[s] somewhere in $PATH. # +# Options: +# -s +#Do not print out full pathname. (silent) +# -pPATHNAME +#Look in PATHNAME instead of $PATH +# +# Usage: +# PrintPath [-s] [-pPATHNAME] program [program ...] +# +## +# Some constants +## +pathname=$PATH +echo=yes + +## +# Parse command line +## +for args in $* +do +case $args in + -s ) echo=no ;; + -p* ) pathname=`echo $args | sed 's/^..//'` ;; + * ) programs=$programs $args ;; +esac +done + +## # We do some funny stuff to check to see # if test/[] knows about -x -# +## testfile=pp.t.$$ cat $testfile ENDTEST #!/bin/sh if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then - exit 0 +exit 0 fi exit 1 ENDTEST @@ -23,29 +48,22 @@ test_exec_flag=-r fi rm -f $testfile - -if [ x$1 = x-s ]; then -shift -else -echo=yes -fi - -if [ x$AP_PPSEARCHPATH = x ] ; then -AP_PPSEARCHPATH=$PATH -fi -for path in `echo $AP_PPSEARCHPATH | - sed 's/^:/.:/ - s/::/:.:/g - s/:$/:./ - s/:/ /g' ` +for program in $programs do -if [ $test_exec_flag $path/$1 ] [ ! -d $path/$1 ]; then -if [ $echo = yes ]; then - echo $path/$1 +for path in `echo $pathname | + sed 's/^:/.:/ + s/::/:.:/g + s/:$/:./ + s/:/ /g' ` +do + if [ $test_exec_flag $path/$program ] [ ! -d $path/$program ]; then + if [ $echo = yes ]; then + echo $path/$program + fi + exit 0 fi - exit 0 -fi +done done exit 1 1.4 +40 -24apache-1.3/src/helpers/PrintPathOS2 Index: PrintPathOS2 === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPathOS2,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PrintPathOS2 1998/04/11 15:45:59 1.3 +++ PrintPathOS2 1998/08/03 21:51:40 1.4 @@ -1,33 +1,49 @@ #!/bin/sh -# Look for $1 somewhere in $PATH. As an extra bonus, -# if $AP_PPSEARCHPATH is set, this will look for $i -# in there instead. Will print out the full pathname unless -# called with the '-s' option +# Look for program[s] somewhere in $PATH. # - -if [ x$1 = x-s ]; then -shift -else -echo=yes -fi +# Options: +# -s +#Do not print out full pathname. (silent) +# -pPATHNAME +#Look in PATHNAME instead of $PATH +# +# Usage: +# PrintPath [-s] [-pPATHNAME] program [program ...] +# +## +# Some constants +## +pathname=$PATH +echo=yes -if [ x$AP_PPSEARCHPATH = x ] ; then -AP_PPSEARCHPATH=$PATH -fi +## +# Parse command line +## +for args in $* +do +case $args in + -s ) echo=no ;; + -p* ) pathname=`echo $args | sed 's/^..//'` ;; + * ) programs=$programs $args ;; +esac +done -for path in `echo $AP_PPSEARCHPATH | - sed 's/^;/.;/ - s/;;/;.;/g - s/;$/;./ - s/;/ /g - s//\\//g' ` +for program in $programs do -if [ -r $path/$1.exe ] [ ! -d $path/$1.exe ]; then -if [ $echo = yes ]; then - echo $path
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/08/06 10:42:52
Modified:src CHANGES
src/modules/standard mod_status.c
Log:
Hmmm... we have access to the subprocesses pids,
let's use them. Now we can tell which process is in which state even
without full STATUS
Revision ChangesPath
1.1005+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1004
retrieving revision 1.1005
diff -u -r1.1004 -r1.1005
--- CHANGES 1998/08/06 17:30:18 1.1004
+++ CHANGES 1998/08/06 17:42:49 1.1005
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) The 'status' module will now show the process pid's and their
+ state even without full STATUS accounting. [Jim Jagielski]
+
*) Restore the client IP address to the error log messages, this
was lost during the transition from 1.2 to 1.3. Add a new
function ap_log_rerror() which takes a request_rec * and
1.92 +11 -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.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- mod_status.c 1998/08/06 17:31:14 1.91
+++ mod_status.c 1998/08/06 17:42:51 1.92
@@ -241,6 +241,7 @@
short_score score_record;
parent_score ps_record;
char stat_buffer[HARD_SERVER_LIMIT];
+int pid_buffer[HARD_SERVER_LIMIT];
clock_t tu, ts, tcu, tcs;
tu = ts = tcu = tcs = 0;
@@ -296,6 +297,7 @@
ps_record = ap_scoreboard_image-parent[i];
res = score_record.status;
stat_buffer[i] = status_flags[res];
+ pid_buffer[i] = (int) ps_record.pid;
if (res == SERVER_READY)
ready++;
else if (res != SERVER_DEAD)
@@ -428,6 +430,15 @@
ap_rputs(\BcodeL/code/B\ Logging, \n, r);
ap_rputs(\BcodeG/code/B\ Gracefully finishing, \n, r);
ap_rputs(\Bcode./code/B\ Open slot with no current
processP\n, r);
+ ap_rputs(P\n, r);
+ ap_rputs(PID Key: br\n, r);
+ ap_rputs(UL\n, r);
+ for (i = 0; i HARD_SERVER_LIMIT; ++i) {
+ if (stat_buffer[i] != '.')
+ ap_rprintf(r, LI%d in state: %c BR\n, pid_buffer[i],
+ stat_buffer[i]);
+ }
+ ap_rputs(/UL\n, r);
}
#if defined(STATUS)
cvs commit: apache-1.3/htdocs/manual/misc FAQ.html
jim 98/08/06 13:46:14 Modified:htdocs/manual/misc FAQ.html Log: Some HTML error cleanups (according to DreamWeaver AND Alpha and BBEdit) as well as a start of a how to submit a patch FAQ Revision ChangesPath 1.126 +42 -15apache-1.3/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- FAQ.html 1998/08/05 18:04:50 1.125 +++ FAQ.html 1998/08/06 20:46:12 1.126 @@ -14,7 +14,7 @@ !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P - $Revision: 1.125 $ ($Date: 1998/08/05 18:04:50 $) + $Revision: 1.126 $ ($Date: 1998/08/06 20:46:12 $) /P P The latest version of this FAQ is always available from the main @@ -290,6 +290,9 @@ /LI LIA HREF=#htaccess-workMy CODE.htaccess/CODE files are being ignored./A + /LI + LIA HREF=#submit_patchHow do I submit a patch to the Apache Group?/A + /LI /OL /LI /UL @@ -412,7 +415,7 @@ occasional users. /LI /UL - /P + p/P HR /LI @@ -546,7 +549,7 @@ (dbx) where/CODE /DD /DL -/P +p/P P (Substitute the appropriate locations for your SAMPServerRoot/SAMP and your SAMPhttpd/SAMP and @@ -612,7 +615,7 @@ DDCODEAddHandler cgi-script .cgi/CODE /DD /DL -/P +p/P P The server will then recognize that all files in that location (and its logical descendants) that end in quot;SAMP.cgi/SAMPquot; @@ -624,7 +627,7 @@ declaration that includes the SAMPExecCGI/SAMP option. /LI /OL - /P + p/P P In some situations, you might not want to actually allow all files named quot;SAMP*.cgi/SAMPquot; to be executable. @@ -646,7 +649,7 @@ RewriteRule ^quux\.cgi$ - [T=application/x-httpd-cgi]/CODE /DD /DL -/P +p/P /LI LIMake sure that the directory location is covered by an A HREF=../mod/core.html#optionsSAMPOptions/SAMP/A @@ -654,7 +657,7 @@ SAMPFollowSymLinks/SAMP option. /LI /OL - /P + p/P HR /LI @@ -697,7 +700,7 @@ }/CODE /DD /DL - /P + p/P P This is generally only necessary when you are calling external programs from your script that send output to stdout, or if there will @@ -758,7 +761,7 @@ DDCODEAddHandler server-parsed .shtml/CODE /DD /DL -/P +p/P P This indicates that all files ending in quot;.shtmlquot; in that location (or its descendants) should be parsed. Note that using @@ -1177,7 +1180,7 @@ BrowserMatch JDK/1.0 force-response-1.0/CODE /DD /DL - /P + p/P P More information about this issue can be found in the A HREF=http://www.apache.org/info/jdk-102.html; @@ -1290,7 +1293,7 @@ This hurts performance and should only be used as a last resort. /LI /UL - /P + p/P HR /LI @@ -1363,7 +1366,7 @@ DDCODEEXTRA_CFLAGS=-DMAXIMUM_DNS/CODE /DD /DL -/P +p/P P This will cause Apache to be very paranoid about making sure a particular host address is EMreally/EM assigned to the name it @@ -1441,7 +1444,7 @@ DDCODEAddType audio/x-midi .mid .midi .kar/CODE /DD /DL -/P +p/P P Note that this may break browsers that EMdo/EM recognize the SAMPaudio/midi/SAMP MIME type unless they're prepared to also @@ -1582,7 +1585,7 @@ EXTRA_LIBS=-lbind/CODE /DD /DL - /P + p/P HR /LI @@ -1692,7 +1695,7 @@ satisfy any/CODE /DD /DL - /P + p/P P See the A HREF=#user-authenticationuser authentication/A question and the A HREF=../mod/mod_access.htmlmod_access/A @@ -2295,6 +2298,30 @@ it covers the directory you are trying to use the .htaccess file in. This is normally accomplished by ensuring it is inside the proper A HREF=../mod/core.html#directoryDirectory/A container. + HR + /LI + LIA NAME=submit_patch + STRONGHow do I submit a patch to the Apache Group?/STRONG/A + P + The Apache Group encourages patches from outside developers. There are 2 main types + of patches: small bugfixes and general improvements. Bugfixes should be sent to the + Apache A HREF=http://www.apache.org/bug_report.html;bug report page/A. + Improvements, modifications and additions should follow these instructions. + P + In general, the first course of action is to be a member of the + codenew-httpd@apache.org/code mailing list. This indicates
cvs commit: apache-1.3/src/main http_core.c http_request.c
jim 98/08/08 06:26:07
Modified:src CHANGES
src/main http_core.c http_request.c
Log:
Knowing that a process is in DNS or logging
mode is good information and the performance hit is minimal since
these are expensive operations anyway, so enable these even without
STATUS
Revision ChangesPath
1.1011+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -r1.1010 -r1.1011
--- CHANGES 1998/08/07 15:35:45 1.1010
+++ CHANGES 1998/08/08 13:26:04 1.1011
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Make status module aware of DNS and logging states, even if
+ STATUS not defined. [Jim Jagielski]
+
*) Fix a problem with the new OS/2 mutexes. [Brian Havard]
*) Enhance mod_spelling so that CheckSpelling can be used in
1.218 +0 -6 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.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- http_core.c 1998/08/06 19:23:46 1.217
+++ http_core.c 1998/08/08 13:26:06 1.218
@@ -555,9 +555,7 @@
struct in_addr *iaddr;
struct hostent *hptr;
int hostname_lookups;
-#ifdef STATUS
int old_stat = SERVER_DEAD; /* we shouldn't ever be in this state */
-#endif
/* If we haven't checked the host name, and we want to */
if (dir_config) {
@@ -577,10 +575,8 @@
conn-remote_host == NULL
(type == REMOTE_DOUBLE_REV
|| hostname_lookups != HOSTNAME_LOOKUP_OFF)) {
-#ifdef STATUS
old_stat = ap_update_child_status(conn-child_num, SERVER_BUSY_DNS,
(request_rec*)NULL);
-#endif /* STATUS */
iaddr = (conn-remote_addr.sin_addr);
hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr), AF_INET);
if (hptr != NULL) {
@@ -605,12 +601,10 @@
return NULL;
}
}
-#ifdef STATUS
if (old_stat != SERVER_DEAD) {
(void)ap_update_child_status(conn-child_num, old_stat,
(request_rec*)NULL);
}
-#endif /* STATUS */
/*
* Return the desired information; either the remote DNS name, if found,
1.128 +2 -4 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.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- http_request.c1998/08/06 17:30:31 1.127
+++ http_request.c1998/08/08 13:26:06 1.128
@@ -1180,18 +1180,16 @@
void ap_process_request(request_rec *r)
{
-#ifdef STATUS
int old_stat;
+#ifdef STATUS
ap_time_process_request(r-connection-child_num, START_PREQUEST);
#endif
process_request_internal(r);
-#ifdef STATUS
old_stat = ap_update_child_status(r-connection-child_num,
SERVER_BUSY_LOG, r);
-#endif
/*
* We want to flush the last packet if this isn't a pipelining connection
@@ -1203,8 +1201,8 @@
ap_bhalfduplex(r-connection-client);
ap_log_transaction(r);
-#ifdef STATUS
(void) ap_update_child_status(r-connection-child_num, old_stat, r);
+#ifdef STATUS
ap_time_process_request(r-connection-child_num, STOP_PREQUEST);
#endif
}
cvs commit: apache-1.3/src/main http_core.c
jim 98/08/10 07:37:07
Modified:src/main http_core.c
Log:
Some cleanups for limit_req_body
Revision ChangesPath
1.220 +8 -2 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.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- http_core.c 1998/08/10 04:16:14 1.219
+++ http_core.c 1998/08/10 14:37:06 1.220
@@ -143,6 +143,7 @@
conf-limit_nproc = NULL;
#endif
+conf-limit_req_body = 0;
conf-sec = ap_make_array(a, 2, sizeof(void *));
return (void *)conf;
@@ -253,6 +254,9 @@
}
#endif
+if (new-limit_req_body) {
+conf-limit_req_body = new-limit_req_body;
+}
conf-sec = ap_append_arrays(a, base-sec, new-sec);
if (new-satisfy != SATISFY_NOSPEC) {
@@ -2527,8 +2531,10 @@
#endif
{ ServerTokens, set_serv_tokens, NULL, RSRC_CONF, TAKE1,
Determine tokens displayed in the Server: header - Min(imal), OS or Full
},
-{ LimitRequestBody, set_limit_req_body, NULL, RSRC_CONF|ACCESS_CONF|OR_ALL,
- TAKE1, Limit (in bytes) on maximum size of request message body },
+{ LimitRequestBody, set_limit_req_body,
+ (void*)XtOffsetOf(core_dir_config, limit_req_body),
+ RSRC_CONF|ACCESS_CONF|OR_ALL, TAKE1,
+ Limit (in bytes) on maximum size of request message body },
{ NULL },
};
cvs commit: apache-1.3/htdocs/manual/mod core.html directives.html mod_status.html
jim 98/08/10 17:24:31
Modified:htdocs/manual/misc perf-tuning.html
htdocs/manual/mod core.html directives.html mod_status.html
Log:
And now the docs for ExtendedStatus
Revision ChangesPath
1.13 +8 -8 apache-1.3/htdocs/manual/misc/perf-tuning.html
Index: perf-tuning.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-tuning.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perf-tuning.html 1998/07/01 17:25:55 1.12
+++ perf-tuning.html 1998/08/11 00:24:24 1.13
@@ -227,16 +227,16 @@
H3Compile-Time Configuration Issues/H3
-H4mod_status and Rule STATUS=yes/H4
+H4mod_status and ExtendedStatus On/H4
PIf you include CODEmod_status/CODE
-and you also set CODERule STATUS=yes/CODE when building
+and you also set CODEExtendedStatus On/CODE when building and running
Apache, then on every request Apache will perform two calls to
CODEgettimeofday(2)/CODE (or CODEtimes(2)/CODE depending
on your operating system), and (pre-1.3) several extra calls to
CODEtime(2)/CODE. This is all done so that the status report
-contains timing indications. For highest performance, set CODERule
-STATUS=no/CODE.
+contains timing indications. For highest performance, set
+CODEExtendedStatus off/CODE (which is the default).
H4accept Serialization - multiple sockets/H4
@@ -660,7 +660,7 @@
calls. Or you can use a method which moves the time into shared memory,
see the A HREF=#patchespatches section below/A.
-PAs described earlier, CODERule STATUS=yes/CODE causes two
+PAs described earlier, CODEExtendedStatus On/CODE causes two
CODEgettimeofday/CODE calls and a call to CODEtimes/CODE:
BLOCKQUOTEPRE
@@ -670,8 +670,8 @@
times({tms_utime=5, tms_stime=0, tms_cutime=0, tms_cstime=0}) = 446747
/PRE/BLOCKQUOTE
-These can be removed by either removing CODEmod_status/CODE or
-setting CODERule STATUS=no/CODE.
+These can be removed by setting CODEExtendedStatus Off/CODE (which
+is the default).
PIt might seem odd to call CODEstat/CODE:
@@ -766,7 +766,7 @@
PLet's apply some of these optimizations:
CODE-DSINGLE_LISTEN_UNSERIALIZED_ACCEPT -DBUFFERED_LOGS/CODE and
-CODERule STATUS=no/CODE. Here's the final trace:
+CODEExtendedStatus Off/CODE. Here's the final trace:
BLOCKQUOTEPRE
accept(15, {sin_family=AF_INET, sin_port=htons(22286),
sin_addr=inet_addr(127.0.0.1)}, [16]) = 3
1.129 +35 -0 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.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- core.html 1998/07/28 05:57:13 1.128
+++ core.html 1998/08/11 00:24:27 1.129
@@ -38,6 +38,7 @@
LIA HREF=#documentrootDocumentRoot/A
LIA HREF=#errordocumentErrorDocument/A
LIA HREF=#errorlogErrorLog/A
+LIA HREF=#extendedstatusExtendedStatus/A
LIA HREF=#fileslt;Filesgt;/A
LIA HREF=#filesmatchlt;FilesMatchgt;/A
LIA HREF=#groupGroup/A
@@ -844,6 +845,40 @@
PSTRONGSee also:/STRONG A HREF=#loglevelLogLevel/A
PHR
+
+H2A NAME=extendedstatusExtendedStatus directive/A/H2
+!--%plaintext lt;?INDEX {\tt ExtendedStatus} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A ExtendedStatus EMOn|Off/EMBR
+A
+ HREF=directive-dict.html#Default
+ REL=Help
+STRONGDefault:/STRONG/A CODEExtendedStatus Off/CODEBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server config BR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A coreBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A ExtendedStatus is only available
+ in Apache 1.3 and later
+
+P
+This directive controls whether the server keeps track of extended
+status information for each request. This is only useful if the status module
+is enabled on the server.
+/P
+P
+This setting applies to the entire server, and cannot be enabled or
+disabled on a virtualhost-by-virtualhost basis.
+/PHR
H2A NAME=fileslt;Filesgt; directive/A/H2
A
1.48 +1 -0 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- directives.html 1998/07/09 19:45:40 1.47
+++ directives.html 1998/08/11 00:24:28 1.48
@@ -100,6 +100,7 @@
LIA HREF=mod_expires.html#expiresactiveExpiresActive/A
LIA HREF=mod_expires.html
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/08/11 08:37:54
Modified:htdocs/manual/mod core.html directives.html mod_status.html
src/main http_core.c
src/modules/standard mod_status.c
Log:
Move the ExtendedStatus option to mod_status
Revision ChangesPath
1.130 +0 -35 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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- core.html 1998/08/11 00:24:27 1.129
+++ core.html 1998/08/11 15:37:49 1.130
@@ -38,7 +38,6 @@
LIA HREF=#documentrootDocumentRoot/A
LIA HREF=#errordocumentErrorDocument/A
LIA HREF=#errorlogErrorLog/A
-LIA HREF=#extendedstatusExtendedStatus/A
LIA HREF=#fileslt;Filesgt;/A
LIA HREF=#filesmatchlt;FilesMatchgt;/A
LIA HREF=#groupGroup/A
@@ -845,40 +844,6 @@
PSTRONGSee also:/STRONG A HREF=#loglevelLogLevel/A
PHR
-
-H2A NAME=extendedstatusExtendedStatus directive/A/H2
-!--%plaintext lt;?INDEX {\tt ExtendedStatus} directivegt; --
-A
- HREF=directive-dict.html#Syntax
- REL=Help
-STRONGSyntax:/STRONG/A ExtendedStatus EMOn|Off/EMBR
-A
- HREF=directive-dict.html#Default
- REL=Help
-STRONGDefault:/STRONG/A CODEExtendedStatus Off/CODEBR
-A
- HREF=directive-dict.html#Context
- REL=Help
-STRONGContext:/STRONG/A server config BR
-A
- HREF=directive-dict.html#Status
- REL=Help
-STRONGStatus:/STRONG/A coreBR
-A
- HREF=directive-dict.html#Compatibility
- REL=Help
-STRONGCompatibility:/STRONG/A ExtendedStatus is only available
- in Apache 1.3 and later
-
-P
-This directive controls whether the server keeps track of extended
-status information for each request. This is only useful if the status module
-is enabled on the server.
-/P
-P
-This setting applies to the entire server, and cannot be enabled or
-disabled on a virtualhost-by-virtualhost basis.
-/PHR
H2A NAME=fileslt;Filesgt; directive/A/H2
A
1.49 +1 -1 apache-1.3/htdocs/manual/mod/directives.html
Index: directives.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/directives.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- directives.html 1998/08/11 00:24:28 1.48
+++ directives.html 1998/08/11 15:37:50 1.49
@@ -100,7 +100,7 @@
LIA HREF=mod_expires.html#expiresactiveExpiresActive/A
LIA HREF=mod_expires.html#expiresbytypeExpiresByType/A
LIA HREF=mod_expires.html#expiresdefaultExpiresDefault/A
-LIA HREF=core.html#extendedstatusExtendedStatus/A
+LIA HREF=mod_status.html#extendedstatusExtendedStatus/A
LIA HREF=mod_autoindex.html#fancyindexingFancyIndexing/A
LIA HREF=core.html#fileslt;Filesgt;/A
LIA HREF=core.html#filesmatchlt;FilesMatchgt;/A
1.13 +38 -15apache-1.3/htdocs/manual/mod/mod_status.html
Index: mod_status.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_status.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_status.html 1998/08/11 00:24:28 1.12
+++ mod_status.html 1998/08/11 15:37:50 1.13
@@ -47,6 +47,44 @@
the instrumentation required for obtaining these statistics does not
exist within standard Apache.
+H2A NAME=extendedstatusExtendedStatus directive/A/H2
+!--%plaintext lt;?INDEX {\tt ExtendedStatus} directivegt; --
+A
+ HREF=directive-dict.html#Syntax
+ REL=Help
+STRONGSyntax:/STRONG/A ExtendedStatus EMOn|Off/EMBR
+A
+ HREF=directive-dict.html#Default
+ REL=Help
+STRONGDefault:/STRONG/A CODEExtendedStatus Off/CODEBR
+A
+ HREF=directive-dict.html#Context
+ REL=Help
+STRONGContext:/STRONG/A server config BR
+A
+ HREF=directive-dict.html#Status
+ REL=Help
+STRONGStatus:/STRONG/A BaseBR
+ A
+ HREF=directive-dict.html#Module
+ REL=Help
+ STRONGModule:/STRONG/A mod_statusBR
+A
+ HREF=directive-dict.html#Compatibility
+ REL=Help
+STRONGCompatibility:/STRONG/A ExtendedStatus is only available
+ in Apache 1.3 and later
+
+P
+This directive controls whether the server keeps track of extended
+status information for each request. This is only useful if the status module
+is enabled on the server.
+/P
+P
+This setting applies to the entire server, and cannot be enabled or
+disabled on a virtualhost-by-virtualhost basis.
+/P
+
H2Enabling Status Support/H2
To enable status reports only for browsers from the foo.com
@@ -78,21 +116,6 @@
page CODEhttp://your.server.name/server-status?auto/CODE. This is useful
when automatically run, see the Perl program in the CODE/support/CODE
directory of Apache
cvs commit: apache-1.3/src/main http_config.c
jim 98/08/11 08:48:01 Modified:src/main http_config.c Log: Propagate the limit_req_* values Revision ChangesPath 1.124 +4 -0 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.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- http_config.c 1998/08/11 09:26:23 1.123 +++ http_config.c 1998/08/11 15:47:59 1.124 @@ -1317,6 +1317,10 @@ s-server_uid = ap_user_id; s-server_gid = ap_group_id; +s-limit_req_line = main_server-limit_req_line; +s-limit_req_fieldsize = main_server-limit_req_fieldsize; +s-limit_req_fields = main_server-limit_req_fields; + *ps = s; return ap_parse_vhost_addrs(p, hostname, s);
cvs commit: apache-1.3/htdocs/manual/mod mod_status.html
jim 98/08/11 10:33:49 Modified:htdocs/manual/mod mod_status.html Log: mod_status isn't included by default so ExtendedStatus is Extension not Base directive Revision ChangesPath 1.14 +1 -1 apache-1.3/htdocs/manual/mod/mod_status.html Index: mod_status.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_status.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mod_status.html 1998/08/11 15:37:50 1.13 +++ mod_status.html 1998/08/11 17:33:48 1.14 @@ -64,7 +64,7 @@ A HREF=directive-dict.html#Status REL=Help -STRONGStatus:/STRONG/A BaseBR +STRONGStatus:/STRONG/A ExtensionBR A HREF=directive-dict.html#Module REL=Help
cvs commit: apache-1.3/src/main http_main.c
jim 98/08/11 10:40:48
Modified:src/main http_main.c
Log:
Minor formatting change
Revision ChangesPath
1.382 +1 -1 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.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- http_main.c 1998/08/11 00:09:45 1.381
+++ http_main.c 1998/08/11 17:40:46 1.382
@@ -1981,7 +1981,7 @@
conn_rec *c = r-connection;
ap_cpystrn(ss-client, ap_get_remote_host(c, r-per_dir_config,
REMOTE_NOLOOKUP), sizeof(ss-client));
- if (r-the_request == NULL) {
+ if (r-the_request == NULL) {
ap_cpystrn(ss-request, NULL, sizeof(ss-request));
} else if (r-parsed_uri.password == NULL) {
ap_cpystrn(ss-request, r-the_request,
sizeof(ss-request));
cvs commit: apache-1.3/src/main http_main.c
jim 98/08/11 11:08:29
Modified:src CHANGES
src/main http_main.c
Log:
Per Brian's request, when processes are in
BUSY_READ mode, mod_status no longer shows the old, previous request
info
Revision ChangesPath
1.1019+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1018
retrieving revision 1.1019
diff -u -r1.1018 -r1.1019
--- CHANGES 1998/08/11 09:26:20 1.1018
+++ CHANGES 1998/08/11 18:08:25 1.1019
@@ -1,5 +1,9 @@
Changes with Apache 1.3.2
+ *) When READing a request in ExtendedStatus mode, the old
+ vhost, request and client information is cleared out.
+ [Jim Jagielski]
+
*) STATUS is no longer available. Full status information now
run-time configurable using the ExtendedStatus directive.
[Jim Jagielski]
1.383 +7 -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.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- http_main.c 1998/08/11 17:40:46 1.382
+++ http_main.c 1998/08/11 18:08:27 1.383
@@ -1993,6 +1993,13 @@
sizeof(ss-request));
}
ap_cpystrn(ss-vhost, r-server-server_hostname,
sizeof(ss-vhost));
+ } else if (status == SERVER_BUSY_READ) {
+ /*
+ * When reading a new request, we don't want to show the old
+ * info since that's confusing... so NULL it out quickly since
+ * we want to hurry up and read the request.
+ */
+ *ss-vhost = *ss-request = *ss-client = '\0';
}
}
put_scoreboard_info(child_num, ss);
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/08/11 13:28:27
Modified:src CHANGES
src/main http_main.c
src/modules/standard mod_status.c
Log:
Following rude orders
Revision ChangesPath
1.1020+1 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -r1.1019 -r1.1020
--- CHANGES 1998/08/11 18:08:25 1.1019
+++ CHANGES 1998/08/11 20:28:17 1.1020
@@ -1,7 +1,7 @@
Changes with Apache 1.3.2
*) When READing a request in ExtendedStatus mode, the old
- vhost, request and client information is cleared out.
+ vhost, request and client information is not displayed.
[Jim Jagielski]
*) STATUS is no longer available. Full status information now
1.384 +0 -7 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.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- http_main.c 1998/08/11 18:08:27 1.383
+++ http_main.c 1998/08/11 20:28:22 1.384
@@ -1993,13 +1993,6 @@
sizeof(ss-request));
}
ap_cpystrn(ss-vhost, r-server-server_hostname,
sizeof(ss-vhost));
- } else if (status == SERVER_BUSY_READ) {
- /*
- * When reading a new request, we don't want to show the old
- * info since that's confusing... so NULL it out quickly since
- * we want to hurry up and read the request.
- */
- *ss-vhost = *ss-request = *ss-client = '\0';
}
}
put_scoreboard_info(child_num, ss);
1.95 +8 -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.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- mod_status.c 1998/08/11 15:37:53 1.94
+++ mod_status.c 1998/08/11 20:28:26 1.95
@@ -636,9 +636,14 @@
ap_rprintf(r, td%-1.1ftd%-2.2ftd%-2.2f\n,
(float) conn_bytes / KBYTE, (float) my_bytes / MBYTE,
(float) bytes / MBYTE);
- ap_rprintf(r, td%std nowrap%std
nowrap%s/tr\n\n,
- score_record.client, score_record.vhost,
- ap_escape_html(r-pool, score_record.request));
+ if (score_record.status == SERVER_BUSY_READ)
+ ap_rprintf(r,
+ td?td nowrap?td nowrap..reading..
/tr\n\n);
+ else
+ ap_rprintf(r,
+ td%std nowrap%std nowrap%s/tr\n\n,
+ score_record.client, score_record.vhost,
+ ap_escape_html(r-pool, score_record.request));
} /* no_table_report */
} /* !short_report */
} /* if (active child) */
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/08/11 13:40:29 Modified:src/modules/standard mod_status.c Log: Minor renaming... Client seems clearer than Host when refering to the remote side Revision ChangesPath 1.96 +2 -2 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.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- mod_status.c 1998/08/11 20:28:26 1.95 +++ mod_status.c 1998/08/11 20:40:28 1.96 @@ -468,9 +468,9 @@ else #ifdef NO_TIMES /* Allow for OS/2 not having CPU stats */ - ap_rputs(p\n\ntable border=0trthSrvthPIDthAccthM\nthSSthReqthConnthChildthSlotthHostthVHostthRequest/tr\n\n, r); + ap_rputs(p\n\ntable border=0trthSrvthPIDthAccthM\nthSSthReqthConnthChildthSlotthClientthVHostthRequest/tr\n\n, r); #else - ap_rputs(p\n\ntable border=0trthSrvthPIDthAccthMthCPU\nthSSthReqthConnthChildthSlotthHostthVHostthRequest/tr\n\n, r); + ap_rputs(p\n\ntable border=0trthSrvthPIDthAccthMthCPU\nthSSthReqthConnthChildthSlotthClientthVHostthRequest/tr\n\n, r); #endif }
cvs commit: apache-1.3/src Configuration.tmpl
jim 98/09/12 13:16:52 Modified:conf httpd.conf-dist httpd.conf-dist-win htdocs/manual/mod mod_status.html src Configuration.tmpl Log: mod_status is now a Base module and included by default. Revision ChangesPath 1.30 +6 -0 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- httpd.conf-dist 1998/09/04 17:10:39 1.29 +++ httpd.conf-dist 1998/09/12 20:16:50 1.30 @@ -126,6 +126,12 @@ # #LockFile logs/accept.lock +# ExtendedStatus controls whether Apache will generate full status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the server-status Handler is called. The default is Off. +# +#ExtendedStatus On + # ServerName allows you to set a host name which is sent back to clients for # your server if it's different than the one the program would get (i.e. use # www instead of the host's real name). 1.19 +6 -0 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- httpd.conf-dist-win 1998/09/04 17:10:39 1.18 +++ httpd.conf-dist-win 1998/09/12 20:16:50 1.19 @@ -108,6 +108,12 @@ # no two invocations of Apache share the same scoreboard file. ScoreBoardFile logs/apache_status +# ExtendedStatus controls whether Apache will generate full status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the server-status Handler is called. The default is Off. +# +#ExtendedStatus On + # ServerName allows you to set a host name which is sent back to clients for # your server if it's different than the one the program would get (i.e. use # www instead of the host's real name). 1.16 +2 -2 apache-1.3/htdocs/manual/mod/mod_status.html Index: mod_status.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_status.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mod_status.html 1998/09/06 19:00:41 1.15 +++ mod_status.html 1998/09/12 20:16:51 1.16 @@ -64,7 +64,7 @@ A HREF=directive-dict.html#Status REL=Help -STRONGStatus:/STRONG/A ExtensionBR +STRONGStatus:/STRONG/A BaseBR A HREF=directive-dict.html#Module REL=Help @@ -73,7 +73,7 @@ HREF=directive-dict.html#Compatibility REL=Help STRONGCompatibility:/STRONG/A ExtendedStatus is only available - in Apache 1.3.2 and later + in Apache 1.3.2 and later. P This directive controls whether the server keeps track of extended 1.110 +1 -1 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- Configuration.tmpl1998/08/11 00:09:42 1.109 +++ Configuration.tmpl1998/09/12 20:16:52 1.110 @@ -245,7 +245,7 @@ ## the 'ExtendedStatus On' directive to allow full status information. ## Please note that doing so can result in a palpable performance hit. -# AddModule modules/standard/mod_status.o +AddModule modules/standard/mod_status.o ## The Info module displays configuration information for the server and ## all included modules. It's very useful for debugging.
cvs commit: apache-1.3/src/helpers GuessOS MakeEtags PrintPath PrintPathOS2 TestCompile buildinfo.sh checkheader.sh findcpp.sh fmn.sh install.sh mkdir.sh mkshadow.sh ppl.sh slo.sh
jim 98/09/16 13:49:28 Modified:src/helpers GuessOS MakeEtags PrintPath PrintPathOS2 TestCompile buildinfo.sh checkheader.sh findcpp.sh fmn.sh install.sh mkdir.sh mkshadow.sh ppl.sh slo.sh Log: Add blame and LICENSE info to various helper scripts. Who knows, maybe people can use 'em :) Revision ChangesPath 1.46 +6 -4 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- GuessOS 1998/09/15 19:47:39 1.45 +++ GuessOS 1998/09/16 20:49:23 1.46 @@ -3,10 +3,12 @@ # Simple OS/Platform guesser. Similar to config.guess but # much, much smaller. Since it was developed for use with # Apache, it follows under Apache's regular licensing -# with one specific addition: Any changes or additions -# to this script should be Emailed to the Apache -# group ([EMAIL PROTECTED]) in general and to -# Jim Jagielski ([EMAIL PROTECTED]) in specific. +# (see http://www.apache.org/docs/LICENSE) with one specific +# addition: Any changes or additions to this script should be +# Emailed to the Apache group ([EMAIL PROTECTED]) in general +# and to Jim Jagielski ([EMAIL PROTECTED]) in specific. +# +# Blame Jim; he wrote it (plus a cast of dozens) # # Be as similar to the output of config.guess/config.sub # as possible. 1.2 +3 -0 apache-1.3/src/helpers/MakeEtags Index: MakeEtags === RCS file: /export/home/cvs/apache-1.3/src/helpers/MakeEtags,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MakeEtags 1998/07/14 20:25:15 1.1 +++ MakeEtags 1998/09/16 20:49:23 1.2 @@ -5,6 +5,9 @@ #helpers/MakeEtags # and will create a TAGS file in the src directory. +# This script falls under the Apache License. +# See http://www.apache.org/docs/LICENSE + # Once you have created src/TAGS in emacs you'll need to setup # tag-table-alist with an entry to assure it finds the single src/TAGS # file from the many source directories. Something along these lines: 1.12 +5 -0 apache-1.3/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PrintPath 1998/08/03 21:51:40 1.11 +++ PrintPath 1998/09/16 20:49:23 1.12 @@ -10,6 +10,11 @@ # Usage: # PrintPath [-s] [-pPATHNAME] program [program ...] # +# Blame Jim; he wrote it. +# +# This script falls under the Apache License. +# See http://www.apache.org/docs/LICENSE + ## # Some constants ## 1.5 +5 -0 apache-1.3/src/helpers/PrintPathOS2 Index: PrintPathOS2 === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPathOS2,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PrintPathOS2 1998/08/03 21:51:40 1.4 +++ PrintPathOS2 1998/09/16 20:49:24 1.5 @@ -10,6 +10,11 @@ # Usage: # PrintPath [-s] [-pPATHNAME] program [program ...] # +# Blame Jim; he wrote it (with major OS2 help from Brian H.) +# +# This script falls under the Apache License. +# See http://www.apache.org/docs/LICENSE +# ## # Some constants ## 1.15 +5 -0 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TestCompile 1998/08/03 21:51:40 1.14 +++ TestCompile 1998/09/16 20:49:24 1.15 @@ -32,6 +32,11 @@ # located) if you want to test it out. Configure must # also call it as './helpers/TestCompile' # +# Blame Jim; he wrote it (along with a cast of dozens). +# +# This script falls under the Apache License. +# See http://www.apache.org/docs/LICENSE + cd ./helpers 1.2 +4 -0 apache-1.3/src/helpers/buildinfo.sh Index: buildinfo.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/buildinfo.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- buildinfo.sh 1998/08/25 09:52:40 1.1 +++ buildinfo.sh 1998/09/16 20:49:24 1.2 @@ -4,6 +4,10 @@ ## Written by Ralf S. Engelschall [EMAIL PROTECTED] ## for the Apache's Autoconf-style Interface (APACI
cvs commit: apache-1.3/src/helpers PrintPath TestCompile findcpp.sh PrintPathOS2
jim 98/09/16 21:09:42
Modified:src CHANGES Configure
src/helpers PrintPath TestCompile findcpp.sh
Removed: src/helpers PrintPathOS2
Log:
Remove the hack of having an OS/2 version of PrintPath around.
Reviewed by: Brian Havard
Revision ChangesPath
1.1061+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -r1.1060 -r1.1061
--- CHANGES 1998/09/16 19:38:26 1.1060
+++ CHANGES 1998/09/17 04:09:39 1.1061
@@ -1,4 +1,7 @@
Changes with Apache 1.3.2
+
+ *) Make PrintPath work generically instead of having one version
+ strictly for OS/2. [Jim Jagielski, Brian Havard]
*) Fix the recently introduced C header file checking: We now use the C
pre-processor pass only (and no longer the complete compiler pass) to
1.290 +2 -6 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- Configure 1998/09/16 19:38:26 1.289
+++ Configure 1998/09/17 04:09:39 1.290
@@ -257,8 +257,6 @@
TARGET=httpd
SUBTARGET=target_static
SHLIB_SUFFIX_LIST=
-AP_PRINTPATH=PrintPath
-export AP_PRINTPATH
CAT=cat
@@ -350,8 +348,6 @@
LIBS=$LIBS -lsocket -lufc -lbsd
DBM_LIB=-lgdbm
SHELL=sh
- AP_PRINTPATH=PrintPathOS2
- export AP_PRINTPATH
;;
*-hi-hiux)
OS='HI-UX'
@@ -769,7 +765,7 @@
for compilers in gcc cc acc c89
do
lookedfor=$lookedfor $compilers
- if ./helpers/$AP_PRINTPATH -s $compilers; then
+ if ./helpers/PrintPath -s $compilers; then
COMPILER=$compilers
break
fi
@@ -1225,7 +1221,7 @@
if [ .$TRANLIB != . ]; then
RANLIB=$TRANLIB
else
-if ./helpers/$AP_PRINTPATH -s ranlib; then
+if ./helpers/PrintPath -s ranlib; then
RANLIB=ranlib
else
RANLIB=true
1.13 +46 -16apache-1.3/src/helpers/PrintPath
Index: PrintPath
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PrintPath 1998/09/16 20:49:23 1.12
+++ PrintPath 1998/09/17 04:09:41 1.13
@@ -22,6 +22,11 @@
echo=yes
##
+# Find out what OS we are running for later on
+##
+os=`(uname) 2/dev/null`
+
+##
# Parse command line
##
for args in $*
@@ -34,12 +39,39 @@
done
##
-# We do some funny stuff to check to see
-# if test/[] knows about -x
+# Now we make the adjustments required for OS/2 and everyone
+# else :)
+#
+# First of all, all OS/2 programs have the '.exe' extension.
+# Next, we adjust PATH (or what was given to us as PATH) to
+# be whitespace seperated directories.
+# Finally, we try to determine the best flag to use for
+# test/[] to look for an executable file. OS/2 just has '-r'
+# but with other OSs, we do some funny stuff to check to see
+# if test/[] knows about -x, which is the prefered flag.
##
-testfile=pp.t.$$
+
+if [ x$os = xOS/2 ]
+then
+ext=.exe
+pathname=`echo -E $pathname |
+ sed 's/^;/.;/
+ s/;;/;.;/g
+ s/;$/;./
+ s/;/ /g
+ s//\\//g' `
+test_exec_flag=-r
+else
+ext= # No default extensions
+pathname=`echo $pathname |
+ sed 's/^:/.:/
+ s/::/:.:/g
+ s/:$/:./
+ s/:/ /g' `
+# Here is how we test to see if test/[] can handle -x
+testfile=pp.t.$$
-cat $testfile ENDTEST
+cat $testfile ENDTEST
#!/bin/sh
if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
exit 0
@@ -47,24 +79,22 @@
exit 1
ENDTEST
-if `/bin/sh $testfile 2/dev/null`; then
-test_exec_flag=-x
-else
-test_exec_flag=-r
+if `/bin/sh $testfile 2/dev/null`; then
+ test_exec_flag=-x
+else
+ test_exec_flag=-r
+fi
+rm -f $testfile
fi
-rm -f $testfile
for program in $programs
do
-for path in `echo $pathname |
- sed 's/^:/.:/
- s/::/:.:/g
- s/:$/:./
- s/:/ /g' `
+for path in $pathname
do
- if [ $test_exec_flag $path/$program ] [ ! -d $path/$program ]; then
+ if [ $test_exec_flag $path/${program}${ext} ] \
+[ ! -d $path/${program}${ext} ]; then
if [ $echo = yes ]; then
- echo $path/$program
cvs commit: apache-1.3/src BUILD.NOTES PORTING
jim 98/09/17 14:13:59 Modified:src PORTING Added: src BUILD.NOTES Log: Create an OS-specific notes file Revision ChangesPath 1.33 +0 -11 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- PORTING 1998/07/13 12:35:51 1.32 +++ PORTING 1998/09/17 21:13:58 1.33 @@ -373,14 +373,3 @@ Good luck and happy porting! - - -Appendix: OS-Specific Notes: - -A/UX: - Don't even try with cc. Instead, use gcc-2.7.2 and the libUTIL.a - function library, both of which are available on jagubox.gsfc.nasa.gov. - libUTIL.a includes many basic functions that Apache (and other software) - requires as well as fixed versions of functions in libc.a. Contact - Jim Jagielski ([EMAIL PROTECTED]) if you need a precompiled build for - A/UX 3.1.x. 1.1 apache-1.3/src/BUILD.NOTES Index: BUILD.NOTES === OS Specific notes for building/compiling Apache - Introduction: - Apache has been ported to a wide variety of platforms, from multiple UNIX variants to OS/2 to Windows95/NT. In building and/or compiling Apache on some platforms, there are some hints and notes which may help you if you run into problems. - A/UX: - Don't even try with cc. Instead, use gcc-2.7.2 and the libUTIL.a function library, both of which are available on jagubox.gsfc.nasa.gov. libUTIL.a includes many basic functions that Apache (and other software) requires as well as fixed versions of functions in libc.a. Contact Jim Jagielski ([EMAIL PROTECTED]) if you need a precompiled build for A/UX 3.1.x.
cvs commit: apache-1.3 STATUS
jim 98/09/18 06:00:25 Modified:.STATUS Log: Some STATUS updates Revision ChangesPath 1.472 +5 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.471 retrieving revision 1.472 diff -u -r1.471 -r1.472 --- STATUS1998/09/18 07:26:06 1.471 +++ STATUS1998/09/18 13:00:25 1.472 @@ -9,6 +9,7 @@ Current test status: o FreeBSD 2.2.6 .. Ok (Ralf S. Engelschall) + o FreeBSD 2.2.7 .. Ok (Jim Jagielski) o Debian GNU/Linux 1.3 ... Ok (Ralf S. Engelschall) o HPUX 10.20 . Ok (Ralf S. Engelschall) o AIX 4.1.5 .. Ok (Jens-Uwe Mager) @@ -20,6 +21,7 @@ o OS\2 ... Ok (Brian Havard) o Windows NT (general) Ok (Bill Stoddard) o Netwinder .. Fails (Rasmus Lerdorf) +o A/UX 3.1.1 . Ok (Jim Jagielski) 1.3.1: Tagged and rolled on July 19. Announced and released. @@ -33,6 +35,9 @@ get rid of glibc2 problems (and FreeBSD ports problems in case the DB2.x package is installed) Status: Under construction by Dan Jacobowitz [EMAIL PROTECTED] + Jim: We need to make sure that db2 is backwards compatible with + db1 or else make sure that people know to update their DB +files (or are we calling db2 files different names?) WIN32 1.3.2 RELEASE SHOWSTOPPERS:
cvs commit: apache-1.3 STATUS
jim 98/09/20 19:23:48 Modified:.STATUS Log: Note the DB concern Revision ChangesPath 1.483 +8 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.482 retrieving revision 1.483 diff -u -r1.482 -r1.483 --- STATUS1998/09/21 01:06:51 1.482 +++ STATUS1998/09/21 02:23:47 1.483 @@ -53,6 +53,14 @@ Does the current cvs work with existing db files, or not? If not, let's fix it. If unknown, it isn't a showstopper. + Jim: My concern is that previous versions of Apache were not db2 + aware best as I can determine. Thus, Apache would use db1 +by default with mod_auth_db.c. Now that Apache knows about +db2, it looks like it prefers that over db1, which means that +this will break old db databases unless db2 can read db1 files. +I simply don't know if it will, but if it doesn't then this +looks like a compatibility problem. + * need to ensure it compiles properly on win32 before rolling the tarball, and that no last minute changes break it
cvs commit: apache-1.3/src/helpers TestCompile
jim 98/09/20 19:30:14
Modified:.STATUS
src/helpers TestCompile
Log:
Fix the fact that TestCompile was not
forcing main to return an int which appears to be required
Revision ChangesPath
1.484 +0 -3 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- STATUS1998/09/21 02:23:47 1.483
+++ STATUS1998/09/21 02:30:13 1.484
@@ -117,9 +117,6 @@
Needs patch:
-* TestCompile creates bogus code with void main( main
- always returns an int.
-
* Ralf: mod_so doesn't correctly initialise modules. For instance
the handlers of mod_perl are not initialised.
An ap_init_modules() could be done from mod_so but this is too much.
1.17 +6 -3 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestCompile 1998/09/17 04:09:41 1.16
+++ TestCompile 1998/09/21 02:30:14 1.17
@@ -73,7 +73,7 @@
TARGET='dummy'
else
TARGET='testfunc'
- echo void main(void) { $3(); } testfunc.c
+ echo int main(void) { $3(); return(0); } testfunc.c
fi
;;
sanity)
@@ -97,8 +97,9 @@
fi
TARGET='testfunc'
cat EOF testfunc.c
-void main(void) {
+int main(void) {
$2();
+return(0)
}
EOF
;;
@@ -115,7 +116,9 @@
TARGET='testfunc'
cat EOF testfunc.c
#include $2
-void main(void) { }
+int main(void) {
+return(0);
+}
EOF
;;
*)
cvs commit: apache-1.3 STATUS
jim 98/09/21 05:08:40 Modified:.STATUS Log: Looks like we are safe about db1/db2 compatibility Revision ChangesPath 1.485 +0 -17 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- STATUS1998/09/21 02:30:13 1.484 +++ STATUS1998/09/21 12:08:39 1.485 @@ -44,23 +44,6 @@ RELEASE SHOWSTOPPERS: -* DB1.x vs. DB2.x: - Jim: We need to make sure that db2 is backwards compatible with - db1 or else make sure that people know to update their DB -files (or are we calling db2 files different names?) - - Roy: I don't understand why we should stop everything for this. - Does the current cvs work with existing db files, or not? - If not, let's fix it. If unknown, it isn't a showstopper. - - Jim: My concern is that previous versions of Apache were not db2 - aware best as I can determine. Thus, Apache would use db1 -by default with mod_auth_db.c. Now that Apache knows about -db2, it looks like it prefers that over db1, which means that -this will break old db databases unless db2 can read db1 files. -I simply don't know if it will, but if it doesn't then this -looks like a compatibility problem. - * need to ensure it compiles properly on win32 before rolling the tarball, and that no last minute changes break it
cvs commit: apache-1.3/src CHANGES Configure
jim 98/09/21 13:44:45
Modified:src CHANGES Configure
Log:
Work around old shells with small line buffers
Revision ChangesPath
1.1071+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -u -r1.1070 -r1.1071
--- CHANGES 1998/09/19 21:54:55 1.1070
+++ CHANGES 1998/09/21 20:44:41 1.1071
@@ -1,3 +1,8 @@
+Changes with Apache 1.3.3
+
+ *) Avoid possible line overflow in Configure: Use an awkfile to
+ handle the creation of modules.c [Jim Jagielski]
+
Changes with Apache 1.3.2
*) Fix bug in ap_remove_module(), which caused problems for dso's
1.294 +4 -2 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- Configure 1998/09/20 15:48:57 1.293
+++ Configure 1998/09/21 20:44:42 1.294
@@ -1534,7 +1534,7 @@
## Now create modules.c
##
-cat $tmpfile | sed 's/_module//' | awk modules.c '
+$CAT $awkfile 'EOFM'
BEGIN {
modules[n++] = core
pmodules[pn++] = core
@@ -1582,7 +1582,9 @@
print NULL
print };
print
-}'
+}
+EOFM
+$CAT $tmpfile | sed 's/_module//' | awk -f $awkfile modules.c
## figure out which module dir require use to autocreate a Makefile.
cvs commit: apache-2.0/nsprpub/pr/src/md/unix unix.c
jim 98/09/23 11:50:26
Modified:nsprpub/config nsinstall.c
nsprpub/pr/include/md _aux.h
nsprpub/pr/src/io prfile.c
nsprpub/pr/src/malloc prmalloc.c
nsprpub/pr/src/md prosdep.c
nsprpub/pr/src/md/unix unix.c
Log:
Add some more 'safe' patches and reverse that
strange LINUX-linux rename that somehow got folded in
Revision ChangesPath
1.3 +3 -3 apache-2.0/nsprpub/config/nsinstall.c
Index: nsinstall.c
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/config/nsinstall.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsinstall.c 1998/09/23 01:18:29 1.2
+++ nsinstall.c 1998/09/23 18:50:22 1.3
@@ -38,7 +38,7 @@
#define HAVE_LCHOWN
-#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(linux) ||
defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(RHAPSODY) ||
defined(AUX)
+#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) ||
defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(RHAPSODY) ||
defined(AUX)
#undef HAVE_LCHOWN
#endif
@@ -55,11 +55,11 @@
#define GETCWD_CAN_MALLOC
#endif
-#ifdef linux
+#ifdef LINUX
#include getopt.h
#endif
-#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) ||
defined(NEC)
+#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) ||
defined(NEC) || defined(AUX)
#if !defined(S_ISLNK) defined(S_IFLNK)
#define S_ISLNK(a) (((a) S_IFMT) == S_IFLNK)
#endif
1.2 +1 -0 apache-2.0/nsprpub/pr/include/md/_aux.h
Index: _aux.h
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/include/md/_aux.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _aux.h1998/09/23 01:18:30 1.1
+++ _aux.h1998/09/23 18:50:23 1.2
@@ -33,6 +33,7 @@
#undef HAVE_DLL
#undef USE_DLFCN
+#define PR_DLL_SUFFIX
#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */
#if !defined (HAVE_STRERROR)
1.2 +4 -4 apache-2.0/nsprpub/pr/src/io/prfile.c
Index: prfile.c
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/io/prfile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prfile.c 1998/06/30 08:36:30 1.1
+++ prfile.c 1998/09/23 18:50:23 1.2
@@ -266,7 +266,7 @@
PRInt32 PR_GetSysfdTableMax(void)
{
-#if defined(XP_UNIX) !defined(AIX)
+#if defined(XP_UNIX) !defined(AIX) !defined(AUX)
struct rlimit rlim;
if ( getrlimit(RLIMIT_NOFILE, rlim) 0) {
@@ -275,7 +275,7 @@
}
return rlim.rlim_max;
-#elif defined(AIX)
+#elif defined(AIX) || defined(AUX)
return sysconf(_SC_OPEN_MAX);
#elif defined(WIN32) || defined(OS2)
/*
@@ -295,7 +295,7 @@
PRInt32 PR_SetSysfdTableSize(int table_size)
{
-#if defined(XP_UNIX) !defined(AIX)
+#if defined(XP_UNIX) !defined(AIX) !defined(AUX)
struct rlimit rlim;
PRInt32 tableMax = PR_GetSysfdTableMax();
@@ -319,7 +319,7 @@
}
return rlim.rlim_cur;
-#elif defined(AIX) || defined(WIN32) || defined(WIN16) || defined(OS2)
+#elif defined(AIX) || defined(WIN32) || defined(WIN16) || defined(OS2) ||
defined(AUX)
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
return -1;
#elif defined (XP_MAC)
1.2 +2 -0 apache-2.0/nsprpub/pr/src/malloc/prmalloc.c
Index: prmalloc.c
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/malloc/prmalloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prmalloc.c1998/06/30 08:36:31 1.1
+++ prmalloc.c1998/09/23 18:50:24 1.2
@@ -88,7 +88,9 @@
#include string.h
#include errno.h
#include sys/types.h
+#if !defined(AUX)
#include sys/mman.h
+#endif
#endif
/*
1.2 +1 -1 apache-2.0/nsprpub/pr/src/md/prosdep.c
Index: prosdep.c
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/md/prosdep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prosdep.c 1998/06/30 08:36:31 1.1
+++ prosdep.c 1998/09/23 18:50:25 1.2
@@ -42,7 +42,7 @@
/* Get page size */
#ifdef XP_UNIX
#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
- || defined FREEBSD || defined RHAPSODY
+ || defined FREEBSD || defined NETBSD || defined RHAPSODY || defined AUX
_pr_pageSize = getpagesize
cvs commit: apache-1.3/src/main http_config.c
jim 98/09/25 08:42:13
Modified:src/main http_config.c
Log:
Change the order... Always allow valid 'f'
Revision ChangesPath
1.130 +2 -5 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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- http_config.c 1998/09/25 15:26:05 1.129
+++ http_config.c 1998/09/25 15:42:12 1.130
@@ -1229,10 +1229,7 @@
filename = ap_make_full_path(r-pool, d, w);
f = ap_pcfg_openfile(r-pool, filename);
}
-if (!access_name[0]) {
- dc = NULL;
-}
-else if (f) {
+if (f) {
dc = ap_create_per_dir_config(r-pool);
parms.config_file = f;
@@ -1250,7 +1247,7 @@
*result = dc;
}
else {
- if (errno == ENOENT || errno == ENOTDIR)
+ if (errno == ENOENT || errno == ENOTDIR || (!access_name[0]))
dc = NULL;
else {
ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
cvs commit: apache-1.3/src/main alloc.c util.c
jim 98/09/25 16:01:55
Modified:src/main alloc.c util.c
Log:
Maintain state of errno in ap_pcfg_openfile
and the functions that it calls. Needed when parsing .htaccess
Revision ChangesPath
1.100 +6 -1 apache-1.3/src/main/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- alloc.c 1998/08/14 02:49:47 1.99
+++ alloc.c 1998/09/25 23:01:49 1.100
@@ -1744,6 +1744,7 @@
FILE *fd = NULL;
int baseFlag, desc;
int modeFlags = 0;
+int saved_errno;
#ifdef WIN32
modeFlags = _S_IREAD | _S_IWRITE;
@@ -1766,22 +1767,26 @@
else {
fd = fopen(name, mode);
}
-
+saved_errno = errno;
if (fd != NULL)
ap_note_cleanups_for_file(a, fd);
ap_unblock_alarms();
+errno = saved_errno;
return fd;
}
API_EXPORT(FILE *) ap_pfdopen(pool *a, int fd, const char *mode)
{
FILE *f;
+int saved_errno;
ap_block_alarms();
f = ap_fdopen(fd, mode);
+saved_errno = errno;
if (f != NULL)
ap_note_cleanups_for_file(a, f);
ap_unblock_alarms();
+errno = saved_errno;
return f;
}
1.134 +5 -0 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- util.c1998/09/17 15:56:08 1.133
+++ util.c1998/09/25 23:01:49 1.134
@@ -738,6 +738,7 @@
poolfile_t *new_pfile;
FILE *file;
struct stat stbuf;
+int saved_errno;
if (name == NULL) {
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,
@@ -747,9 +748,11 @@
file = ap_pfopen(p, name, r);
#ifdef DEBUG
+saved_errno = errno;
ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
Opening config file %s (%s),
name, (file == NULL) ? strerror(errno) : successful);
+errno = saved_errno;
#endif
if (file == NULL)
return NULL;
@@ -761,10 +764,12 @@
#else
strcmp(name, /dev/null) != 0) {
#endif
+ saved_errno = errno;
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,
Access to file %s denied by server: not a regular file,
name);
ap_pfclose(p, file);
+ errno = saved_errno;
return NULL;
}
cvs commit: apache-1.3/src/helpers GuessOS
jim 98/09/28 13:04:35
Modified:src CHANGES
src/helpers GuessOS
Log:
Submitted by: Steve Cameron [EMAIL PROTECTED]
Revision ChangesPath
1.1082+5 -2 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1081
retrieving revision 1.1082
diff -u -r1.1081 -r1.1082
--- CHANGES 1998/09/26 00:07:06 1.1081
+++ CHANGES 1998/09/28 20:04:33 1.1082
@@ -1,5 +1,8 @@
Changes with Apache 1.3.3
-
+
+ *) PORT: Allow GuessOS to recognize Unixware 7.0.1 [Steve Cameron
+ [EMAIL PROTECTED]]
+
*) Reconstructed the loop through multiple htaccess file names so
that missing files are not confused with unreadable files.
[Roy Fielding]
@@ -7,7 +10,7 @@
*) The ap_pfopen and ap_pfdopen routines were failing to protect the
errno on an error, which leads to one error being mistaken for
another when reading non-existant .htaccess files.
- [Jim Jagielski, Roy Fielding]
+ [Jim Jagielski]
*) OS/2: The new header tests get things right, need to update
ap_config.h. [Brian Havard]
1.47 +5 -3 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- GuessOS 1998/09/16 20:49:23 1.46
+++ GuessOS 1998/09/28 20:04:35 1.47
@@ -53,9 +53,11 @@
echo whatever-whatever-unixware1; exit 0
;;
5)
- if [ x$VERSION = x7 ]; then
- echo ${MACHINE}-whatever-unixware7; exit 0
- fi
+ case $VERSION in
+ 7*)
+ echo ${MACHINE}-whatever-unixware7; exit 0
+ ;;
+ esac
;;
esac
fi
cvs commit: apache-1.3 STATUS
jim 98/09/30 07:50:58 Modified:.STATUS Log: Some notes and maybe release?? Revision ChangesPath 1.496 +3 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.495 retrieving revision 1.496 diff -u -r1.495 -r1.496 --- STATUS1998/09/28 22:32:09 1.495 +++ STATUS1998/09/30 14:50:57 1.496 @@ -3,6 +3,7 @@ Release: 1.3.3-dev: current + Possible release on Oct 9, 1998?? 1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd. 1.3.1: Tagged and rolled on July 19. Announced and released. @@ -27,6 +28,7 @@ * Earle Ake: Apache 1.3.1 port to Pyramid DC/OSx [EMAIL PROTECTED] +Status: Jim will followup * Patches for the DSO/mod_perl problem (see below for description): @@ -50,7 +52,7 @@ option to send the shutdown or restart signal to the running parent process. Message-ID: [EMAIL PROTECTED] - Status: Ken +1 (on concept), Lars +1 (on concept), + Status: Ken +1 (on concept), Lars +1 (on concept), Jim +1 (concept) Martin +1 (on concept; the restart switches could be added to the unix version, too)
cvs commit: apache-1.3/src/helpers GuessOS
jim 98/09/30 08:48:09 Modified:.STATUS src Configure src/helpers GuessOS Log: Fine-time Earle Ake's port for Pyramid DC/OSx and note it in STATUS Revision ChangesPath 1.497 +0 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.496 retrieving revision 1.497 diff -u -r1.496 -r1.497 --- STATUS1998/09/30 14:50:57 1.496 +++ STATUS1998/09/30 15:48:06 1.497 @@ -26,10 +26,6 @@ Available Patches: -* Earle Ake: Apache 1.3.1 port to Pyramid DC/OSx - [EMAIL PROTECTED] -Status: Jim will followup - * Patches for the DSO/mod_perl problem (see below for description): Ralf's [PATCH] Fix module init 1.296 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- Configure 1998/09/24 10:21:59 1.295 +++ Configure 1998/09/30 15:48:07 1.296 @@ -612,7 +612,7 @@ DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;; -NILE*-*-*DC-OSx*dcosx) +pyramid-pyramid-svr4) OS='SVR4' CFLAGS=$CFLAGS -DSVR4 -DNO_LONG_DOUBLE DEF_WANTHSREGEX=yes 1.48 +3 -1 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- GuessOS 1998/09/28 20:04:35 1.47 +++ GuessOS 1998/09/30 15:48:08 1.48 @@ -247,7 +247,9 @@ *:4.0:2:*) echo whatever-unisys-sysv4; exit 0; ;; - +*:*:dcosx:NILE*) + echo pyramid-pyramid-svr4; exit 0; + ;; esac #
cvs commit: apache-1.3 STATUS
jim 98/10/05 16:04:29 Modified:.STATUS Log: Remove some out-of-date comments Revision ChangesPath 1.502 +1 -13 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.501 retrieving revision 1.502 diff -u -r1.501 -r1.502 --- STATUS1998/10/05 22:34:28 1.501 +++ STATUS1998/10/05 23:04:28 1.502 @@ -97,13 +97,6 @@ documentation... we should handle it in the case the user doesn't ever supply a dot-notation address. -* Amdahl UTS 2.1.2 - Message-Id: [EMAIL PROTECTED] - Message-Id: [EMAIL PROTECTED] - Jim: Sounded like the version of the OS that required - the patches were WAY old and would bugger the newer - versions... Not sure if we want to do that. - * Problems dealing with .-rooted domain names such as twinlark. versus twinlark.arctic.org.. See the thread containing Message-ID: [EMAIL PROTECTED] for more details. @@ -155,7 +148,7 @@ of: alpha bebox macppc newsmips ofppc pica pmax sparc64. * How should an Apache binary release tarball look? - NOTE: This should be resolved before 1.3.1 !! + NOTE: This should be resolved before 1.3.3 !! 1. The old way where it is just a source release tarball plus a pre-compiled src/httpd-gnutriple. It is created @@ -275,11 +268,6 @@ * 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 used for read-only things. - Dean Gaudet - -* ap_pcfg_openfile doesn't use pfopen() to open the file. Consider - .htaccess parsing, if a timeout occurs the file may not be closed. I - can't imagine that a timeout would be set during this stage... but it'd - probably be good to just clean this up. - Dean Gaudet * Okay, so our negotiation strategy needs a bit of refinement. See [EMAIL PROTECTED].
cvs commit: apache-1.3 Announcement
jim 98/10/06 13:12:43 Modified:.Announcement Log: Just some additional notes on 1.3.3 Revision ChangesPath 1.38 +10 -8 apache-1.3/Announcement Index: Announcement === RCS file: /export/home/cvs/apache-1.3/Announcement,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- Announcement 1998/10/06 19:56:50 1.37 +++ Announcement 1998/10/06 20:12:43 1.38 @@ -5,14 +5,16 @@ 1.3.3 of the Apache HTTP server. This new Apache version is mainly a bugfix release. In the previous -1.3.2 release, server error reporting was seriously broken. -This affected the functionality of most custom ErrorDocuments and -of modules such as mod_speling. -Additionally, changes in this release consist of new supported platforms, -Win32 and Unix portability fixes, ErrorDocument environment enhancements, -and assorted other features or fixes. Users should review the CHANGES file -and decide on their upgrade plans; We consider Apache 1.3.3 to be the -most stable version of Apache available. +1.3.2 release, server error reporting was seriously broken. This +affected the functionality of most custom ErrorDocuments and of modules +such as mod_speling. Additionally, changes in this release consist of +new supported platforms, Win32 and Unix portability fixes, ErrorDocument +environment enhancements, incorrect error reporting of non-existant +.htaccess files and assorted other features or fixes. Users should +review the CHANGES file and decide on their upgrade plans; We consider +Apache 1.3.3 to be the most stable version of Apache available and we +strongly recommend that users of older versions, especially of the 1.1.x +and 1.2.x family, upgrade as soon as possible. Apache 1.3.3 is available for download from
cvs commit: apache-1.3 STATUS
jim 98/10/08 06:34:34 Modified:.STATUS Log: The binary release stuff votes Revision ChangesPath 1.508 +3 -2 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.507 retrieving revision 1.508 diff -u -r1.507 -r1.508 --- STATUS1998/10/07 22:15:45 1.507 +++ STATUS1998/10/08 13:34:33 1.508 @@ -80,7 +80,7 @@ - runs make clean - packs the build tree stuff together Already known discussion points: - - should src/httpd be renamed or now because a lot + - should src/httpd be renamed or not because a lot of PRs say they cannot find the httpd :-( Status: Ralf -0, Ken +0 @@ -107,7 +107,8 @@ bin: for the httpd and support executables man: for the man files (if desired) as if the server was installed in those directories. - Status: Roy +1 + Status: Roy +1, Jim +1 (still need to define which modules + are built) Documentation that needs writing:
cvs commit: apache-1.3/src Configure
jim 98/10/19 16:58:28
Modified:src Configure
Log:
Some changes to conserve/maintain some coding consistancy. Always quote
strings and use 'x' as first preference when performing empty string
hack.
Revision ChangesPath
1.300 +29 -29apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- Configure 1998/10/07 10:18:16 1.299
+++ Configure 1998/10/19 23:58:26 1.300
@@ -158,7 +158,7 @@
using_shlib=`grep '^SharedModule' $tmpfile /dev/null echo 1`
# But perhaps later via apxs when just mod_so is compiled in!
-if [ .$using_shlib = . ]; then
+if [ x$using_shlib = x ]; then
using_shlib=`grep '^AddModule modules/standard/mod_so.o' $tmpfile
/dev/null echo 1`
fi
@@ -811,12 +811,12 @@
## Now check how we can _directly_ run the C pre-processor
##
TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
-if [ .$TCPP != . ]; then
+if [ x$TCPP != x ]; then
CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh`
else
CPP=`CC=$CC ./helpers/findcpp.sh`
fi
-if [ .$TCPP = . ]; then
+if [ x$TCPP = x ]; then
echo CPP=$CPP Makefile.config
fi
echo + setting C pre-processor to $CPP
@@ -1110,9 +1110,9 @@
break
fi
done
-if [ .$PERL != . ]; then
+if [ x$PERL != x ]; then
# cool, Perl is installed on this platform...
-if [ .`$PERL -V:dlsrc 2/dev/null | grep dlopen` != . ];
then
+if [ x`$PERL -V:dlsrc 2/dev/null | grep dlopen` != x ];
then
# ...and actually uses the dlopen-style interface,
# so we can guess the flags from its knowledge
CFLAGS_SHLIB=`$PERL -V:cccdlflags | cut -d\' -f2`
@@ -1144,8 +1144,8 @@
## the shared objects if SharedModule was used.
##
if [ x$using_shlib = x1 ] ; then
-if [ x$TCFLAGS_SHLIB = x -a x$CFLAGS_SHLIB = x -a \
- x$TLDFLAGS_SHLIB = x -a x$LDFLAGS_SHLIB = x ]; then
+if [ x$TCFLAGS_SHLIB = x -a x$CFLAGS_SHLIB = x -a \
+ x$TLDFLAGS_SHLIB = x -a x$LDFLAGS_SHLIB = x ]; then
echo
echo ** FAILURE: Sorry, no shared object support available.
echo ** Either compile all modules statically (use AddModule
instead
@@ -1232,8 +1232,8 @@
## OK, now handle RANLIB
##
-if [ .$RANLIB = . ]; then
-if [ .$TRANLIB != . ]; then
+if [ x$RANLIB = x ]; then
+if [ x$TRANLIB != x ]; then
RANLIB=$TRANLIB
else
if ./helpers/PrintPath -s ranlib; then
@@ -1278,7 +1278,7 @@
CFLAGS=$CFLAGS -DSOCKS -DSOCKS4
CFLAGS=$CFLAGS -Dconnect=Rconnect -Dselect=Rselect
CFLAGS=$CFLAGS -Dgethostbyname=Rgethostbyname
-if [ .`grep EXTRA_ Makefile | grep lsocks` = . ]; then
+if [ x`grep EXTRA_ Makefile | grep lsocks` = x ]; then
LIBS=$LIBS -L/usr/local/lib -lsocks
fi
case $PLAT in
@@ -1297,7 +1297,7 @@
CFLAGS=$CFLAGS -DSOCKS -DSOCKS5
CFLAGS=$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect
CFLAGS=$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose
-if [ .`grep EXTRA_ Makefile | grep lsocks5` = . ]; then
+if [ x`grep EXTRA_ Makefile | grep lsocks5` = x ]; then
LIBS=$LIBS -L/usr/local/lib -lsocks5
fi
case $PLAT in
@@ -1404,9 +1404,9 @@
ext=`echo $modfile | sed 's/^.*\.//'`
modbase=`echo $modfile | sed 's/\.[^.]*$//'`
- if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile;
modfile=$modbase.o; fi
- if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi
- if [ x$ext = xc ] ; then ext=o; fi
+ if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile;
modfile=$modbase.o; fi
+ if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi
+ if [ x$ext = xc ] ; then ext=o; fi
# modbase is the path+filename without extension, ext is the
# extension given, or if none, o
@@ -1441,7 +1441,7 @@
. ./$tmpfile3
fi
rm -f $tmpfile2 $tmpfile3
- if [ $ext != so ]; then
+ if [ $ext != so ]; then
ext=o
fi
fi
@@ -1449,11 +1449,11 @@
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
- if [ $ext != so ]; then
+ if [ $ext != so ]; then
echo Module $modname $modbase.$ext $tmpfile
fi
# optionally generate export file for some linkers
- if [ $ext = so
cvs commit: apache-1.3 STATUS
jim 98/10/27 17:06:12 Modified:.STATUS Log: Looks like enough votes... who wants to commit? Revision ChangesPath 1.523 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.522 retrieving revision 1.523 diff -u -r1.522 -r1.523 --- STATUS1998/10/28 00:13:30 1.522 +++ STATUS1998/10/28 01:06:08 1.523 @@ -76,7 +76,7 @@ * Harrie Hazewinkle's PATCH scoreboard to include server_rec * Message-ID: [EMAIL PROTECTED] - Status: Ralf +1 + Status: Ralf +1, Dean +1, Jim +1 (with variable name change) * Ron Record's patch to port Apache to UnixWare 7 (forwarded by Randy).
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/10/28 05:02:40
Modified:.STATUS
src CHANGES
src/include scoreboard.h
src/main http_main.c
src/modules/standard mod_status.c
Log:
Submitted by: Harrie Hazewinkel [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall, Dean Gaudet, Jim Jagielski
Remove the vhost name string copy in the scoreboard information. Instead
of copying the string, copy a pointer to the server_rec for this vhost
and request.
Revision ChangesPath
1.524 +0 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- STATUS1998/10/28 01:06:08 1.523
+++ STATUS1998/10/28 13:02:35 1.524
@@ -74,10 +74,6 @@
Message-ID: [EMAIL PROTECTED]
Status:
-* Harrie Hazewinkle's PATCH scoreboard to include server_rec *
- Message-ID: [EMAIL PROTECTED]
- Status: Ralf +1, Dean +1, Jim +1 (with variable name change)
-
* Ron Record's patch to port Apache to UnixWare 7 (forwarded by
Randy).
Message-ID: [EMAIL PROTECTED]
1.1126+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1125
retrieving revision 1.1126
diff -u -r1.1125 -r1.1126
--- CHANGES 1998/10/27 10:20:00 1.1125
+++ CHANGES 1998/10/28 13:02:35 1.1126
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) Add the actual server_rec structure of the specific Vhost to the
+ scoreboard file and avoid a string copy (as well as allow some
+ further future enhancements). [Harrie Hazewinkel
+ [EMAIL PROTECTED]]
+
*) Add APACI --permute-module=foo:bar option which can be used to
on-the-fly/batch permute the order of two modules (mod_foo and mod_bar)
in the Configuration[.apaci] file. Two special and important variants
are
1.42 +1 -1 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- scoreboard.h 1998/08/11 00:09:43 1.41
+++ scoreboard.h 1998/10/28 13:02:37 1.42
@@ -130,7 +130,7 @@
#endif
char client[32]; /* Keep 'em small... */
char request[64];/* We just want an idea... */
-char vhost[32]; /* What virtual host is being accessed? */
+server_rec *vhostrec;/* What virtual host is being accessed? */
} short_score;
typedef struct {
1.403 +1 -1 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.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- http_main.c 1998/10/26 21:27:40 1.402
+++ http_main.c 1998/10/28 13:02:38 1.403
@@ -2055,7 +2055,7 @@
r-assbackwards ? NULL : ,
r-protocol, NULL),
sizeof(ss-request));
}
- ap_cpystrn(ss-vhost, r-server-server_hostname,
sizeof(ss-vhost));
+ ss-vhostrec = r-server;
}
}
put_scoreboard_info(child_num, ss);
1.100 +2 -1 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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_status.c 1998/10/03 15:24:51 1.99
+++ mod_status.c 1998/10/28 13:02:39 1.100
@@ -652,7 +652,8 @@
else
ap_rprintf(r,
td%std nowrap%std nowrap%s/tr\n\n,
- score_record.client, score_record.vhost,
+ score_record.client,
+ score_record.vhostrec-server_hostname,
ap_escape_html(r-pool, score_record.request));
} /* no_table_report */
} /* !short_report */
cvs commit: apache-1.3 STATUS
jim 98/11/02 17:26:54 Modified:.STATUS Log: Add some info to STATUS. We really need to clean up some of the deadwood in there as well. Revision ChangesPath 1.526 +19 -6 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.525 retrieving revision 1.526 diff -u -r1.525 -r1.526 --- STATUS1998/11/02 16:13:38 1.525 +++ STATUS1998/11/03 01:26:53 1.526 @@ -2,7 +2,7 @@ Release: -1.3.4-dev: current +1.3.4-dev: current. There is discussion on releasing it soon 1.3.3: Tagged and rolled on Oct. 7. Released on 9th, announced on 10th. 1.3.2: Tagged and rolled on Sep. 21. Announced and released on 23rd. @@ -55,7 +55,11 @@ Status: Roy +1, Jim +1 (still need to define which modules are built) +* Win32 device file issues (nul/aux/...) +* Addition of cute little icons to Apache's main icon groups. + See [EMAIL PROTECTED] + Documentation that needs writing: * Need a document explaining mod_rewrite/UseCanonicalName off based @@ -66,6 +70,20 @@ Available Patches: +* Ralf's Build outside of source tree (take 2: alternative solution) + (overrules Wilfredo Sanchez's [PATCH] Build outside of source tree) +Message-ID: [EMAIL PROTECTED] + Status: Ralf +1, Jim +1 + +* Marc's [PATCH] PR#3323: recursive includes +Message-ID: [EMAIL PROTECTED] + Status: Marc +1, Jim +1 (concept) + * Needs more in-depth review * + +* Roy's [PATCH] Enable all WebDAV methods +Message-ID: [EMAIL PROTECTED] + Status: Roy +1 + * Manoj and Ken Parzygnat's PATCH to support %-expandos from Unix on Win32 Message-ID: [EMAIL PROTECTED] @@ -99,11 +117,6 @@ Ralf +1 for both Manoj's patch and Roys suggestion with a slight preference for Manoj's patch because the overhead of more entries is not noticeable to me. - -* Wilfredo Sanchez's [PATCH] Build outside of source tree -Message-ID: [EMAIL PROTECTED] -Status: Ralf +1 (conceptual, with question) - Martin +1 (for concept) * Patches for the DSO/mod_perl problem (see below for description):
cvs commit: apache-1.3/src/helpers GuessOS
jim 98/11/04 04:38:35
Modified:src CHANGES Configure
src/helpers GuessOS
Log:
Submitted by: Tom Horsley [EMAIL PROTECTED]
Add the PowerMAX OS port.
Revision ChangesPath
1.1132+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1131
retrieving revision 1.1132
diff -u -r1.1131 -r1.1132
--- CHANGES 1998/11/01 08:45:27 1.1131
+++ CHANGES 1998/11/04 12:38:32 1.1132
@@ -1,5 +1,8 @@
Changes with Apache 1.3.4
+ *) PORT: Add a port to the Concurrent PowerMAX OS. [Tom Horsley
+ [EMAIL PROTECTED]]
+
*) WIN32: Log more explicit error messages if spawning an interpreted
script failed, including the command line used to attempt to execute
the interpreter and the Win32 error code returned. [Marc Slemko]
1.304 +16 -0 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- Configure 1998/10/27 10:37:46 1.303
+++ Configure 1998/11/04 12:38:32 1.304
@@ -598,6 +598,16 @@
DEF_WANTHSREGEX=yes
LIBS=$LIBS -lsocket -lnsl -lc -lgen
;;
+*-*-powermax*)
+OS='SVR4'
+CFLAGS=$CFLAGS -DSVR4
+DEF_WANTHSREGEX=yes
+LIBS=$LIBS -lsocket -lnsl -lgen
+LD_SHLIB='cc'
+LDFLAGS_SHLIB=-Zlink=so
+LDFLAGS_SHLIB_EXPORT=-Zlink=dynamic -Wl,-Bexport
+CFLAGS_SHLIB='-Zpic'
+;;
BS2000*-sni-sysv4*)
OS='BS2000'
OSDIR='os/bs2000'
@@ -1095,6 +1105,12 @@
LDFLAGS_SHLIB=$LDFLAGS_SHLIB -lc
LDFLAGS_SHLIB_EXPORT=-Wl,-bE:\$(SRCDIR)/support/httpd.exp
SHLIB_EXPORT_FILES=yes
+;;
+*-*-powermax*)
+LD_SHLIB='cc'
+LDFLAGS_SHLIB=-Zlink=so
+LDFLAGS_SHLIB_EXPORT=-Zlink=dynamic -Wl,-Bexport
+CFLAGS_SHLIB='-Zpic'
;;
*)
## ok, no known explict support for shared objects
1.51 +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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- GuessOS 1998/10/04 05:45:55 1.50
+++ GuessOS 1998/11/04 12:38:34 1.51
@@ -222,6 +222,11 @@
UNIX_SV:*:*:maxion)
echo ${MACHINE}-ccur-sysv4; exit 0;
;;
+
+PowerMAX_OS:*:*:Night_Hawk)
+MACHINE=`uname -p`
+echo ${MACHINE}-concurrent-powermax; exit 0;
+;;
UNIX_SV:*)
if [ -d /usr/nec ];then
cvs commit: apache-2.0/nsprpub/pr/src/md/unix aux3.c aux.c
jim 98/11/25 05:45:21 Added: nsprpub/pr/include/md _aux3.cfg _aux3.h nsprpub/pr/src/md/unix aux3.c Removed: nsprpub/pr/include/md _aux.cfg _aux.h nsprpub/pr/src/md/unix aux.c Log: Rename of files. aux - aux3 to avoid conflicts Revision ChangesPath 1.1 apache-2.0/nsprpub/pr/include/md/_aux3.cfg Index: _aux3.cfg === /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* * The contents of this file are subject to the Netscape Public License * Version 1.0 (the NPL); you may not use this file except in * compliance with the NPL. You may obtain a copy of the NPL at * http://www.mozilla.org/NPL/ * * Software distributed under the NPL is distributed on an AS IS basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL * for the specific language governing rights and limitations under the * NPL. * * The Initial Developer of this code under the NPL is Netscape * Communications Corporation. Portions created by Netscape are * Copyright (C) 1998 Netscape Communications Corporation. All Rights * Reserved. */ #ifndef nspr_cpucfg___ #define nspr_cpucfg___ #ifndef XP_UNIX #define XP_UNIX #endif #ifndef AUX #define AUX #endif #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 #define PR_BYTES_PER_INT4 #define PR_BYTES_PER_INT64 8 #define PR_BYTES_PER_LONG 4 #define PR_BYTES_PER_FLOAT 4 #define PR_BYTES_PER_DOUBLE 8 #define PR_BYTES_PER_WORD 4 #define PR_BYTES_PER_DWORD 8 #define PR_BITS_PER_BYTE8 #define PR_BITS_PER_SHORT 16 #define PR_BITS_PER_INT 32 #define PR_BITS_PER_INT64 64 #define PR_BITS_PER_LONG32 #define PR_BITS_PER_FLOAT 32 #define PR_BITS_PER_DOUBLE 64 #define PR_BITS_PER_WORD32 #define PR_BITS_PER_BYTE_LOG2 3 #define PR_BITS_PER_SHORT_LOG2 4 #define PR_BITS_PER_INT_LOG25 #define PR_BITS_PER_INT64_LOG2 6 #define PR_BITS_PER_LONG_LOG2 5 #define PR_BITS_PER_FLOAT_LOG2 5 #define PR_BITS_PER_DOUBLE_LOG2 6 #define PR_BITS_PER_WORD_LOG2 5 #define PR_ALIGN_OF_SHORT 2 #define PR_ALIGN_OF_INT 2 #define PR_ALIGN_OF_LONG2 #define PR_ALIGN_OF_INT64 2 #define PR_ALIGN_OF_FLOAT 2 #define PR_ALIGN_OF_DOUBLE 2 #define PR_ALIGN_OF_POINTER 2 #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 #undefHAVE_LONG_LONG /* * XXX These two macros need to be investigated for different architectures. */ #undefHAVE_ALIGNED_DOUBLES #undefHAVE_ALIGNED_LONGLONGS #ifndef NO_NSPR_10_SUPPORT #define BYTES_PER_BYTEPR_BYTES_PER_BYTE #define BYTES_PER_SHORT PR_BYTES_PER_SHORT #define BYTES_PER_INT PR_BYTES_PER_INT #define BYTES_PER_INT64 PR_BYTES_PER_INT64 #define BYTES_PER_LONGPR_BYTES_PER_LONG #define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT #define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE #define BYTES_PER_WORDPR_BYTES_PER_WORD #define BYTES_PER_DWORD PR_BYTES_PER_DWORD #define BITS_PER_BYTE PR_BITS_PER_BYTE #define BITS_PER_SHORTPR_BITS_PER_SHORT #define BITS_PER_INT PR_BITS_PER_INT #define BITS_PER_INT64PR_BITS_PER_INT64 #define BITS_PER_LONG PR_BITS_PER_LONG #define BITS_PER_FLOATPR_BITS_PER_FLOAT #define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE #define BITS_PER_WORD PR_BITS_PER_WORD #define BITS_PER_BYTE_LOG2PR_BITS_PER_BYTE_LOG2 #define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 #define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 #define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 #define BITS_PER_LONG_LOG2PR_BITS_PER_LONG_LOG2 #define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 #define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 #define BITS_PER_WORD_LOG2PR_BITS_PER_WORD_LOG2 #define ALIGN_OF_SHORTPR_ALIGN_OF_SHORT #define ALIGN_OF_INT PR_ALIGN_OF_INT #define ALIGN_OF_LONG PR_ALIGN_OF_LONG #define ALIGN_OF_INT64PR_ALIGN_OF_INT64 #define ALIGN_OF_FLOATPR_ALIGN_OF_FLOAT #define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE #define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER #define ALIGN_OF_WORD PR_ALIGN_OF_WORD #define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 #define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 #define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 #endif /* NO_NSPR_10_SUPPORT */ #endif /* nspr_cpucfg___ */ 1.1 apache-2.0/nsprpub/pr/include/md/_aux3.h Index
cvs commit: apache-2.0/nsprpub/config A_UX.mk
jim 98/11/25 05:55:55 Modified:nsprpub/config A_UX.mk Log: Continue aux-aux3 namechange Revision ChangesPath 1.2 +1 -1 apache-2.0/nsprpub/config/A_UX.mk Index: A_UX.mk === RCS file: /export/home/cvs/apache-2.0/nsprpub/config/A_UX.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- A_UX.mk 1998/09/23 01:18:28 1.1 +++ A_UX.mk 1998/11/25 13:55:55 1.2 @@ -43,7 +43,7 @@ #OS_LIBS = -lpmapi -lsocket -lc CPU_ARCH = m68k -ARCH= aux +ARCH= aux3 NOSUCHFILE = /no-such-file
cvs commit: apache-1.3/src/helpers GuessOS PrintPath TestCompile
jim 98/12/02 06:03:32 Modified:src Configure src/helpers GuessOS PrintPath TestCompile Log: Reverse some acknowledgements that really aren't needed Revision ChangesPath 1.308 +0 -15 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- Configure 1998/12/01 23:59:54 1.307 +++ Configure 1998/12/02 14:03:30 1.308 @@ -54,21 +54,6 @@ ## For more information on the Apache Group and the Apache HTTP server ## project, please see http://www.apache.org/. -# HISTORY: -# -# Apache configuration script, first cut --- rst. -# Don't like it? Inspired to do something better? Go for it. -# -# second cut --- jmj -# At this point we change what Configuration contains. It maintain -# contains comments, specific compiler flags, a list of included -# modules and rules. These rules are used to allow Configure to -# be totally configured from Configuration. -# -# third cut --- rse -# Big cleanup of the generated Makefiles and remove of -# some old kludges - # Uses 6 supplemental scripts located in ./helpers: #CutRule: Determines the value for a specified Rule #GuessOS: Uses uname to determine OS/platform 1.53 +1 -4 apache-1.3/src/helpers/GuessOS Index: GuessOS === RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- GuessOS 1998/11/06 22:42:40 1.52 +++ GuessOS 1998/12/02 14:03:31 1.53 @@ -5,10 +5,7 @@ # Apache, it follows under Apache's regular licensing # (see http://www.apache.org/docs/LICENSE) with one specific # addition: Any changes or additions to this script should be -# Emailed to the Apache group ([EMAIL PROTECTED]) in general -# and to Jim Jagielski ([EMAIL PROTECTED]) in specific. -# -# Blame Jim; he wrote it (plus a cast of dozens) +# Emailed to the Apache group ([EMAIL PROTECTED]). # # Be as similar to the output of config.guess/config.sub # as possible. 1.14 +0 -2 apache-1.3/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- PrintPath 1998/09/17 04:09:41 1.13 +++ PrintPath 1998/12/02 14:03:31 1.14 @@ -10,8 +10,6 @@ # Usage: # PrintPath [-s] [-pPATHNAME] program [program ...] # -# Blame Jim; he wrote it. -# # This script falls under the Apache License. # See http://www.apache.org/docs/LICENSE 1.19 +0 -2 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- TestCompile 1998/09/21 17:12:04 1.18 +++ TestCompile 1998/12/02 14:03:31 1.19 @@ -32,8 +32,6 @@ # located) if you want to test it out. Configure must # also call it as './helpers/TestCompile' # -# Blame Jim; he wrote it (along with a cast of dozens). -# # This script falls under the Apache License. # See http://www.apache.org/docs/LICENSE
cvs commit: apache-1.3/src/helpers TestCompile
jim 98/12/02 17:03:48 Modified:src/helpers TestCompile Log: MAKE isn't inherited in the mini-makefile Revision ChangesPath 1.21 +1 -1 apache-1.3/src/helpers/TestCompile Index: TestCompile === RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- TestCompile 1998/12/02 23:52:47 1.20 +++ TestCompile 1998/12/03 01:03:46 1.21 @@ -143,7 +143,7 @@ EOF # Now run that Makefile -eval $MAKE $TARGET /dev/null $ERRDIR +eval make $TARGET /dev/null $ERRDIR # And see if dummy exists and is executable, if so, then we # assume the condition we are testing for is good
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/12/02 17:08:02
Modified:src/main http_main.c
src/modules/standard mod_status.c
Log:
During Graceful restarts, the value of vhostrec is bogus. To get around
this, we reset this pointer to NULL during these.
Revision ChangesPath
1.407 +44 -31apache-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.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- http_main.c 1998/12/02 00:00:06 1.406
+++ http_main.c 1998/12/03 01:07:54 1.407
@@ -1531,6 +1531,12 @@
* We begin with routines which deal with the file itself...
*/
+/* volatile just in case */
+static int volatile shutdown_pending;
+static int volatile restart_pending;
+static int volatile is_graceful;
+static int volatile generation;
+
#ifdef MULTITHREAD
/*
* In the multithreaded mode, have multiple threads - not multiple
@@ -1542,8 +1548,14 @@
static void reinit_scoreboard(pool *p)
{
ap_assert(!ap_scoreboard_image);
-ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
-memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);
+if (is_graceful) {
+int i;
+for (i = 0; i HARD_SERVER_LIMIT; i++)
+ap_scoreboard_image-servers[i].vhostrec = NULL;
+} else {
+ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
+memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);
+}
}
void cleanup_scoreboard(void)
@@ -1950,32 +1962,41 @@
/* Called by parent process */
static void reinit_scoreboard(pool *p)
{
-int exit_gen = 0;
-if (ap_scoreboard_image)
- exit_gen = ap_scoreboard_image-global.exit_generation;
+if (is_graceful ap_scoreboard_image) {
+int i;
+for (i = 0; i HARD_SERVER_LIMIT; i++)
+ap_scoreboard_image-servers[i].vhostrec = NULL;
+#ifdef SCOREBOARD_FILE
+force_write(scoreboard_fd, ap_scoreboard_image,
sizeof(*ap_scoreboard_image));
+#endif
+} else {
+int exit_gen = 0;
+if (ap_scoreboard_image)
+exit_gen = ap_scoreboard_image-global.exit_generation;
#ifndef SCOREBOARD_FILE
-if (ap_scoreboard_image == NULL) {
- setup_shared_mem(p);
-}
-memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);
-ap_scoreboard_image-global.exit_generation = exit_gen;
+if (ap_scoreboard_image == NULL) {
+setup_shared_mem(p);
+}
+memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);
+ap_scoreboard_image-global.exit_generation = exit_gen;
#else
-ap_scoreboard_image = _scoreboard_image;
-ap_scoreboard_fname = ap_server_root_relative(p, ap_scoreboard_fname);
+ap_scoreboard_image = _scoreboard_image;
+ap_scoreboard_fname = ap_server_root_relative(p,
ap_scoreboard_fname);
-scoreboard_fd = ap_popenf(p, ap_scoreboard_fname, O_CREAT | O_BINARY |
O_RDWR, 0644);
-if (scoreboard_fd == -1) {
- perror(ap_scoreboard_fname);
- fprintf(stderr, Cannot open scoreboard file:\n);
- exit(APEXIT_INIT);
-}
-ap_register_cleanup(p, NULL, cleanup_scoreboard_file, ap_null_cleanup);
+scoreboard_fd = ap_popenf(p, ap_scoreboard_fname, O_CREAT | O_BINARY
| O_RDWR, 0644);
+if (scoreboard_fd == -1) {
+perror(ap_scoreboard_fname);
+fprintf(stderr, Cannot open scoreboard file:\n);
+exit(APEXIT_INIT);
+}
+ap_register_cleanup(p, NULL, cleanup_scoreboard_file,
ap_null_cleanup);
-memset((char *) ap_scoreboard_image, 0, sizeof(*ap_scoreboard_image));
-ap_scoreboard_image-global.exit_generation = exit_gen;
-force_write(scoreboard_fd, ap_scoreboard_image,
sizeof(*ap_scoreboard_image));
+memset((char *) ap_scoreboard_image, 0,
sizeof(*ap_scoreboard_image));
+ap_scoreboard_image-global.exit_generation = exit_gen;
+force_write(scoreboard_fd, ap_scoreboard_image,
sizeof(*ap_scoreboard_image));
#endif
+}
}
/* Routines called to deal with the scoreboard image
@@ -2551,12 +2572,6 @@
deferred_die = 1;
}
-/* volatile just in case */
-static int volatile shutdown_pending;
-static int volatile restart_pending;
-static int volatile is_graceful;
-static int volatile generation;
-
#ifdef WIN32
/*
* Signalling Apache on NT.
@@ -4247,9 +4262,7 @@
ap_init_modules(pconf, server_conf);
version_locked++; /* no more changes to server_version */
SAFE_ACCEPT(accept_mutex_init(pconf));
- if (!is_graceful) {
- reinit_scoreboard(pconf);
- }
+ reinit_scoreboard(pconf);
#ifdef SCOREBOARD_FILE
else
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 98/12/03 06:38:06
Modified:src/modules/standard mod_status.c
Log:
Reduce a race condition... We doubly protect against a bogus vhostrec
pointer. The first test sets the pointer correctly no matter what
the value of vhostrec. When it's time to print out, we check again.
If the previous value was NULL, then no matter what, NULL will be
used for the hostname, even if the new vhostrec was changed between
the 2 tests to be valid. If the previous was OK, then the vhost value
will only be printed if it's still OK. There's still a window between
this final test and when the actual string is printed, since it's possible
(maybe) that right after the test, the vhostrec is no longer valid, but
assuming that the memory hasn't been released or overwritten, we still
point to a good string.
Revision ChangesPath
1.102 +6 -2 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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- mod_status.c 1998/12/03 01:08:00 1.101
+++ mod_status.c 1998/12/03 14:38:05 1.102
@@ -254,6 +254,7 @@
char stat_buffer[HARD_SERVER_LIMIT];
int pid_buffer[HARD_SERVER_LIMIT];
clock_t tu, ts, tcu, tcs;
+char *vhost;
tu = ts = tcu = tcs = 0;
@@ -308,6 +309,10 @@
for (i = 0; i HARD_SERVER_LIMIT; ++i) {
score_record = ap_scoreboard_image-servers[i];
ps_record = ap_scoreboard_image-parent[i];
+ if (score_record.vhostrec)
+ vhost = score_record.vhostrec-server_hostname;
+ else
+ vhost = NULL;
res = score_record.status;
stat_buffer[i] = status_flags[res];
pid_buffer[i] = (int) ps_record.pid;
@@ -653,8 +658,7 @@
ap_rprintf(r,
td%std nowrap%std nowrap%s/tr\n\n,
score_record.client,
- (score_record.vhostrec ?
- score_record.vhostrec-server_hostname : NULL),
+ (score_record.vhostrec ? vhost : NULL),
ap_escape_html(r-pool, score_record.request));
} /* no_table_report */
} /* !short_report */
cvs commit: apache-1.3/src Configure
jim 98/12/09 14:07:52 Modified:src Configure Log: Typo: lack of newline Revision ChangesPath 1.312 +2 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- Configure 1998/12/09 21:26:14 1.311 +++ Configure 1998/12/09 22:07:51 1.312 @@ -1801,7 +1801,8 @@ sed -e 's;^EXTRA_CFLAGS=;;' -e 's;\`.*\`;;'` tmpstr=`echo $CFLAGS $TEXTRA_CFLAGS |\ sed -e 's;[ ]-;!-;g' -e 's/\\\/\/g' -e 's/\([^\\]\)/\1/g'` -OIFS=$IFS IFS='!' +OIFS=$IFS +IFS='!' for cflag in $tmpstr; do echo $cflag $tmpconfig done
cvs commit: apache-1.3/src/main http_main.c
jim 98/12/10 12:51:57
Modified:src/main http_main.c
Log:
Thanks to Dean for making me take a 2nd look
Revision ChangesPath
1.410 +11 -10apache-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.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- http_main.c 1998/12/10 15:14:08 1.409
+++ http_main.c 1998/12/10 20:51:56 1.410
@@ -2069,18 +2069,19 @@
sizeof(ss-request));
}
ss-vhostrec = r-server;
- } else if (status == SERVER_STARTING) {
- /* clean up the slot's vhostrec pointer (maybe re-used)
- * and mark the slot as belonging to a new generation.
- */
- ss-vhostrec = NULL;
- ap_scoreboard_image-parent[child_num].generation =
ap_my_generation;
+ }
+}
+if (status == SERVER_STARTING r == NULL) {
+ /* clean up the slot's vhostrec pointer (maybe re-used)
+ * and mark the slot as belonging to a new generation.
+ */
+ ss-vhostrec = NULL;
+ ap_scoreboard_image-parent[child_num].generation = ap_my_generation;
#ifdef SCOREBOARD_FILE
- lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[child_num]), 0);
- force_write(scoreboard_fd, ap_scoreboard_image-parent[child_num],
- sizeof(parent_score));
+ lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[child_num]), 0);
+ force_write(scoreboard_fd, ap_scoreboard_image-parent[child_num],
+ sizeof(parent_score));
#endif
- }
}
put_scoreboard_info(child_num, ss);
cvs commit: apache-1.3/src/main http_main.c
jim 98/12/11 07:33:41
Modified:src/main http_main.c
Log:
This fixes the problem I was seeing on various platforms with non-Graceful
restarts. It also explains why Graceful restarts worked OK. It looks like
something similar might be needed for the Win32 sections of the code where
ap_my_generation is adjusted in it's similar loop, but I ain't touching
that! :)
Revision ChangesPath
1.411 +3 -3 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.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- http_main.c 1998/12/10 20:51:56 1.410
+++ http_main.c 1998/12/11 15:33:40 1.411
@@ -4410,13 +4410,13 @@
* use by any of the children.
*/
++ap_my_generation;
+ ap_scoreboard_image-global.running_generation = ap_my_generation;
+ update_scoreboard_global();
+
if (is_graceful) {
#ifndef SCOREBOARD_FILE
int i;
#endif
- ap_scoreboard_image-global.running_generation = ap_my_generation;
- update_scoreboard_global();
-
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
SIGUSR1 received. Doing graceful restart);
cvs commit: apache-1.3 STATUS
jim 98/12/12 05:37:10 Modified:.STATUS Log: Some comments Revision ChangesPath 1.556 +6 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.555 retrieving revision 1.556 diff -u -r1.555 -r1.556 --- STATUS1998/12/12 07:28:14 1.555 +++ STATUS1998/12/12 13:37:09 1.556 @@ -94,12 +94,12 @@ * Ralf's [PATCH] Cleanup command line options Message-ID: [EMAIL PROTECTED] -Status: Ralf +1, Roy +1 +Status: Ralf +1, Roy +1, Jim 0 (is a 1.3.3-1.3.4 bump the place?) * Michael van Elst's patch [PR#3160] to improve mod_rewrite's in-core cache handling by using a hash table. Message-ID: [EMAIL PROTECTED] -Status: Lars +1 +Status: Lars +1, Jim +1 * Marc's [PATCH] PR#3323: recursive includes Message-ID: [EMAIL PROTECTED] @@ -114,7 +114,9 @@ * Eric Prud'hommeaux's mod_dir mods for file-level access control. Message-ID: [EMAIL PROTECTED] -Status: +Status: Jim -0 (The current behavior seems logical to me. If there + was more universal interest in changing it, then that would be + a different matter). * Eric Prud'hommeaux's mods for practical negotiation with file level access control. @@ -129,7 +131,7 @@ * Addition of cute little icons to Apache's main icon groups. See [EMAIL PROTECTED] -Status: Ralf +1, Roy +1 (in icons/small subdirectory) +Status: Ralf +1, Roy +1 (in icons/small subdirectory), Jim +1 * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats
cvs commit: apache-site/contributors index.html
jim 98/12/19 05:07:10 Modified:contributors index.html Log: Most likely will reverse it or tone it down anyway... Most of us don't like blowing our own horns, but maybe we should get over this, at least for this page Revision ChangesPath 1.59 +13 -8 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- index.html1998/12/19 09:58:47 1.58 +++ index.html1998/12/19 13:07:09 1.59 @@ -301,14 +301,19 @@ STRONGName:/STRONG A NAME=jagielskiJim Jagielski/ABR STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.jaguNET.com/;http://www.jaguNET.com//ABR -STRONGOrganization:/STRONG jaguNET Access ServicesBR -STRONGOccupation:/STRONG ISP and EngineerBR -STRONGLocation:/STRONG Baltimore Maryland, USABR -STRONGOS Expertise:/STRONG A/UX and various SysV flavorsBR -STRONGContributions:/STRONG A/UX port, SysV shared memory support, flock mutexes, - several mod_status updates, loads of Configuration stuff, - various fixes/hacks and lately coordinating the Releases. - General porter, coder and trouble maker. BR +STRONGOrganization:/STRONG jaguNET Access Services, LLCBR +STRONGOccupation:/STRONG ISP and Web Hosting/Design firmBR +STRONGLocation:/STRONG Forest Hill, Maryland, USABR +STRONGOS Expertise:/STRONG A/UX and various SysV flavors, lately FreeBSDBR +STRONGContributions:/STRONG Started off with the A/UX port, +added SysV shared memory support for the scoreboard; flock mutexes; +several mod_status updates such as bytes/requests counters and making +ExtendedStatus runtime instead of compile-time; the second main revision +of Configure, including the concept/implementation of Rules, most of the +helper scripts and auto-OS detection; some new directives; +various fixes/hacks and lately coordinating the Releases. +General porter, coder and trouble maker. Plays devil's +advocate a bit too often TT:-)/TTBR P
cvs commit: apache-site/contributors index.html
jim 98/12/19 05:30:04 Modified:contributors index.html Log: Oops... should really qualify most Revision ChangesPath 1.60 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- index.html1998/12/19 13:07:09 1.59 +++ index.html1998/12/19 13:30:04 1.60 @@ -305,12 +305,12 @@ STRONGOccupation:/STRONG ISP and Web Hosting/Design firmBR STRONGLocation:/STRONG Forest Hill, Maryland, USABR STRONGOS Expertise:/STRONG A/UX and various SysV flavors, lately FreeBSDBR -STRONGContributions:/STRONG Started off with the A/UX port, +STRONGContributions:/STRONG Started off with the A/UX port; added SysV shared memory support for the scoreboard; flock mutexes; several mod_status updates such as bytes/requests counters and making ExtendedStatus runtime instead of compile-time; the second main revision of Configure, including the concept/implementation of Rules, most of the -helper scripts and auto-OS detection; some new directives; +big main helper scripts and auto-OS detection; some new directives; various fixes/hacks and lately coordinating the Releases. General porter, coder and trouble maker. Plays devil's advocate a bit too often TT:-)/TTBR
cvs commit: apache-1.3/src/include ap_config.h
jim 98/12/22 06:49:49 Modified:src Configure src/include ap_config.h Log: Add the Cyberguard V2 port PR: 3336 Submitted by: Richard Stagg [EMAIL PROTECTED] Revision ChangesPath 1.313 +7 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- Configure 1998/12/09 22:07:51 1.312 +++ Configure 1998/12/22 14:49:47 1.313 @@ -717,6 +717,13 @@ DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb ;; +m88k-*-CX/SX|CYBER) +OS='Cyberguard CX/SX' +CFLAGS=$CFLAGS -D_CX_SX -Xa +DEF_WANTHSREGEX=yes +CC='cc' +RANLIB='true' +;; *) # default: Catch systems we don't know about OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \$PLAT\ 1.249 +5 -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.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- ap_config.h 1998/12/12 05:59:57 1.248 +++ ap_config.h 1998/12/22 14:49:48 1.249 @@ -827,6 +827,11 @@ #define NO_KILLPG #define NEED_INITGROUPS +#elif defined(_CX_SX) +#define JMP_BUF sigjmp_buf +#include sys/types.h +#include sys/time.h + #elif defined(WIN32) /* All windows stuff is now in os/win32/os.h */
cvs commit: apache-1.3/src CHANGES
jim 98/12/22 06:51:44 Modified:src CHANGES Log: And update CHANGES re: pr3336 Revision ChangesPath 1.1175+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1174 retrieving revision 1.1175 diff -u -r1.1174 -r1.1175 --- CHANGES 1998/12/18 10:53:20 1.1174 +++ CHANGES 1998/12/22 14:51:42 1.1175 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) PORT: Added the Cyberguard V2 port [Richard Stagg [EMAIL PROTECTED]] + PR#3336 + *) Update APXS manual page: some -q option arguments were missing and another was incorrect. [Mark Anderson [EMAIL PROTECTED]] PR#3553
cvs commit: apache-1.3/src Configure
jim 98/12/22 07:05:18
Modified:src Configure
Log:
Some Configure cleanups... we were using TABs
inconsistantly. We use TABs in Configure since, at times, it generates
inline scripts to awk and sed, and some shells have small buffers
Revision ChangesPath
1.314 +400 -400 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- Configure 1998/12/22 14:49:47 1.313
+++ Configure 1998/12/22 15:05:17 1.314
@@ -264,13 +264,13 @@
case $PLAT in
*mint)
-OS=MiNT
-CFLAGS=-DMINT
-LIBS=$LIBS -lportlib -lsocket
-DEF_WANTHSREGEX=yes
-;;
+ OS=MiNT
+ CFLAGS=-DMINT
+ LIBS=$LIBS -lportlib -lsocket
+ DEF_WANTHSREGEX=yes
+ ;;
*MPE/iX*)
-OS='MPE/iX'
+ OS='MPE/iX'
CFLAGS=$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE
LIBS=$LIBS -lsocket -lsvipc
LDFLAGS=$LDFLAGS -Xlinker \-WL,cap=ia,ba,ph,pm;nmstack=1024000\
@@ -352,9 +352,9 @@
case $PLAT in
*-hp-hpux10.01)
# We know this is a problem in 10.01.
- # Not a problem in 10.20. Otherwise, who knows?
- CFLAGS=$CFLAGS -DSELECT_NEEDS_CAST
- ;;
+# Not a problem in 10.20. Otherwise, who knows?
+CFLAGS=$CFLAGS -DSELECT_NEEDS_CAST
+;;
esac
DEF_WANTHSREGEX=yes
;;
@@ -366,7 +366,7 @@
LIBS=$LIBS -lm
;;
*-sgi-irix64)
-# Note: We'd like to see patches to compile 64-bit, but for now...
+ # Note: We'd like to see patches to compile 64-bit, but for now...
echo You are running 64-bit Irix. For now, we will compile 32-bit
echo but if you would care to port to 64-bit, send us the patches.
DEF_WANTHSREGEX=yes
@@ -584,15 +584,15 @@
LIBS=$LIBS -lsocket -lnsl -lc -lgen
;;
*-*-powermax*)
-OS='SVR4'
-CFLAGS=$CFLAGS -DSVR4
-DEF_WANTHSREGEX=yes
-LIBS=$LIBS -lsocket -lnsl -lgen
-LD_SHLIB='cc'
-LDFLAGS_SHLIB=-Zlink=so
-LDFLAGS_SHLIB_EXPORT=-Zlink=dynamic -Wl,-Bexport
-CFLAGS_SHLIB='-Zpic'
-;;
+ OS='SVR4'
+ CFLAGS=$CFLAGS -DSVR4
+ DEF_WANTHSREGEX=yes
+ LIBS=$LIBS -lsocket -lnsl -lgen
+ LD_SHLIB='cc'
+ LDFLAGS_SHLIB=-Zlink=so
+ LDFLAGS_SHLIB_EXPORT=-Zlink=dynamic -Wl,-Bexport
+ CFLAGS_SHLIB='-Zpic'
+ ;;
BS2000*-sni-sysv4*)
OS='BS2000'
OSDIR='os/bs2000'
@@ -706,26 +706,26 @@
DEF_WANTHSREGEX=yes
;;
4850-*.*)
-OS='NCR MP/RAS'
-CFLAGS=$CFLAGS -DSVR4 -DMPRAS
-DEF_WANTHSREGEX=yes
-LIBS=$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb
-;;
+ OS='NCR MP/RAS'
+ CFLAGS=$CFLAGS -DSVR4 -DMPRAS
+ 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
-;;
+ OS='DRS6000'
+ CFLAGS=$CFLAGS -DSVR4
+ DEF_WANTHSREGEX=yes
+ LIBS=$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb
+ ;;
m88k-*-CX/SX|CYBER)
-OS='Cyberguard CX/SX'
-CFLAGS=$CFLAGS -D_CX_SX -Xa
-DEF_WANTHSREGEX=yes
-CC='cc'
-RANLIB='true'
-;;
+ OS='Cyberguard CX/SX'
+ CFLAGS=$CFLAGS -D_CX_SX -Xa
+ DEF_WANTHSREGEX=yes
+ CC='cc'
+ RANLIB='true'
+ ;;
*) # default: Catch systems we don't know about
-OS='Unknown and unsupported OS'
+ OS='Unknown and unsupported OS'
echo Sorry, but we cannot grok \$PLAT\
echo uname -m
uname -m
@@ -740,8 +740,8 @@
echo Ideally, read the file PORTING, do what it says, and send the
echo resulting patches to The Apache Group by filling out a report
echo form at http://www.apache.org/bug_report.html. If you don\'t
-echo wish to do the port yourself, please submit this output rather
-echo than the patches. Thank you.
+ echo wish to do the port yourself, please submit this output rather
+ echo than the patches. Thank you.
echo
echo Pressing on with the build process, but all bets are off.
echo Do not be surprised if it fails. If it works, and even
@@ -753,7 +753,7 @@
## set this if we haven't
##
-if [ .${MAKE} = . ]; then
+if [ x${MAKE} = x ]; then
MAKE='make'; export MAKE
fi
@@ -790,8 +790,8
