cvs commit: apache-2.0/mpm/src/mpm/prefork - New directory
jim 99/06/22 16:11:16 apache-2.0/mpm/src/mpm/prefork - New directory
cvs commit: apache-2.0/mpm/src/mpm/pthread - New directory
jim 99/06/22 16:11:17 apache-2.0/mpm/src/mpm/pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c Makefile.tmpl
manoj 99/06/22 15:26:13 Modified:mpm/src Configuration.mpm mpm/src/main alloc.c mpm/src/modules/mpm Makefile.tmpl Added: mpm/src/modules/mpm acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c Log: Add the mpmt_pthread MPM. This is a port of the hybrid server in the apache-apr repository to the MPM module system. Revision ChangesPath 1.9 +2 -0 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm === RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -u -r1.8 -r1.9 --- Configuration.mpm 1999/06/20 23:49:27 1.8 +++ Configuration.mpm 1999/06/22 22:26:10 1.9 @@ -1,3 +1,5 @@ +# Add the appropriate flags to compile threaded code when using the +# mpmt_pthread MPM (-pthread in EXTRA_CFLAGS on Linux) EXTRA_CFLAGS= -Wall EXTRA_LDFLAGS= EXTRA_LIBS= 1.4 +4 -0 apache-2.0/mpm/src/main/alloc.c Index: alloc.c === RCS file: /home/cvs/apache-2.0/mpm/src/main/alloc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- alloc.c 1999/06/20 21:46:12 1.3 +++ alloc.c 1999/06/22 22:26:10 1.4 @@ -565,6 +565,10 @@ known_stack_point = &s; stack_var_init(&s); #endif +alloc_mutex = ap_thread_mutex_new(); +#ifdef WIN32 +spawn_mutex = ap_thread_mutex_new(); +#endif permanent_pool = ap_make_root_pool(); #ifdef ALLOC_STATS atexit(dump_stats); 1.2 +15 -0 apache-2.0/mpm/src/modules/mpm/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/20 23:49:37 1.1 +++ Makefile.tmpl 1999/06/22 22:26:11 1.2 @@ -13,3 +13,18 @@ $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ $(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \ $(OSDIR)/unixd.h + +mpm_mpmt_pthread.o: mpm_mpmt_pthread.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \ + $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \ + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \ + $(OSDIR)/unixd.h $(INCDIR)/http_accept.h acceptlock.c \ + $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \ + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_vhost.h \ + $(INCDIR)/util_script.h acceptlock.h \ + http_accept.c scoreboard.c 1.1 apache-2.0/mpm/src/modules/mpm/acceptlock.c Index: acceptlock.c === /* * Copyright (c) 1995-1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *"This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/)." * * 4. The names "Apache Server" and "Apache Group" must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache" *nor may "Apache" appear in their names without prior written *permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following *acknowledgment: *"This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/)." * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPL
cvs commit: apache-1.3/src/main http_main.c
randy 99/06/22 14:55:31
Modified:src CHANGES Configure
src/helpers TestCompile
Log:
Add support for DSO on DGUX using gcc. Tested on x86 platforms.
Revision ChangesPath
1.1384+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1383
retrieving revision 1.1384
diff -u -r1.1383 -r1.1384
--- CHANGES 1999/06/22 00:51:26 1.1383
+++ CHANGES 1999/06/22 21:54:41 1.1384
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add DSO support for DGUX 4.x using gcc. Tested on x86 platforms.
+ [Randy Terbush <[EMAIL PROTECTED]>]
+
*) Add the new mass-vhost module (mod_vhost_alias.c) developed and
used by Demon Internet, LTD. [Tony Finch <[EMAIL PROTECTED]>]
1.356 +12 -3 apache-1.3/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- Configure 1999/06/18 07:53:38 1.355
+++ Configure 1999/06/22 21:54:42 1.356
@@ -1190,6 +1190,14 @@
SHCORE_IMPLIB='ApacheCoreOS2.a'
OS_MODULE_INCLUDE='Makefile.OS2'
;;
+ *-dgux)
+ case $CC in
+ */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
+ esac
+ DEF_SHARED_CORE=yes
+ LDFLAGS_SHLIB="-G"
+ LDFLAGS_SHLIB_EXPORT=""
+;;
*)
## ok, no known explict support for shared objects
## on this platform, but we give not up immediately.
@@ -1358,11 +1366,12 @@
*-dg-dgux*)
# R4.11MU02 requires -lsocket -lnsl ... no idea if it's earlier or
# later than what we already knew about. PR#732
- if ./helpers/TestCompile lib socket; then
- LIBS="$LIBS -lsocket"
- fi
if ./helpers/TestCompile lib nsl; then
LIBS="$LIBS -lnsl"
+ TLIB='-lnsl'
+ fi
+ if TLIB=$TLIB ./helpers/TestCompile lib socket; then
+ LIBS="-lsocket $LIBS"
fi
;;
esac
1.32 +1 -1 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestCompile 1999/06/09 10:45:02 1.31
+++ TestCompile 1999/06/22 21:54:54 1.32
@@ -77,7 +77,7 @@
if [ "x$2" = "x" ]; then
exit
fi
- TLIB="-l$2"
+ TLIB="-l$2 $TLIB"
if [ "x$VERBOSE" = "xyes" ]; then
ERRDIR=""
else
Modified:src/main http_main.c
Log:
Add some more debug info.
Revision ChangesPath
1.448 +4 -4 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- http_main.c 1999/06/22 00:51:30 1.447
+++ http_main.c 1999/06/22 21:55:25 1.448
@@ -3660,7 +3660,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -3673,7 +3673,7 @@
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -4823,7 +4823,7 @@
if (setuid(ap_user_id) == -1) {
GETUSERMODE();
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
GETUSERMODE();
@@ -4832,7 +4832,7 @@
/* Only try to switch if we're running as root */
if (!geteuid() && setuid(ap_user_id) == -1) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change uid");
+ "setuid: unable to change to uid: %d", ap_user_id);
exit(1);
}
#endif
cvs commit: apache-1.3/htdocs/manual/mod mod_headers.html
coar99/06/22 14:17:37 Modified:htdocs/manual/mod mod_headers.html Log: 'Header Unset' really unsets all values for the field, not just the first. Submitted by: Robin Langford <[EMAIL PROTECTED]> Reviewed by: Ken Coar Revision ChangesPath 1.10 +1 -1 apache-1.3/htdocs/manual/mod/mod_headers.html Index: mod_headers.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_headers.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mod_headers.html 1998/05/20 14:12:56 1.9 +++ mod_headers.html 1999/06/22 21:17:35 1.10 @@ -75,7 +75,7 @@ unset The response header of this name is removed, if it exists. If there are - multiple headers of the same name, only the first one set will be removed. + multiple headers of the same name, all will be removed. This argument is followed by a header name, which can include the
cvs commit: apache-apr/include apr_errno.h apr_lock.h apr_network_io.h apr_thread_proc.h apr_time.h
rbb 99/06/22 09:57:42
Modified:apr/locks/unix locks.c
apr/network_io/unix poll.c sockets.c
apr/threadproc/unix procsup.c thread.c threadpriv.c
apr/time/unix access.c
include apr_errno.h apr_lock.h apr_network_io.h
apr_thread_proc.h apr_time.h
Log:
The rest of the functions needed to allow APR users to access the data field
of each APR type.
Revision ChangesPath
1.10 +35 -0 apache-apr/apr/locks/unix/locks.c
Index: locks.c
===
RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- locks.c 1999/06/22 14:56:29 1.9
+++ locks.c 1999/06/22 16:57:29 1.10
@@ -142,3 +142,38 @@
return APR_SUCCESS;
}
+/* ***APRDOC
+ * ap_status_t ap_get_lockdata(ap_lock_t *, void *)
+ *Return the context associated with the current lock.
+ * arg 1) The currently open lock.
+ * arg 2) The user data associated with the lock.
+ */
+ap_status_t ap_get_lockdata(struct lock_t *lock, void *data)
+{
+if (lock != NULL) {
+return ap_get_userdata(lock->cntxt, &data);
+}
+else {
+data = NULL;
+return APR_ENOLOCK;
+}
+}
+
+/* ***APRDOC
+ * ap_status_t ap_set_lockdata(ap_lock_t *, void *)
+ *Return the context associated with the current lock.
+ * arg 1) The currently open lock.
+ * arg 2) The user data to associate with the lock.
+ */
+ap_status_t ap_set_lockdata(struct lock_t *lock, void *data)
+{
+if (lock != NULL) {
+return ap_set_userdata(lock->cntxt, data);
+}
+else {
+data = NULL;
+return APR_ENOLOCK;
+}
+}
+
+
1.14 +36 -0 apache-apr/apr/network_io/unix/poll.c
Index: poll.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/poll.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- poll.c1999/06/16 11:15:59 1.13
+++ poll.c1999/06/22 16:57:30 1.14
@@ -291,3 +291,39 @@
}
#endif
+
+/* ***APRDOC
+ * ap_status_t ap_get_polldata(ap_pollfd_t *, void *)
+ *Return the context associated with the current poll.
+ * arg 1) The currently open pollfd.
+ * arg 2) The user data associated with the pollfd.
+ */
+ap_status_t ap_get_polldata(struct pollfd_t *pollfd, void *data)
+{
+if (pollfd != NULL) {
+return ap_get_userdata(pollfd->cntxt, &data);
+}
+else {
+data = NULL;
+return APR_ENOFILE;
+}
+}
+
+/* ***APRDOC
+ * ap_status_t ap_set_polldata(ap_pollfd_t *, void *)
+ *Return the context associated with the current poll.
+ * arg 1) The currently open pollfd.
+ * arg 2) The user data to associate with the pollfd.
+ */
+ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data)
+{
+if (pollfd != NULL) {
+return ap_set_userdata(pollfd->cntxt, data);
+}
+else {
+data = NULL;
+return APR_ENOFILE;
+}
+}
+
+
1.20 +35 -0 apache-apr/apr/network_io/unix/sockets.c
Index: sockets.c
===
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockets.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sockets.c 1999/06/02 18:44:53 1.19
+++ sockets.c 1999/06/22 16:57:31 1.20
@@ -207,3 +207,38 @@
}
}
+/* ***APRDOC
+ * ap_status_t ap_get_socketdata(ap_socket_t *, void *)
+ *Return the context associated with the current socket.
+ * arg 1) The currently open socket.
+ * arg 2) The user data associated with the socket.
+ */
+ap_status_t ap_get_socketdata(struct socket_t *socket, void *data)
+{
+if (socket != NULL) {
+return ap_get_userdata(socket->cntxt, &data);
+}
+else {
+data = NULL;
+return APR_ENOSOCKET;
+}
+}
+
+/* ***APRDOC
+ * ap_status_t ap_set_socketdata(ap_socket_t *, void *)
+ *Return the context associated with the current socket.
+ * arg 1) The currently open socket.
+ * arg 2) The user data to associate with the socket.
+ */
+ap_status_t ap_set_socketdata(struct socket_t *socket, void *data)
+{
+if (socket != NULL) {
+return ap_set_userdata(socket->cntxt, data);
+}
+else {
+
cvs commit: apache-1.3/src/modules/standard mod_vhost_alias.c
coar99/06/22 08:33:20
Modified:src Configuration.tmpl
src/main http_core.c
src/modules/standard mod_vhost_alias.c
Log:
Jim beat me to the server_rec and ap_mmn fixes, so what's left
here is just some cleanup from the new module addition; be
consistent and stylish. Oh, and fix the location in the
Configuration.tmpl file.
Revision ChangesPath
1.117 +1 -1 apache-1.3/src/Configuration.tmpl
Index: Configuration.tmpl
===
RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Configuration.tmpl1999/06/22 00:51:27 1.116
+++ Configuration.tmpl1999/06/22 15:33:10 1.117
@@ -219,7 +219,7 @@
## based on the host header or local IP address of the request.
## See "../htdocs/manual/vhosts/mass.html".
-# AddModule modules/extra/mod_vhost_alias.o
+# AddModule modules/standard/mod_vhost_alias.o
##
## Config manipulation modules
1.266 +10 -7 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- http_core.c 1999/06/22 00:51:30 1.265
+++ http_core.c 1999/06/22 15:33:14 1.266
@@ -696,11 +696,14 @@
struct in_addr *iaddr;
struct hostent *hptr;
int old_stat;
- old_stat = ap_update_child_status(conn->child_num, SERVER_BUSY_DNS,
r);
+ old_stat = ap_update_child_status(conn->child_num,
+ SERVER_BUSY_DNS, r);
iaddr = &(conn->local_addr.sin_addr);
- hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr),
AF_INET);
+ hptr = gethostbyaddr((char *)iaddr, sizeof(struct in_addr),
+ AF_INET);
if (hptr != NULL) {
- conn->local_host = ap_pstrdup(conn->pool, (void *)hptr->h_name);
+ conn->local_host = ap_pstrdup(conn->pool,
+ (void *)hptr->h_name);
ap_str_tolower(conn->local_host);
}
else {
@@ -724,7 +727,7 @@
port = r->server->port ? r->server->port : ap_default_port(r);
if (d->use_canonical_name == USE_CANONICAL_NAME_OFF
- || d->use_canonical_name == USE_CANONICAL_NAME_DNS) {
+ || d->use_canonical_name == USE_CANONICAL_NAME_DNS) {
return r->hostname ? ntohs(r->connection->local_addr.sin_port)
: port;
}
@@ -2144,13 +2147,13 @@
return err;
}
-if (!strcasecmp(arg, "on")) {
+if (strcasecmp(arg, "on") == 0) {
d->use_canonical_name = USE_CANONICAL_NAME_ON;
}
-else if (!strcasecmp(arg, "off")) {
+else if (strcasecmp(arg, "off") == 0) {
d->use_canonical_name = USE_CANONICAL_NAME_OFF;
}
-else if (!strcasecmp(arg, "dns")) {
+else if (strcasecmp(arg, "dns") == 0) {
d->use_canonical_name = USE_CANONICAL_NAME_DNS;
}
else {
1.2 +116 -75 apache-1.3/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_vhost_alias.c 1999/06/22 00:51:38 1.1
+++ mod_vhost_alias.c 1999/06/22 15:33:17 1.2
@@ -82,26 +82,30 @@
module MODULE_VAR_EXPORT vhost_alias_module;
-/* basic configuration things */
+/*
+ * basic configuration things
+ * we abbreviate "mod_vhost_alias" to "mva" for shorter names
+ */
typedef enum {
VHOST_ALIAS_UNSET, VHOST_ALIAS_NONE, VHOST_ALIAS_NAME, VHOST_ALIAS_IP
-} vhost_alias_mode;
+} mva_mode_e;
-typedef struct vhost_alias_server_conf {
+/*
+ * Per-server module config record.
+ */
+typedef struct mva_sconf_t {
char *doc_root;
char *cgi_root;
-vhost_alias_mode doc_root_mode;
-vhost_alias_mode cgi_root_mode;
-} vhost_alias_server_conf;
-
+mva_mode_e doc_root_mode;
+mva_mode_e cgi_root_mode;
+} mva_sconf_t;
-static void *vhost_alias_create_config(pool *p, server_rec *s)
+static void *mva_create_server_config(pool *p, server_rec *s)
{
-vhost_alias_server_conf *conf =
- (vhost_alias_server_conf *)
- ap_pcalloc(p, sizeof(vhost_alias_server_conf));
+mva_sconf_t *conf;
+conf = (mva_sconf_t *) ap_pcalloc(p, sizeof(mva_sconf_t));
conf->doc_root = NULL;
conf->cgi_root = NULL;
conf->doc
cvs commit: apache-1.3/src/include ap_mmn.h httpd.h
jim 99/06/22 08:22:15 Modified:src/include ap_mmn.h httpd.h Log: MMN bump and change of location for local_ip and local_host slots Revision ChangesPath 1.38 +2 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ap_mmn.h 1999/06/04 18:30:22 1.37 +++ ap_mmn.h 1999/06/22 15:22:14 1.38 @@ -219,6 +219,7 @@ *export ap_add_file_conf * 19990320.3 - add ap_regexec() * 19990604.4 - add ap_field_noparam() + * 19990621.5 - add local_ip/host to conn_rec for mass-vhost */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */ @@ -226,7 +227,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.283 +4 -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.282 retrieving revision 1.283 diff -u -r1.282 -r1.283 --- httpd.h 1999/06/22 00:51:29 1.282 +++ httpd.h 1999/06/22 15:22:14 1.283 @@ -827,10 +827,6 @@ * "" if it has and no address was found. * N.B. Only access this though * get_remote_host() */ -char *local_ip; /* server IP address */ -char *local_host;/* used for ap_get_server_name when - * UseCanonicalName is set to DNS - * (ignores setting of HostnameLookups) */ char *remote_logname;/* Only ever set if doing rfc1413 lookups. * N.B. Only access this through * get_remote_logname() */ @@ -847,6 +843,10 @@ signed int double_reverse:2;/* have we done double-reverse DNS? * -1 yes/failure, 0 not yet, 1 yes/success */ int keepalives; /* How many times have we used it? */ +char *local_ip; /* server IP address */ +char *local_host;/* used for ap_get_server_name when + * UseCanonicalName is set to DNS + * (ignores setting of HostnameLookups) */ }; /* Per-vhost config... */
cvs commit: apache-apr/apr/locks/unix crossproc.c locks.c
rbb 99/06/22 07:56:31
Modified:apr/locks/unix crossproc.c locks.c
Log:
Adding new function to bring UNIX up to par with Windows.
Revision ChangesPath
1.9 +32 -0 apache-apr/apr/locks/unix/crossproc.c
Index: crossproc.c
===
RCS file: /home/cvs/apache-apr/apr/locks/unix/crossproc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- crossproc.c 1999/06/15 19:43:35 1.8
+++ crossproc.c 1999/06/22 14:56:29 1.9
@@ -127,6 +127,12 @@
}
return stat;
}
+
+ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t
**lock)
+{
+return APR_SUCCESS;
+}
+
#elif defined (USE_PROC_PTHREAD_SERIALIZE)
ap_status_t lock_cleanup(struct lock_t *lock)
@@ -216,6 +222,11 @@
return stat;
}
+ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t
**lock)
+{
+return APR_SUCCESS;
+}
+
#elif defined (USE_FCNTL_SERIALIZE)
ap_status_t lock_cleanup(struct lock_t *lock)
@@ -283,6 +294,11 @@
return stat;
}
+ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t
**lock)
+{
+return APR_SUCCESS;
+}
+
#elif defined (USE_FLOCK_SERIALIZE)
ap_status_t lock_cleanup(struct lock_t *lock)
{
@@ -336,10 +352,26 @@
}
return stat;
}
+
+ap_status_t child_init_lock(ap_context_t *cont, char *fname, struct lock_t
**lock)
+{
+struct lock_t *new;
+
+new = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
+
+new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
+if (new->interproc == -1) {
+destroy_inter_lock(new);
+return errno;
+}
+return APR_SUCCESS;
+}
+
#else
/* No inter-process mutex on this platform. Use at your own risk */
#define create_inter_lock(x, y)
#define lock_inter(x, y)
#define unlock_inter(x, y)
#define destroy_inter_lock(x, y)
+#define child_init_lock(x, y, z)
#endif
1.9 +10 -0 apache-apr/apr/locks/unix/locks.c
Index: locks.c
===
RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- locks.c 1999/06/02 18:44:41 1.8
+++ locks.c 1999/06/22 14:56:29 1.9
@@ -131,4 +131,14 @@
return APR_SUCCESS;
}
+ap_status_t ap_child_init_lock(ap_context_t *cont, char *fname, struct
lock_t **lock)
+{
+ap_status_t stat;
+if ((*lock)->type != APR_CROSS_PROCESS) {
+if ((stat = child_init_lock(cont, fname, lock)) != APR_SUCCESS) {
+return stat;
+}
+}
+return APR_SUCCESS;
+}
cvs commit: apache-1.3 STATUS
rse 99/06/22 02:11:55 Modified:.STATUS Log: EAPI answer Revision ChangesPath 1.720 +7 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.719 retrieving revision 1.720 diff -u -r1.719 -r1.720 --- STATUS1999/06/22 00:51:21 1.719 +++ STATUS1999/06/22 09:11:53 1.720 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/22 00:51:21 $] + Last modified at [$Date: 1999/06/22 09:11:53 $] Release: @@ -106,9 +106,14 @@ Randy +1 (please choose name other than "hook") Doug +1 on concept (untested), Lars +1 on concept, Martin +1 (untested), - Ken -1 for pre-2.0 if it will: a) force a new release of + + Ken: -1 for pre-2.0 if it will: a) force a new release of mod_perl or mod_php in order to maintain compatibility OR b) require a version bump to 1.4.0 and a beta cycle +Ralf: It doesn't force a new release of any module (just a +recompilation), because it's a pure _ADDITION_ to the API and +doesn't make anything incompatible. The point b) I still do +not sunderstand, sorry. * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598)
cvs commit: apache-1.3/htdocs/manual/mod core.html
jim 99/06/21 18:11:13 Modified:htdocs/manual/mod core.html Log: Minor nit. There are 3 options now :) Revision ChangesPath 1.152 +1 -1 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.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- core.html 1999/06/22 00:51:23 1.151 +++ core.html 1999/06/22 01:11:09 1.152 @@ -3105,7 +3105,7 @@ UseCanonicalName directive -Syntax: UseCanonicalName on|off +Syntax: UseCanonicalName on|off|dns Default: UseCanonicalName on
cvs commit: apache-1.3/src/support suexec.c
jim 99/06/21 17:51:44
Modified:.STATUS
htdocs/manual/mod core.html index.html mod_log_config.html
mod_rewrite.html
htdocs/manual/vhosts mass.html
src CHANGES Configuration.tmpl
src/include http_core.h httpd.h
src/main http_core.c http_main.c util_script.c
src/modules/standard mod_log_config.c mod_rewrite.c
src/support suexec.c
Added: htdocs/manual/mod mod_vhost_alias.html
src/modules/standard mod_vhost_alias.c
Log:
Submitted by: Tony Finch <[EMAIL PROTECTED]>
Reviewed by:Dean, Randy, Jim, Lars, Martin
Add the new mod_vhost_alias.c modules for better mass-hosting. This
has been used at Demon Internet with excellent results and basically
replaces the "old" method of using mod_rewrite. Big advantage is
that adding new vhosts can be done without restarting the server.
Revision ChangesPath
1.719 +1 -9 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -r1.718 -r1.719
--- STATUS1999/06/21 21:41:37 1.718
+++ STATUS1999/06/22 00:51:21 1.719
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/06/21 21:41:37 $]
+ Last modified at [$Date: 1999/06/22 00:51:21 $]
Release:
@@ -109,14 +109,6 @@
Ken -1 for pre-2.0 if it will: a) force a new release of
mod_perl or mod_php in order to maintain compatibility OR
b) require a version bump to 1.4.0 and a beta cycle
-
-* Tony Finch's patch to support mass virtual hosting
- Message-ID: <[EMAIL PROTECTED]>
- Message-ID: <[EMAIL PROTECTED]>
- Message-ID: <[EMAIL PROTECTED]>
- Status: Dean +1, Randy +1, Jim +1, Lars +1, Martin +1 (untested)
- Previous Status: Dean +1, Randy +1, Jim +1,
- Lars +1 (if someone writes the docs)
* Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
(PR#2598)
1.151 +7 -2 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.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- core.html 1999/06/17 11:49:26 1.150
+++ core.html 1999/06/22 00:51:23 1.151
@@ -3109,8 +3109,7 @@
Default: UseCanonicalName on
-Context: server config, virtual host, directory,
.htaccess
-
+Context: server config, virtual host
Override: Options
@@ -3144,6 +3143,12 @@
for www and once again for www.domain.com).
But if UseCanonicalName is set off, then Apache will redirect
to http://www/splat/.
+
+There is a third option, UseCanonicalName DNS, which
+is intended for use with mass IP-based virtual hosting to support
+ancient clients that do not provide a Host: header. With
+this option Apache does a reverse DNS lookup on the server IP address
+that the client connected to in order to work out self-referential URLs.
Warning: if CGIs make assumptions about the values of
SERVER_NAME they may be broken by this option. The client
1.27 +2 -0 apache-1.3/htdocs/manual/mod/index.html
Index: index.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/index.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- index.html1998/04/03 16:07:14 1.26
+++ index.html1999/06/22 00:51:23 1.27
@@ -113,6 +113,8 @@
Generate unique request identifier for every request
mod_usertrack Apache 1.2 and up
User tracking using Cookies (replacement for mod_cookies.c)
+mod_vhost_alias Apache 1.3.7 and up
+Support for dynamically configured mass virtual hosting
1.34 +1 -0 apache-1.3/htdocs/manual/mod/mod_log_config.html
Index: mod_log_config.html
===
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_log_config.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_log_config.html 1999/05/16 23:39:42 1.33
+++ mod_log_config.html 1999/06/22 00:51:23 1.34
@@ -126,6 +126,7 @@
%...{FOOBAR}e: The contents of the environment variable FOOBAR
%...h: Remote host
%...a: Remote IP-address
+%...A: Local IP-address
%...{Foobar}i: The contents of Foobar: header line(s) in the request
sent to the server.
%...l: Remote logname (from identd, if supplied)
