cvs commit: apachen/src/support Makefile.tmpl
coar97/11/15 11:04:54 Modified:htdocs/manual new_features_1_3.html src CHANGES Configure Makefile.tmpl src/main http_main.c src/support Makefile.tmpl Added: src/ap .cvsignore Makefile.tmpl ap_signal.c Log: Create new src/ap sibdirectory for the ap_*() routines, and tweak things to use it. So far only ap_signal() has been moved here, but that's enough to get htdigest to build. Other functions can move here over time. PR: 512, 905, 1252, 1308 Reviewed by: Dean Gaudet, Roy Fielding Revision ChangesPath 1.34 +13 -0 apachen/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html === RCS file: /export/home/cvs/apachen/htdocs/manual/new_features_1_3.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- new_features_1_3.html 1997/11/12 23:29:18 1.33 +++ new_features_1_3.html 1997/11/15 19:04:44 1.34 @@ -469,6 +469,19 @@ module has also been modified to display years using four digits in FancyIndexed directory listings. + + ap_*() Routines Moving to a Separate Library + + There are a number of functions and routines that have been developed + for the Apache project that supplement or supersede library routines + that differ from one operating system to another. While most of these + are used only by the Apache server itself, some are referenced by + supporting applications (such as htdigest), and these + other applications would fail to build because the routines were built + only into the server. These routines are now being migrated to a + separate subdirectory and library so they can be used by other + applications than just the server. + 1.513 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.512 retrieving revision 1.513 diff -u -r1.512 -r1.513 --- CHANGES 1997/11/15 03:29:55 1.512 +++ CHANGES 1997/11/15 19:04:46 1.513 @@ -1,5 +1,9 @@ Changes with Apache 1.3b3 + *) Start separating the ap_*() routines into their own library, so they + can be used by items in src/support among other things. PR#512, 905, + 1252, 1308 [Ken Coar] + *) Give a more informative error when no AuthType is set. [Lars Eilebrecht] 1.171 +2 -2 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- Configure 1997/11/08 21:47:33 1.170 +++ Configure 1997/11/15 19:04:47 1.171 @@ -26,7 +26,7 @@ tmpfile2=$tmpfile.2 tmpfile3=$tmpfile.3 awkfile=$tmpfile.4 -SUBDIRS='$(OSDIR) main modules' +SUBDIRS='$(OSDIR) main ap modules' ## Now handle any arguments, which, for now, is -file @@ -1031,7 +1031,7 @@ # # directories to create makefiles in # -MAKEDIRS="support main regex $OSDIR" +MAKEDIRS="support main ap regex $OSDIR" for dir in $MAKEDIRS ; do echo Creating Makefile in $dir cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile 1.72 +2 -1 apachen/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- Makefile.tmpl 1997/11/13 22:25:44 1.71 +++ Makefile.tmpl 1997/11/15 19:04:47 1.72 @@ -12,7 +12,8 @@ modules.o \ $(MODULES) \ main/libmain.a \ - $(OSDIR)/libos.a + $(OSDIR)/libos.a \ + ap/libap.a .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< 1.1 apachen/src/ap/.cvsignore Index: .cvsignore === Makefile 1.1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) INCDIR=../main LIB=libap.a OBJS=ap_signal.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< all: $(LIB) clean: rm -f *.o *.a $(OBJS): Makefile $(LIB): $(OBJS) ar cr $(LIB) $(OBJS) # dependencies ap_signal.o: $(INCDIR)/httpd.h 1.1 apachen/
cvs commit: apachen Announcement
jim 97/11/15 07:38:22 Modified:.Announcement Log: Includes suggestions from Marc and others Revision ChangesPath 1.4 +17 -11apachen/Announcement Index: Announcement === RCS file: /export/home/cvs/apachen/Announcement,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Announcement 1997/11/14 13:18:18 1.3 +++ Announcement 1997/11/15 15:38:21 1.4 @@ -2,30 +2,36 @@ Apache 1.3beta3 Released -The Apache Group is pleased to announce the release of the second public -beta release of Apache 1.3. +The Apache Group is pleased to announce the release of the 1.3b3 version +of Apache, the latest beta release of the Apache web server. Apache 1.3 offers numerous enhancements, improvements and performance -boosts over the 1.2 codebase. The most visible and noteworthy addition +boosts over the 1.2 code base. The most visible and noteworthy addition is the ability to run Apache under Windows 95 and NT (known as the ``Win32'' port). Apache 1.3b3 under both Win32 and UNIX has undergone extensive testing, -and is much improved over the previous 1.3b2 release. In particular, -the 1.3b2 release for Win32 was considered a ``developers version.'' -We feel pretty confident that the Win32 port is ready for a much wider -audience, and with that in mind, we are providing pre-compiled -executables for the Win32 platform. +and is much improved over the previous 1.3b2 release. In particular, the +1.3b2 release for Win32 was considered a ``developers version.'' We feel +confident that the Win32 port is ready for a wider audience, and with that +in mind, we are providing pre-compiled executables for the Win32 platform, +as well as a true Win32 environment Installer (InstallShield). This is, +however, still a beta release and there are known issues that will be +fixed before the final 1.3 release. + +Please be sure to read the CHANGES file and the "New Features with Apache +1.3" document (at http://www.apache.org/docs/new_features_1_3.html). +This is particularly important if you are using non-IP based virtual hosts. Apache has been the most popular web server on the Internet since April of 1996. The September 1997 WWW server site survey by Netcraft (see: http://www.netcraft.co.uk/Survey/) found that more web servers were -using Apache than any other software. Apache and its derivatives are run -on over 48% of all web domains on the Internet. +using Apache than any other software. Apache and its derivatives are run +on over 49% of all web domains on the Internet. The Apache project has been organized in an attempt to answer some of the concerns regarding active development of a public domain HTTP server -for UNIX. The goal of this project is to provide a secure, efficient and +for UNIX. The goal of this project is to provide a secure, efficient and extensible server which provides HTTP services in sync with the current HTTP standards.
cvs commit: apachen/src/main http_request.c
dgaudet 97/11/14 19:29:58
Modified:src CHANGES
src/main http_request.c
Log:
Lars says:
if a user tries to use authentication and forgets to set AuthType
he will the following error:
configuration error: couldn't check user. No user file?
The appended patch provides a correct error message if the
authentication failure was due to a missing AuthType directive.
Submitted by: Lars Eilebrecht
Reviewed by: Dean Gaudet, Martin Kraemer, Roy Fielding
Revision ChangesPath
1.512 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- CHANGES 1997/11/14 16:07:22 1.511
+++ CHANGES 1997/11/15 03:29:55 1.512
@@ -1,5 +1,8 @@
Changes with Apache 1.3b3
+ *) Give a more informative error when no AuthType is set.
+ [Lars Eilebrecht]
+
*) Remove strtoul() use from mod_proxy because it isn't available
on all platforms. [Marc Slemko] PR#1214
1.93 +20 -10apachen/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- http_request.c1997/11/08 21:39:11 1.92
+++ http_request.c1997/11/15 03:29:57 1.93
@@ -1065,28 +1065,38 @@
return;
}
if (some_auth_required(r)) {
-if ((access_status = check_user_id(r)) != 0) {
-decl_die(access_status, "check user. No user file?", r);
+if (((access_status = check_user_id(r)) != 0) || !auth_type(r)) {
+decl_die(access_status, auth_type(r)
+ ? "check user. No user file?"
+ : "perform authentication. AuthType not set!", r);
return;
}
-if ((access_status = check_auth(r)) != 0) {
-decl_die(access_status, "check access. No groups file?", r);
+if (((access_status = check_auth(r)) != 0) || !auth_type(r)) {
+decl_die(access_status, auth_type(r)
+ ? "check access. No groups file?"
+ : "perform authentication. AuthType not set!", r);
return;
}
}
break;
case SATISFY_ANY:
-if ((access_status = check_access(r)) != 0) {
+if (((access_status = check_access(r)) != 0) || !auth_type(r)) {
if (!some_auth_required(r)) {
-decl_die(access_status, "check access", r);
+decl_die(access_status, auth_type(r)
+ ? "check access"
+ : "perform authentication. AuthType not set!", r);
return;
}
-if ((access_status = check_user_id(r)) != 0) {
-decl_die(access_status, "check user. No user file?", r);
+if (((access_status = check_user_id(r)) != 0) || !auth_type(r)) {
+decl_die(access_status, auth_type(r)
+ ? "check user. No user file?"
+ : "perform authentication. AuthType not set!", r);
return;
}
-if ((access_status = check_auth(r)) != 0) {
-decl_die(access_status, "check access. No groups file?", r);
+if (((access_status = check_auth(r)) != 0) || !auth_type(r)) {
+decl_die(access_status, auth_type(r)
+ ? "check access. No groups file?"
+ : "perform authentication. AuthType not set!", r);
return;
}
}
cvs commit: apachen/src/main http_core.c
dgaudet 97/11/14 16:16:51
Modified:htdocs/manual/mod core.html
src/main http_core.c
Log:
Clean up check_cmd_context stuff. Fix core documentation for a few
directives.
Reviewed by: Jim Jagielski, Ken Coar, Martin Kraemer
Revision ChangesPath
1.85 +3 -3 apachen/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apachen/htdocs/manual/mod/core.html,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- core.html 1997/11/14 04:02:44 1.84
+++ core.html 1997/11/15 00:16:48 1.85
@@ -279,7 +279,7 @@
Syntax: ContentDigest on|off
Default: ContentDigest off
-Context: any
+Context: server config, virtual host, directory,
.htaccess
Override: AuthConfig
Status: experimental
Compatibility: ContentDigest is only available in Apache
1.1 and later
@@ -689,7 +689,7 @@
Syntax: HostNameLookups on | off | double
Default: HostNameLookups off
-Context: server config, virtual host
+Context: server config, virtual host, directory,
.htaccess
Status: core
Compatibility: double available only in Apache
1.3 and above.
@@ -729,7 +729,7 @@
Syntax: IdentityCheck boolean
Default: IdentityCheck off
-Context: server config, virtual host
+Context: server config, virtual host, directory,
.htaccess
Status: core
This directive enables RFC1413-compliant logging of the remote user name
1.140 +25 -24apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- http_core.c 1997/11/13 15:00:10 1.139
+++ http_core.c 1997/11/15 00:16:50 1.140
@@ -568,6 +568,7 @@
#define NOT_IN_VIRTUALHOST 0x01U /* */
#define NOT_IN_LIMIT 0x02U /* */
#define NOT_IN_DIR_LOC_FILE0x04U /* //*/
+#define GLOBAL_ONLY
(NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE)
static const char *check_cmd_context(cmd_parms *cmd, unsigned forbidden)
@@ -969,7 +970,7 @@
void *new_file_conf = create_per_dir_config (cmd->pool);
-const char *err = check_cmd_context(cmd,
NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, NOT_IN_LIMIT);
if (err != NULL) return err;
if (endp) *endp = '\0';
@@ -1069,7 +1070,7 @@
char *endp = strrchr (arg, '>');
pool *p = cmd->pool, *ptemp = cmd->temp_pool;
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
if (endp) *endp = '\0';
@@ -1108,7 +1109,7 @@
const char *add_module_command (cmd_parms *cmd, void *dummy, char *arg)
{
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
if (add_named_module (arg))
@@ -1118,7 +1119,7 @@
const char *clear_module_list_command (cmd_parms *cmd, void *dummy)
{
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
clear_module_list ();
@@ -1141,7 +1142,7 @@
const char *server_type (cmd_parms *cmd, void *dummy, char *arg)
{
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
if (!strcasecmp (arg, "inetd")) standalone = 0;
@@ -1161,7 +1162,7 @@
const char *set_send_buffer_size (cmd_parms *cmd, void *dummy, char *arg) {
int s = atoi (arg);
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
if (s < 512 && s != 0) {
@@ -1228,7 +1229,7 @@
}
const char *set_server_root (cmd_parms *cmd, void *dummy, char *arg) {
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err = check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) return err;
if (!is_directory (arg)) return "ServerRoot must be a valid directory";
@@ -1276,7 +1277,7 @@
}
const char *set_pidfile (cmd_parms *cmd, void *dummy, char *arg) {
-const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+const char *err =
