cvs commit: apache-1.3/conf highperformance.conf-dist
dgaudet 98/03/12 17:32:34 Added: conf highperformance.conf-dist Log: This is a basic configuration that I've used in the past for high performance work. Nothing but the basics. I think it's an excellent counter-point to our kitchen-and-sink config files that are so damn confusing to even me... too many comments in them, too many things to look at. Revision ChangesPath 1.1 apache-1.3/conf/highperformance.conf-dist Index: highperformance.conf-dist === # Ha, you're reading this config file looking for the easy way out! # how do I make my apache server go really really fast?? # Well you could start by reading the htdocs/manual/misc/perf-tuning.html # page. But, we'll give you a head start. # # This config file is small, it is probably not what you'd expect on a # full featured internet webserver with multiple users. But it's # probably a good starting point for any folks interested in testing # performance. # # To run this config you'll need to use something like: # httpd -f @@ServerRoot@@/conf/highperformance.conf Port 80 ServerRoot @@ServerRoot@@ DocumentRoot @@ServerRoot@@/htdocs MaxClients 150 StartServers 5 MinSpareServers 5 MaxSpareServers 10 MaxRequestsPerChild 1000 # this is a True Config File # see http://www.apache.org/info/three-config-files.html ResourceConfig /dev/null AccessConfig /dev/null # it's always nice to know the server has started ErrorLog logs/error_log # Some benchmarks require logging, which is a good requirement. Uncomment # this if you need logging. #TransferLog logs/access_log # Disable symlink protection and htaccess files, they chew far too much. Directory / AllowOverride none Options FollowSymLinks # If this was a real internet server you'd probably want to # uncomment these: #order deny,allow #deny from all /Directory # If this was a real internet server you'd probably want to uncomment this: #Directory @@ServerRoot@@/htdocs #order allow,deny #allow from all #/Directory # OK that's enough hints. Read the documentation if you want more.
cvs commit: apache-1.3/src/main http_protocol.c
dgaudet 98/03/12 23:12:56
Modified:src/main http_protocol.c
Log:
Move this ugly platform specific code from parse_uri_components() into
parse_uri(). Guys this is probably something that should be done
elsewhere. Like maybe in directory_walk().
Revision ChangesPath
1.196 +16 -0 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- http_protocol.c 1998/03/10 06:13:50 1.195
+++ http_protocol.c 1998/03/13 07:12:54 1.196
@@ -594,6 +594,22 @@
r-args = r-parsed_uri.query;
r-uri = r-parsed_uri.path ? r-parsed_uri.path
: pstrdup(r-pool, /);
+#if defined(__EMX__) || defined(WIN32)
+ /* Handle path translations for OS/2 and plug security hole.
+ * This will prevent http://www.wherever.com/..\..\/; from
+ * returning a directory for the root drive.
+ */
+ {
+ char *x;
+
+ for (x = r-uri; (x = strchr(x, '\\')) != NULL; )
+ *x = '/';
+#ifndef WIN32 /* for OS/2 only: */
+ /* Fix OS/2 HPFS filename case problem. */
+ str_tolower(r-uri);
+#endif
+ }
+#endif /* __EMX__ || WIN32 */
}
else {
r-args = NULL;
cvs commit: apache-1.3/conf .cvsignore
dgaudet 98/03/12 23:13:33 Modified:conf .cvsignore Log: yadda Revision ChangesPath 1.2 +1 -0 apache-1.3/conf/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/conf/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1997/10/07 20:08:32 1.1 +++ .cvsignore1998/03/13 07:13:33 1.2 @@ -1,3 +1,4 @@ access.conf httpd.conf srm.conf +highperformance.conf
cvs commit: apache-1.3/src/modules/proxy Makefile.tmpl
rse 98/03/12 23:27:58
Modified:.STATUS
src CHANGES Configure
src/modules/proxy Makefile.tmpl
Log:
Support for building library-based modules (mod_proxy) as shared objects and
support for the situation where all modules of a modules/ subdir are build as
shared objects (mod_example).
Revision ChangesPath
1.185 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- STATUS1998/03/12 11:30:07 1.184
+++ STATUS1998/03/13 07:27:51 1.185
@@ -79,6 +79,7 @@
* Fix for rputs() which did not calculate r-sent_bodyct properly.
PR#1900
* Don't tweak TZ envvar if the user has specified an explicit one.
PR#1888
* Ralf's mod_so changes to keep track of loaded modules ourself.
+* Ralf's support for building shared objects even for library-style
modules
Available Patches:
1.702 +7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- CHANGES 1998/03/12 10:28:52 1.701
+++ CHANGES 1998/03/13 07:27:53 1.702
@@ -1,5 +1,12 @@
Changes with Apache 1.3b6
+ *) Added support for building shared objects even for library-style modules
+ (which are build from more than one object file). This now provides the
+ ability to build mod_proxy as a shared object module. Additionally
+ modules like mod_example are now also supported for shared object
+ building because the generated Makefiles now no longer assume there is
at
+ least one statically linked module. [Ralf S. Engelschall]
+
*) API: Clarify usage of content_type, handler, content_encoding,
content_language and content_languages fields in request_rec. They
must always be lowercased; and the strings pointed to shouldn't
1.205 +41 -15apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- Configure 1998/03/11 23:58:03 1.204
+++ Configure 1998/03/13 07:27:54 1.205
@@ -926,6 +926,21 @@
SEEN[pp[2]] = 1
}
}'`
+MODDIRS_NO_SO=`awk $tmpfile '
+ ($1 == Module $3 ~ /^modules\//) {
+ split ($3, pp, /)
+ if (! SEEN[pp[2]]) {
+ printf %s , pp[2]
+ SEEN[pp[2]] = 1
+ }
+ }
+ (($1 == AddModule) $2 ~ /^modules\//) {
+ split ($2, pp, /)
+ if (! SEEN[pp[2]]) {
+ printf %s , pp[2]
+ SEEN[pp[2]] = 1
+ }
+ }'`
#
# Now autoconfigure each of the modules specified by AddModule.
@@ -1061,6 +1076,11 @@
do
if [ -f modules/$moddir/Makefile.tmpl ] ; then
AUTODIRS=$AUTODIRS modules/$moddir
+ fi
+done
+for moddir in $MODDIRS_NO_SO
+do
+ if [ -f modules/$moddir/Makefile.tmpl ] ; then
AUTOLIBS=$AUTOLIBS modules/$moddir/lib$moddir.a
fi
done
@@ -1237,28 +1257,32 @@
INCDIR=../../include
EOF
if [ -f $moddir/Makefile.libdir ]; then
- # it's responsible for the rest of its Makefile
- :
- else
basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
awk $moddir/Makefile $tmpfile '
- BEGIN {
- printf OBJS=
+ ($2 ~ /^modules\/'$basedir'\//) {
+ split($2, pp, /);
+ split(pp[3], parts, .);
+ libext=parts[2];
}
+ END {
+ printf LIBEXT=%s\n, libext;
+ }'
+ # it's responsible for the rest of its Makefile...
+ else
+ basedir=`echo $moddir | sed '[EMAIL PROTECTED]/]*/@@g'`
+ OBJS=`awk $tmpfile '
($1 == Module $3 ~ /^modules\/'$basedir'\//) {
split ($3, pp, /)
printf %s , pp[3]
}
- END {
- printf \n
- }'
-
- $CAT 'EOF' $moddir/Makefile
-
-all: lib shlib
-
-EOF
- echo LIB=lib$basedir.a $moddir/Makefile
+ '`
+ echo OBJS=$OBJS $moddir/Makefile
+ if [ .$OBJS != . ]; then
+ echo LIB=lib$basedir.a $moddir/Makefile
+ else
+ # essential!
+ echo LIB= $moddir/Makefile
+ fi
awk $moddir/Makefile
cvs commit: apache-1.3/src CHANGES
dgaudet 98/03/12 23:49:21
Modified:src/main http_config.c
src CHANGES
Log:
Another 2% improvement that's been queued waiting for the lowercase
issues to be resolved. This is NULL-compression for invoke_handler()
similar to what happened in run_method() ages ago. This helps the
server scale when more modules are added.
Submitted by: Dmitry Khrustalev [EMAIL PROTECTED]
Oh yeah and some CHANGES cleanup.
Revision ChangesPath
1.103 +88 -37apache-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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- http_config.c 1998/03/12 12:11:13 1.102
+++ http_config.c 1998/03/13 07:49:17 1.103
@@ -413,58 +413,109 @@
return run_method(r, offsets_into_method_ptrs.auth_checker, 0);
}
-int invoke_handler(request_rec *r)
+/*
+ * For speed/efficiency we generate a compact list of all the handlers
+ * and wildcard handlers. This means we won't have to scan the entire
+ * module list looking for handlers... where we'll find a whole whack
+ * of NULLs.
+ */
+typedef struct {
+handler_rec hr;
+size_t len;
+} fast_handler_rec;
+
+static fast_handler_rec *handlers;
+static fast_handler_rec *wildhandlers;
+
+static void init_handlers(pool *p)
{
module *modp;
+int nhandlers = 0;
+int nwildhandlers = 0;
handler_rec *handp;
-char *content_type = r-content_type ? r-content_type : default_type(r);
-char *handler, *p;
-
-if ((p = strchr(content_type, ';')) != NULL) { /* MIME type arguments
*/
- while (p content_type p[-1] == ' ')
- --p;/* strip trailing spaces */
- content_type = pstrndup(r-pool, content_type, p - content_type);
-}
-handler = r-handler ? r-handler : content_type;
-
-/* Pass one --- direct matches */
+fast_handler_rec *ph, *pw;
+char *starp;
for (modp = top_module; modp; modp = modp-next) {
if (!modp-handlers)
continue;
-
for (handp = modp-handlers; handp-content_type; ++handp) {
- if (!strcmp(handler, handp-content_type)) {
- int result = (*handp-handler) (r);
-
- if (result != DECLINED)
- return result;
- }
- }
+ if (strchr(handp-content_type, '*')) {
+nwildhandlers ++;
+} else {
+nhandlers ++;
+}
+}
}
-
-/* Pass two --- wildcard matches */
-
+ph = handlers = palloc(p, sizeof(*ph)*(nhandlers + 1));
+pw = wildhandlers = palloc(p, sizeof(*pw)*(nwildhandlers + 1));
for (modp = top_module; modp; modp = modp-next) {
if (!modp-handlers)
continue;
-
for (handp = modp-handlers; handp-content_type; ++handp) {
- char *starp = strchr(handp-content_type, '*');
- int len;
+ if ((starp = strchr(handp-content_type, '*'))) {
+pw-hr.content_type = handp-content_type;
+pw-hr.handler = handp-handler;
+ pw-len = starp - handp-content_type;
+pw ++;
+} else {
+ph-hr.content_type = handp-content_type;
+ph-hr.handler = handp-handler;
+ ph-len = strlen(handp-content_type);
+ph ++;
+}
+}
+}
+pw-hr.content_type = NULL;
+pw-hr.handler = NULL;
+ph-hr.content_type = NULL;
+ph-hr.handler = NULL;
+}
- if (!starp)
- continue;
+int invoke_handler(request_rec *r)
+{
+fast_handler_rec *handp;
+char *handler, *p;
+size_t handler_len;
- len = starp - handp-content_type;
+if (r-handler) {
+ handler = r-handler;
+ handler_len = strlen(handler);
+}
+else {
+ handler = r-content_type ? r-content_type : default_type(r);
+ if ((p = strchr(handler, ';')) != NULL) { /* MIME type arguments */
+ while (p handler p[-1] == ' ')
+ --p;/* strip trailing spaces */
+ handler_len = p - handler;
+ }
+ else {
+ handler_len = strlen(handler);
+ }
+}
- if (!len || !strncmp(handler, handp-content_type, len)) {
- int result = (*handp-handler) (r);
+/* Pass one --- direct matches */
- if (result != DECLINED)
- return result;
- }
- }
+for (handp = handlers; handp-hr.content_type; ++handp) {
+ if (handler_len == handp-len
+ !strncmp(handler, handp-hr.content_type, handler_len)) {
+int result =
cvs commit: apache-1.3 STATUS
dgaudet 98/03/12 23:52:22 Modified:.STATUS Log: I'm a bad boy I don't keep this up to date. It was overcast today, rained a bit. Revision ChangesPath 1.186 +3 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- STATUS1998/03/13 07:27:51 1.185 +++ STATUS1998/03/13 07:52:22 1.186 @@ -78,8 +78,11 @@ * Corrections to the setup of the REMOTE_HOST variable. PR#1925 * Fix for rputs() which did not calculate r-sent_bodyct properly. PR#1900 * Don't tweak TZ envvar if the user has specified an explicit one. PR#1888 +* API clarification for command_rec handlers +* API clarification for content_type et al * Ralf's mod_so changes to keep track of loaded modules ourself. * Ralf's support for building shared objects even for library-style modules +* Performance improvements to invoke_handler(). Available Patches:
cvs commit: apache-1.3/src/main util_uri.c
dgaudet 98/03/13 00:13:54 Modified:src/main util_uri.c Log: oops left some turds in the regex code T_AT isn't needed... and it's existence made the scheme stuff a bit wrong Revision ChangesPath 1.10 +0 -10 apache-1.3/src/main/util_uri.c Index: util_uri.c === RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- util_uri.c1998/03/13 07:11:02 1.9 +++ util_uri.c1998/03/13 08:13:54 1.10 @@ -215,14 +215,6 @@ int ret; const char *re_str; -memset(uri_delims, 0, sizeof(uri_delims)); -uri_delims[':'] = T_COLON; -uri_delims['/'] = T_SLASH; -uri_delims['?'] = T_QUESTION; -uri_delims['#'] = T_HASH; -uri_delims['@'] = T_AT; -uri_delims['\0'] = T_NUL; - /* This is a modified version of the regex that appeared in * draft-fielding-uri-syntax-01. It doesnt allow the uri to contain a * scheme but no hostinfo or vice versa. @@ -398,7 +390,6 @@ #define T_SLASH 0x02/* '/' */ #define T_QUESTION 0x04/* '?' */ #define T_HASH 0x08/* '#' */ -#define T_AT 0x10/* '@' */ #define T_NUL0x80/* '\0' */ static unsigned char uri_delims[256]; @@ -423,7 +414,6 @@ uri_delims['/'] = T_SLASH; uri_delims['?'] = T_QUESTION; uri_delims['#'] = T_HASH; -uri_delims['@'] = T_AT; uri_delims['\0'] = T_NUL; }
cvs commit: apache-1.3/src/support Makefile.tmpl
rse 98/03/13 00:15:27 Modified:src/support Makefile.tmpl Log: Fix support Makefile: - OBJS needs to be declared manually here, because Configure does not set it but our `$(OBJS): Makefile' dependency line needs OBJS to be defined. If not at least HP/UX make complains. - consistently use $(LDFLAGS) and $(LIBS) even if not really needed for rotatelogs - move TARGETS define in front of the targets itsself because some Make variants don't like defines in the middle of the targets section Revision ChangesPath 1.10 +5 -3 apache-1.3/src/support/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1998/02/22 04:37:20 1.9 +++ Makefile.tmpl 1998/03/13 08:15:26 1.10 @@ -9,11 +9,13 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap INCDIR=../include +TARGETS=htpasswd htdigest rotatelogs logresolve + +OBJS=htpasswd.o htdigest.o rotatelogs.o logresolve.o + .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $ -TARGETS=htpasswd htdigest rotatelogs logresolve - all: $(TARGETS) htpasswd: htpasswd.o @@ -23,7 +25,7 @@ $(CC) $(CFLAGS) htdigest.o -o htdigest $(LDFLAGS) $(LIBS) rotatelogs: rotatelogs.o - $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs + $(CC) $(INCLUDES) $(CFLAGS) rotatelogs.o -o rotatelogs $(LDFLAGS) $(LIBS) logresolve: logresolve.o $(CC) $(INCLUDES) $(CFLAGS) logresolve.o -o logresolve $(LDFLAGS) $(LIBS)
cvs commit: apache-1.3/src Configuration.tmpl
rse 98/03/13 01:57:15 Modified:src Configuration.tmpl Log: More detailed documentation to make sure the user knows how to enable shared object support and to avoid PR's because they had used SharedModule but not included mod_so itself :-( Revision ChangesPath 1.86 +8 -3 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Configuration.tmpl1998/03/12 18:17:14 1.85 +++ Configuration.tmpl1998/03/13 09:57:14 1.86 @@ -54,17 +54,22 @@ # Makefile configuration (Shared Object support) # # There is experimental support for compiling Apache Modules as -# shared objects. This feature can be enabled for each module +# shared objects and loading them under runtime without +# recompilation when the module mod_so is enabled (see below). +# The shared object feature then can be enabled for each module # individually by replacing the `AddModule' command of the # corresponding module line below with `SharedModule' and -# changing the filename extension from `.o' to `.so'. +# changing the filename extension from `.o' to `.so'. # # The Configure script currently has only limited built-in # knowledge on how to compile shared objects because this is # heavily platform-dependend. Currently only Linux, FreeBSD, # Solaris, SunOS and IRIX are supported out-of-the-box. For other # platforms where you want to use the `SharedModule' directive -# you have to provide the appropriate flags here. +# you first have to make sure it supports the dlopen() system +# call and then you have to provide the appropriate compiler and +# linker flags here to create the shared object files on your +# particular platform. # #CFLAGS_SHLIB= #LDFLAGS_SHLIB=
cvs commit: apache-1.3/src/modules/example mod_example.c
rse 98/03/13 04:07:00
Modified:src/include hide.h
src/modules/example mod_example.c
Log:
mod_example unnecessarily exports its command and handler structures
Revision ChangesPath
1.8 +0 -2 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hide.h1998/03/12 13:52:06 1.7
+++ hide.h1998/03/13 12:06:58 1.8
@@ -129,8 +129,6 @@
#define dir_module AP_dir_module
#define dummy_mutexAP_dummy_mutex
#define env_module AP_env_module
-#define example_cmds AP_example_cmds
-#define example_handlers AP_example_handlers
#define example_module AP_example_module
#define expires_module AP_expires_module
#define headers_module AP_headers_module
1.26 +2 -2 apache-1.3/src/modules/example/mod_example.c
Index: mod_example.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/example/mod_example.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_example.c 1998/03/12 10:29:00 1.25
+++ mod_example.c 1998/03/13 12:06:59 1.26
@@ -1055,7 +1055,7 @@
/*
* List of directives specific to our module.
*/
-command_rec example_cmds[] =
+static command_rec example_cmds[] =
{
{
Example, /* directive name */
@@ -1086,7 +1086,7 @@
* if a content-handler returns anything except DECLINED, no other
* content-handlers will be called.
*/
-handler_rec example_handlers[] =
+static handler_rec example_handlers[] =
{
{example-handler, example_handler},
{NULL}
cvs commit: apache-1.3/src/ap Makefile.tmpl
rse 98/03/13 04:44:47 Modified:src/main Makefile.tmpl src/ap Makefile.tmpl Log: Make sure definitions are not in the middle of the target section (which confuses some Make variants) and slightly sort the objects file list for cosmetic issues. Revision ChangesPath 1.17 +7 -6 apache-1.3/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Makefile.tmpl 1998/03/02 07:05:55 1.16 +++ Makefile.tmpl 1998/03/13 12:44:46 1.17 @@ -9,15 +9,16 @@ LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) INCDIR=../include -OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \ - http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o \ - md5c.o util_md5.o http_bprintf.o util_date.o util_uri.o \ - fnmatch.o http_vhost.o +LIB= libmain.a + +OBJS= alloc.o buff.o \ + http_bprintf.o http_config.o http_core.o http_log.o \ + http_main.o http_protocol.o http_request.o http_vhost.o \ + util.o util_date.o util_script.o util_uri.o util_md5.o \ + md5c.o rfc1413.o fnmatch.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ - -LIB= libmain.a all: $(LIB) 1.15 +2 -2 apache-1.3/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.tmpl 1998/02/28 10:31:54 1.14 +++ Makefile.tmpl 1998/03/13 12:44:47 1.15 @@ -6,8 +6,8 @@ LIB=libap.a -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o \ - ap_execve.o +OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \ + ap_slack.o ap_snprintf.o ap_strings.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $
cvs commit: apache-1.3/src/modules/standard mod_so.c
rse 98/03/13 05:28:21
Modified:src/include hide.h
src/main alloc.c http_core.c http_main.c http_config.c
src/modules/standard mod_so.c
Log:
Shrink list of global symbols by making more stuff static
which currently is global without need.
Revision ChangesPath
1.9 +0 -8 apache-1.3/src/include/hide.h
Index: hide.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hide.h1998/03/13 12:06:58 1.8
+++ hide.h1998/03/13 13:28:13 1.9
@@ -109,22 +109,17 @@
#define action_module AP_action_module
#define agent_log_module AP_agent_log_module
#define alias_module AP_alias_module
-#define alloc_mutexAP_alloc_mutex
#define anon_auth_module AP_anon_auth_module
#define asis_moduleAP_asis_module
#define auth_moduleAP_auth_module
#define autoindex_module AP_autoindex_module
-#define block_freelist AP_block_freelist
#define cern_meta_module AP_cern_meta_module
#define cgi_module AP_cgi_module
#define config_log_module AP_config_log_module
-#define core_cmds AP_core_cmds
-#define core_handlers AP_core_handlers
#define core_moduleAP_core_module
#define day_snames AP_day_snames
#define db_auth_module AP_db_auth_module
#define dbm_auth_moduleAP_dbm_auth_module
-#define default_parms AP_default_parms
#define digest_module AP_digest_module
#define dir_module AP_dir_module
#define dummy_mutexAP_dummy_mutex
@@ -139,7 +134,6 @@
#define mime_moduleAP_mime_module
#define month_snames AP_month_snames
#define negotiation_module AP_negotiation_module
-#define one_processAP_one_process
#define prelinked_modules AP_prelinked_modules
#define preloaded_modules AP_preloaded_modules
#define proxy_module AP_proxy_module
@@ -148,9 +142,7 @@
#define rfc1413_timeoutAP_rfc1413_timeout
#define scoreboard_image AP_scoreboard_image
#define setenvif_moduleAP_setenvif_module
-#define so_cmdsAP_so_cmds
#define so_module AP_so_module
-#define spawn_mutexAP_spawn_mutex
#define speling_module AP_speling_module
#define status_module AP_status_module
#define suexec_enabled AP_suexec_enabled
1.76 +3 -3 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- alloc.c 1998/03/09 22:42:58 1.75
+++ alloc.c 1998/03/13 13:28:15 1.76
@@ -159,9 +159,9 @@
} h;
};
-union block_hdr *block_freelist = NULL;
-mutex *alloc_mutex = NULL;
-mutex *spawn_mutex = NULL;
+static union block_hdr *block_freelist = NULL;
+static mutex *alloc_mutex = NULL;
+static mutex *spawn_mutex = NULL;
#ifdef POOL_DEBUG
static char *known_stack_point;
static int stack_direction;
1.166 +2 -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.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- http_core.c 1998/03/02 06:51:07 1.165
+++ http_core.c 1998/03/13 13:28:16 1.166
@@ -1815,7 +1815,7 @@
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
-command_rec core_cmds[] = {
+static command_rec core_cmds[] = {
/* Old access config file commands */
@@ -2144,7 +2144,7 @@
return OK;
}
-handler_rec core_handlers[] = {
+static handler_rec core_handlers[] = {
{ */*, default_handler },
{ NULL }
};
1.301 +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.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- http_main.c 1998/03/08 04:25:57 1.300
+++ http_main.c 1998/03/13 13:28:17 1.301
@@ -284,7 +284,7 @@
* Continue through and
cvs commit: apache-1.3/src/os/unix os.h
rse 98/03/13 08:15:42 Modified:src Configure Configuration.tmpl src/os/unix os.h Log: And another nice platform where we support shared objects: OSF1 (BTW: compares to the linker nightmare I had under AIX today the OSF1 platform is really a pleasure) Revision ChangesPath 1.206 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- Configure 1998/03/13 07:27:54 1.205 +++ Configure 1998/03/13 16:15:39 1.206 @@ -733,6 +733,14 @@ LDFLAGS_SHLIB=-shared LDFLAGS_SHLIB_EXPORT= ;; +*-dec-osf*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB=-fpic ;; +*/cc|cc ) CFLAGS_SHLIB= ;; +esac +LDFLAGS_SHLIB=-shared -expect_unresolved '*' -msym -s +LDFLAGS_SHLIB_EXPORT= +;; esac fi 1.87 +14 -7 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Configuration.tmpl1998/03/13 09:57:14 1.86 +++ Configuration.tmpl1998/03/13 16:15:40 1.87 @@ -63,13 +63,20 @@ # # The Configure script currently has only limited built-in # knowledge on how to compile shared objects because this is -# heavily platform-dependend. Currently only Linux, FreeBSD, -# Solaris, SunOS and IRIX are supported out-of-the-box. For other -# platforms where you want to use the `SharedModule' directive -# you first have to make sure it supports the dlopen() system -# call and then you have to provide the appropriate compiler and -# linker flags here to create the shared object files on your -# particular platform. +# heavily platform-dependend. The current state is this: +# +# Out-of-the-box supported platforms: +# Linux, FreeBSD, Solaris, SunOS, IRIX, OSF1 +# +# Entirely unsupported platforms (no dlopen-style API): +# HP-UX, UnixWare, Ultrix +# +# For other platforms where you want to use the `SharedModule' +# directive you first have to make sure it supports the dlopen() +# system call and then you have to provide the appropriate +# compiler and linker flags here to create the shared object +# files on your particular platform. +# # #CFLAGS_SHLIB= #LDFLAGS_SHLIB= 1.14 +2 -2 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- os.h 1998/03/06 13:18:44 1.13 +++ os.h 1998/03/13 16:15:41 1.14 @@ -88,7 +88,7 @@ */ #if defined(LINUX) || defined(__FreeBSD__) || defined(SOLARIS2) || \ -defined(__bsdi__) || defined(IRIX) || defined(SVR4) +defined(__bsdi__) || defined(IRIX) || defined(SVR4) || defined(OSF1) # define HAVE_DLFCN_H 1 #endif @@ -97,7 +97,7 @@ #endif /* OSes that don't support dlopen */ -#if defined(UW) || defined(ULTRIX) +#if defined(UW) || defined(ULTRIX) || defined(HPUX) || defined(HPUX10) # define NO_DL #endif
cvs commit: apache-1.3/src CHANGES
rse 98/03/13 08:21:29 Modified:src CHANGES Log: OK, FINISHED! Now we support building modules as shared objects on all major platforms. Puhhh Revision ChangesPath 1.704 +5 -4 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.703 retrieving revision 1.704 diff -u -r1.703 -r1.704 --- CHANGES 1998/03/13 07:49:19 1.703 +++ CHANGES 1998/03/13 16:21:27 1.704 @@ -39,10 +39,11 @@ [Tony Fincg [EMAIL PROTECTED]] PR#1925 *) Various improvements to the configuration and build support for compiling - modules as shared objects. Especially Solaris 2.x, SunOS 4.1 and IRIX - support with GCC and vendor compilers was added. This way shared object - support is now provided out-of-the-box for FreeBSD, Linux, Solaris, SunOS - and IRIX. [Ralf S. Engelschall] + modules as shared objects. Especially Solaris 2.x, SunOS 4.1, IRIX and + OSF1 support with GCC and vendor compilers was added. This way shared + object support is now provided out-of-the-box for FreeBSD, Linux, + Solaris, SunOS, IRIX and OSF1. In short: On all major platforms! + [Ralf S. Engelschall] *) Minor cleanup in http_main -- split QNX and OS2 specific mmap scoreboard code into separate #defines -- USE_POSIX_SCOREBOARD
cvs commit: apache-1.3/src/include hide.h
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
Submitted by: Ben Hyde
Revision ChangesPath
1.167 +82 -52apache-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.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- http_core.c 1998/03/13 13:28:16 1.166
+++ http_core.c 1998/03/13 16:49:41 1.167
@@ -683,7 +683,7 @@
return NULL;
}
-const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_access_name (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -695,7 +695,7 @@
return NULL;
}
-const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_document_root (cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
core_server_config *conf = get_module_config (sconf, core_module);
@@ -716,7 +716,7 @@
return NULL;
}
-const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
+static const char *set_error_document (cmd_parms *cmd, core_dir_config *conf,
char *line)
{
int error_number, index_number, idx500;
@@ -759,7 +759,7 @@
* discards as harmless. Cheesy, but it works.
*/
-const char *set_override (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_override (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
char *w;
@@ -793,7 +793,7 @@
return NULL;
}
-const char *set_options (cmd_parms *cmd, core_dir_config *d, const char *l)
+static const char *set_options (cmd_parms *cmd, core_dir_config *d, const
char *l)
{
allow_options_t opt;
int first = 1;
@@ -876,7 +876,7 @@
return NULL;
}
-const char *limit_section (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *limit_section (cmd_parms *cmd, void *dummy, const char
*arg)
{
const char *limited_methods = getword(cmd-pool,arg,'');
int limited = 0;
@@ -904,7 +904,7 @@
return NULL;
}
-const char *endlimit_section (cmd_parms *cmd, void *dummy, void *dummy2)
+static const char *endlimit_section (cmd_parms *cmd, void *dummy, void
*dummy2)
{
if (cmd-limited == -1) return /Limit unexpected;
@@ -953,7 +953,7 @@
return cmd-end_token;
}
-const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *dirsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1014,7 +1014,7 @@
return NULL;
}
-const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *urlsection (cmd_parms *cmd, void *dummy, const char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1070,7 +1070,7 @@
return NULL;
}
-const char *filesection (cmd_parms *cmd, core_dir_config *c, const char *arg)
+static const char *filesection (cmd_parms *cmd, core_dir_config *c, const
char *arg)
{
const char *errmsg;
char *endp = strrchr (arg, '');
@@ -1137,11 +1137,11 @@
* Extra (redundant, unpaired) /IfModule directives are
* simply silently ignored.
*/
-const char *end_ifmod (cmd_parms *cmd, void *dummy) {
+static const char *end_ifmod (cmd_parms *cmd, void *dummy) {
return NULL;
}
-const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
+static const char *start_ifmod (cmd_parms *cmd, void *dummy, char *arg)
{
char *endp = strrchr (arg, '');
char l[MAX_STRING_LEN];
@@ -1173,7 +1173,7 @@
/* httpd.conf commands... beginning with the VirtualHost business */
-const char *virtualhost_section (cmd_parms *cmd, void *dummy, char *arg)
+static const char *virtualhost_section (cmd_parms *cmd, void *dummy, char
*arg)
{
server_rec *main_server = cmd-server, *s;
const char *errmsg;
@@ -1222,7 +1222,7 @@
return errmsg;
}
-const char *set_server_alias(cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_server_alias(cmd_parms *cmd, void *dummy, const char
*arg)
{
if (!cmd-server-names)
return ServerAlias only used in VirtualHost;
@@ -1237,7 +1237,7 @@
return NULL;
}
-const char *add_module_command (cmd_parms *cmd, void *dummy, char *arg)
+static const char *add_module_command (cmd_parms *cmd, void *dummy, char
*arg)
{
const char *err = check_cmd_context(cmd,
cvs commit: apache-1.3/src/main http_core.c
rse 98/03/13 08:54:21
Modified:src/main http_core.c
Log:
Make sure the given argument to Port is in the appropriate range.
Submitted by: Ben Hyde
Reviewed by: Ralf S. Engelschall
Revision ChangesPath
1.168 +9 -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.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- http_core.c 1998/03/13 16:49:41 1.167
+++ http_core.c 1998/03/13 16:54:15 1.168
@@ -1286,9 +1286,16 @@
static const char *server_port (cmd_parms *cmd, void *dummy, char *arg)
{
const char *err = check_cmd_context(cmd,
NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
-if (err != NULL) return err;
+int port;
-cmd-server-port = atoi (arg);
+if (err != NULL)
+ return err;
+port = atoi(arg);
+if (port = 0 || port = 65536) /* 65536 == 116 */
+ return pstrcat(cmd-temp_pool, The port number \, arg,
+\ is outside the appropriate range (i.e. 1..65535).,
+NULL);
+cmd-server-port = port;
return NULL;
}
cvs commit: apache-1.3/src CHANGES
rse 98/03/13 09:03:19 Modified:.STATUS src CHANGES Log: The corresponding changelog entries for the added Port check. Revision ChangesPath 1.187 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.186 retrieving revision 1.187 diff -u -r1.186 -r1.187 --- STATUS1998/03/13 07:52:22 1.186 +++ STATUS1998/03/13 17:03:15 1.187 @@ -83,6 +83,7 @@ * Ralf's mod_so changes to keep track of loaded modules ourself. * Ralf's support for building shared objects even for library-style modules * Performance improvements to invoke_handler(). +* Ben Hyde's check to make sure the Port range is valid Available Patches: 1.705 +3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- CHANGES 1998/03/13 16:21:27 1.704 +++ CHANGES 1998/03/13 17:03:17 1.705 @@ -1,5 +1,8 @@ Changes with Apache 1.3b6 + *) Add check to the Port directive to make sure the specified + port is in the appropriate range. [Ben Hyde] + *) Performance improvements to invoke_handler(). [Dmitry Khrustalev [EMAIL PROTECTED]]
Re: cvs commit: apache-1.3/src/include hide.h
Ralf S. Engelschall wrote:
rse 98/03/13 08:49:45
Modified:src/main http_core.c
src/include hide.h
Log:
More statics which reduce the global exported symbol table.
[snip]
-const char *set_server_string_slot (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_server_string_slot (cmd_parms *cmd, void *dummy,
+char *arg)
{
/* This one's pretty generic... */
This one should be part of the API (even if no-one does use it - they
should!)
Cheers,
Ben.
--
Ben Laurie|Phone: +44 (181) 735 0686| Apache Group member
Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org
and Technical Director|Email: [EMAIL PROTECTED] |
A.L. Digital Ltd, |Apache-SSL authorhttp://www.apache-ssl.org/
London, England. |Apache: TDG http://www.ora.com/catalog/apache
cvs commit: apache-1.3/htdocs/manual/misc compat_notes.html
marc98/03/13 11:20:02 Modified:htdocs/manual/misc compat_notes.html Log: We don't allow ServerRoot in vhost. 1.2 just does it and changes the global one, 1.3 whines. PR: 1935 Submitted by: Randy Moore [EMAIL PROTECTED] Revision ChangesPath 1.20 +5 -0 apache-1.3/htdocs/manual/misc/compat_notes.html Index: compat_notes.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/compat_notes.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- compat_notes.html 1998/02/11 15:14:34 1.19 +++ compat_notes.html 1998/03/13 19:19:57 1.20 @@ -143,6 +143,11 @@ PR#968/A for a few brief suggestions on alternative ways to implement the same thing under Apache. + LIApache does not allow ServerRoot settings inside a VirtualHost + container. There is only one global ServerRoot in Apache; any desired + changes in paths for virtual hosts need to be made with the explicit + directives, eg. DocumentRoot, TransferLog, etc. + /OL More to come when we notice them
cvs commit: apache-1.3/src/modules/test mod_rndchunk.c mod_test_util_uri.c
dgaudet 98/03/13 11:20:59
Modified:src CHANGES
src/include http_config.h
src/main http_config.c http_core.c
src/modules/example mod_example.c
src/modules/experimental mod_mmap_static.c
src/modules/proxy mod_proxy.c
src/modules/standard mod_access.c mod_actions.c mod_alias.c
mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c
mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c
mod_cgi.c mod_digest.c mod_dir.c mod_env.c
mod_expires.c mod_headers.c mod_imap.c
mod_include.c mod_info.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_rewrite.c
mod_setenvif.c mod_so.c mod_speling.c mod_status.c
mod_userdir.c mod_usertrack.c
src/modules/test mod_rndchunk.c mod_test_util_uri.c
Log:
Mark command_rec and handler_rec as const... this is a backwards
compatible change, 3rd party modules shouldn't get any warnings or
anything due to it. But the advantage is that a bunch more data goes
into read-only sections of memory and some systems can take advantage
of that by not duplicating the page across a fork().
Revision ChangesPath
1.706 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- CHANGES 1998/03/13 17:03:17 1.705
+++ CHANGES 1998/03/13 19:20:05 1.706
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Mark module command_rec and handler_rec structures const so that they
+ end up in the read-only data section (and are friendlier to systems
+ that don't do optimistic memory allocation on fork()). [Dean Gaudet]
+
*) Add check to the Port directive to make sure the specified
port is in the appropriate range. [Ben Hyde]
1.73 +2 -2 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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- http_config.h 1998/03/12 10:36:33 1.72
+++ http_config.h 1998/03/13 19:20:10 1.73
@@ -211,8 +211,8 @@
void *(*merge_server_config) (pool *p, void *base_conf, void *new_conf);
#endif
-command_rec *cmds;
-handler_rec *handlers;
+const command_rec *cmds;
+const handler_rec *handlers;
/* Hooks for getting into the middle of server ops...
1.105 +3 -3 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.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- http_config.c 1998/03/13 13:28:18 1.104
+++ http_config.c 1998/03/13 19:20:13 1.105
@@ -432,7 +432,7 @@
module *modp;
int nhandlers = 0;
int nwildhandlers = 0;
-handler_rec *handp;
+const handler_rec *handp;
fast_handler_rec *ph, *pw;
char *starp;
@@ -1451,7 +1451,7 @@
* a particular directive is allowed to be used. This procedure prints
* in English where the given (pc) directive can be used.
*/
-void show_overrides(command_rec *pc, module *pm)
+void show_overrides(const command_rec *pc, module *pm)
{
int n = 0;
@@ -1515,7 +1515,7 @@
*/
void show_directives()
{
-command_rec *pc;
+const command_rec *pc;
int n;
for (n = 0; preloaded_modules[n]; ++n)
1.169 +2 -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.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- http_core.c 1998/03/13 16:54:15 1.168
+++ http_core.c 1998/03/13 19:20:14 1.169
@@ -1852,7 +1852,7 @@
* The AllowOverride of Fileinfo allows webmasters to turn it off
*/
-static command_rec core_cmds[] = {
+static const command_rec core_cmds[] = {
/* Old access config file commands */
@@ -2181,7 +2181,7 @@
return OK;
}
-static handler_rec core_handlers[] = {
+static const handler_rec core_handlers[] = {
{ */*, default_handler },
{ NULL }
};
1.27 +2 -2 apache-1.3/src/modules/example/mod_example.c
Index: mod_example.c
cvs commit: apache-1.3/src/support htpasswd.c
marc98/03/13 13:52:31 Modified:src/support htpasswd.c Log: Properly terminate the salt. PR: 1946 Submitted by: Matthew Reimer [EMAIL PROTECTED] Revision ChangesPath 1.12 +1 -0 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- htpasswd.c1998/02/22 21:39:34 1.11 +++ htpasswd.c1998/03/13 21:52:30 1.12 @@ -133,6 +133,7 @@ } (void) srand((int) time((time_t *) NULL)); to64(salt[0], rand(), 2); +salt[2] = '\0'; cpw = crypt(pw, salt); free(pw); fprintf(f, %s:%s\n, user, cpw);
cvs commit: apache-1.2/support htpasswd.c
marc98/03/13 13:53:47 Modified:support Tag: APACHE_1_2_X htpasswd.c Log: Properly terminate the salt. PR: 1946 Submitted by: Matthew Reimer [EMAIL PROTECTED] Revision ChangesPath No revision No revision 1.6.2.1 +1 -0 apache-1.2/support/htpasswd.c Index: htpasswd.c === RCS file: /export/home/cvs/apache-1.2/support/htpasswd.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- htpasswd.c1997/02/04 23:54:27 1.6 +++ htpasswd.c1998/03/13 21:53:46 1.6.2.1 @@ -111,6 +111,7 @@ } (void)srand((int)time((time_t *)NULL)); to64(salt[0],rand(),2); +salt[2] = '\0'; cpw = crypt(pw,salt); free(pw); fprintf(f,%s:%s\n,user,cpw);
cvs commit: apache-1.2/src CHANGES
marc98/03/13 13:55:58 Modified:src Tag: APACHE_1_2_X CHANGES Log: fresh and bare. Revision ChangesPath No revision No revision 1.286.2.78 +4 -0 apache-1.2/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v retrieving revision 1.286.2.77 retrieving revision 1.286.2.78 diff -u -r1.286.2.77 -r1.286.2.78 --- CHANGES 1998/03/05 22:54:30 1.286.2.77 +++ CHANGES 1998/03/13 21:55:57 1.286.2.78 @@ -1,5 +1,9 @@ Changes with Apache 1.2.6 + *) htpasswd now correctly terminates the salt passed to crypt(). + On some systems this caused it to generate invalid passwords. + [Matthew Reimer [EMAIL PROTECTED]] PR#1946 + *) SECURITY: UserDir /abspath without a * in the path would allow remote users to access /~.. and bypass access restrictions (but note /~../.. was handled properly).
cvs commit: apache-1.3/src Configuration.tmpl
jim 98/03/13 15:29:05 Modified:src Configuration.tmpl Log: The comments say that mod_setenvif should be last... so let's move it last. Revision ChangesPath 1.88 +7 -7 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- Configuration.tmpl1998/03/13 16:15:40 1.87 +++ Configuration.tmpl1998/03/13 23:29:05 1.88 @@ -334,13 +334,6 @@ # AddModule modules/example/mod_example.o -## mod_setenvif lets you set environment variables based on the HTTP header -## fields in the request; this is useful for conditional HTML, for example. -## Since it is also used to detect buggy browsers for workarounds, it -## should be the last (highest priority) module. - -AddModule modules/standard/mod_setenvif.o - ## mod_unique_id generates unique identifiers for each hit, which are ## available in the environment variable UNIQUE_ID. It may not work on all ## systems, hence it is not included by default. @@ -353,4 +346,11 @@ ## Don't change this entry to a 'SharedModule' variant (Bootstrapping!) # AddModule modules/standard/mod_so.o + +## mod_setenvif lets you set environment variables based on the HTTP header +## fields in the request; this is useful for conditional HTML, for example. +## Since it is also used to detect buggy browsers for workarounds, it +## should be the last (highest priority) module. + +AddModule modules/standard/mod_setenvif.o
cvs commit: apache-1.3/src/main http_main.c
jim 98/03/13 15:44:46
Modified:src Configure
src/include conf.h
src/main http_main.c
Log:
Change AUX - AUX3 to avoid conflict with 'cc'
Revision ChangesPath
1.207 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- Configure 1998/03/13 16:15:39 1.206
+++ Configure 1998/03/13 23:44:41 1.207
@@ -232,7 +232,7 @@
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
- CFLAGS=$CFLAGS -DAUX -D_POSIX_SOURCE
+ CFLAGS=$CFLAGS -DAUX3 -D_POSIX_SOURCE
LIBS=$LIBS -lposix -lbsd
LDFLAGS=$LDFLAGS -s
DEF_WANTHSREGEX=no
1.190 +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.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- conf.h1998/03/08 04:25:56 1.189
+++ conf.h1998/03/13 23:44:42 1.190
@@ -412,7 +412,7 @@
extern int strcasecmp(const char *, const char *);
extern int strncasecmp(const char *, const char *, unsigned);
-#elif defined(AUX)
+#elif defined(AUX3)
/* These are to let -Wall compile more cleanly */
extern int strcasecmp(const char *, const char *);
extern int strncasecmp(const char *, const char *, unsigned);
1.302 +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.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- http_main.c 1998/03/13 13:28:17 1.301
+++ http_main.c 1998/03/13 23:44:44 1.302
@@ -2963,7 +2963,7 @@
*/
static void common_init(void)
{
-#ifdef AUX
+#ifdef AUX3
(void) set42sig();
#endif
cvs commit: apache-1.3 STATUS
dgaudet 98/03/13 15:54:02 Modified:.STATUS Log: rfc1413 not threadsafe Revision ChangesPath 1.188 +2 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- STATUS1998/03/13 17:03:15 1.187 +++ STATUS1998/03/13 23:53:58 1.188 @@ -360,6 +360,8 @@ * do something to disable bogus warnings +* rfc1413.c has static storage which won't work multithreaded + WIN32 1.3 FINAL RELEASE SHOWSTOPPERS: * SECURITY: PR#1203 still needs to be dealt with for WIN32
