cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_prefork Makefile.libdir Makefile.tmpl mpm_prefork.c
jim 99/06/23 16:01:30 Removed: mpm/src/modules/mpm/mpm_mpmt_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c mpm/src/modules/mpm/mpm_prefork Makefile.libdir Makefile.tmpl mpm_prefork.c Log: Wait until Dean is done until we move. Reverse stuff done right in the middle
cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_mpmt_pthread - New directory
jim 99/06/23 15:34:44 apache-2.0/mpm/src/modules/mpm/mpm_mpmt_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm/mpm_prefork - New directory
jim 99/06/23 15:34:43 apache-2.0/mpm/src/modules/mpm/mpm_prefork - New directory
cvs commit: apache-apr/apr/file_io/win32 pipe.c readwrite.c
rbb 99/06/23 14:09:19
Modified:apr/file_io/win32 pipe.c readwrite.c
Log:
This gets pipes working again.
Revision ChangesPath
1.2 +1 -1 apache-apr/apr/file_io/win32/pipe.c
Index: pipe.c
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/pipe.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipe.c1999/06/03 19:43:45 1.1
+++ pipe.c1999/06/23 21:09:18 1.2
@@ -73,7 +73,7 @@
(*out)->cntxt = cont;
(*out)->fname = ap_pstrdup(cont, "PIPE");
-if (CreatePipe((*in)->filehand, (*out)->filehand, NULL, 0) == -1) {
+if (CreatePipe(&(*in)->filehand, &(*out)->filehand, NULL, 0) == -1) {
return errno;
}
1.2 +3 -1 apache-apr/apr/file_io/win32/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/readwrite.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readwrite.c 1999/06/03 19:43:45 1.1
+++ readwrite.c 1999/06/23 21:09:18 1.2
@@ -63,17 +63,19 @@
ap_status_t ap_read(const struct file_t *thefile, void *buf, ap_ssize_t
*nbytes)
{
DWORD bread;
+int lasterror;
if (thefile->filehand == INVALID_HANDLE_VALUE) {
*nbytes = -1;
return APR_EBADF;
}
-if (ReadFile(thefile->filehand, buf, *nbytes, &bread, NULL)) {\
+if (ReadFile(thefile->filehand, buf, *nbytes, &bread, NULL)) {
*nbytes = bread;
return APR_SUCCESS;
}
*nbytes = -1;
+lasterror = GetLastError();
return APR_EEXIST;
}
cvs commit: apache-apr/pthreads/src/main acceptlock.c
manoj 99/06/23 12:13:06 Modified:pthreads/src/main acceptlock.c Log: fdqueue.h isn't needed here Revision ChangesPath 1.11 +0 -1 apache-apr/pthreads/src/main/acceptlock.c Index: acceptlock.c === RCS file: /home/cvs/apache-apr/pthreads/src/main/acceptlock.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -u -r1.10 -r1.11 --- acceptlock.c 1999/06/10 06:26:05 1.10 +++ acceptlock.c 1999/06/23 19:13:00 1.11 @@ -66,7 +66,6 @@ #include "http_vhost.h" #include "util_script.h" /* to force util_script.c linking */ #include "util_uri.h" -#include "fdqueue.h" #include "acceptlock.h" #include "http_accept.h" #include
cvs commit: apache-1.3/htdocs/manual/mod mod_vhost_alias.html
coar99/06/23 11:24:04 Modified:src CHANGES htdocs/manual/mod mod_vhost_alias.html Log: Fix some docco. Submitted by: Tony Finch <[EMAIL PROTECTED]> Reviewed by: Ken Coar Revision ChangesPath 1.1385+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1384 retrieving revision 1.1385 diff -u -r1.1384 -r1.1385 --- CHANGES 1999/06/22 21:54:41 1.1384 +++ CHANGES 1999/06/23 18:24:01 1.1385 @@ -4,7 +4,7 @@ [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]>] + used by Demon Internet, Ltd. [Tony Finch <[EMAIL PROTECTED]>] *) Better GCC detection for DSO flags under Solaris 2 where the `cc' command potentially _is_ GCC. [Ralf S. Engelschall] 1.2 +1 -1 apache-1.3/htdocs/manual/mod/mod_vhost_alias.html Index: mod_vhost_alias.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_vhost_alias.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_vhost_alias.html 1999/06/22 00:51:24 1.1 +++ mod_vhost_alias.html 1999/06/23 18:24:03 1.2 @@ -110,7 +110,7 @@ A more even spread of files can be acheived by hashing from the end of the name, for example: - VirtualDocumentRoot /u/%3+/%2.-1/%2.-2/%2.-3/%2 + VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2 The example request would come from /usr/local/apache/vhosts/isp.com/e/l/p/example/directory/file.html.
cvs commit: apache-apr/apr/signal/unix - New directory
rbb 99/06/23 08:20:17 apache-apr/apr/signal/unix - New directory
cvs commit: apache-apr/apr/signal - New directory
rbb 99/06/23 08:17:41 apache-apr/apr/signal - New directory
cvs commit: apache-apr/apr/time/win32 access.c time.def
rbb 99/06/23 08:00:12
Modified:apr/file_io/win32 file_io.def fileacc.c
apr/locks/win32 locks.c locks.def
apr/misc/win32 misc.def start.c
apr/network_io/win32 network_io.def poll.c sockets.c
apr/threadproc/win32 proc.c thread.c threadpriv.c
threadproc.def
apr/time/win32 access.c time.def
Log:
Bring Windows up to Unix so we can get user data on both systems.
Revision ChangesPath
1.3 +2 -0 apache-apr/apr/file_io/win32/file_io.def
Index: file_io.def
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/file_io.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_io.def 1999/06/15 17:43:06 1.2
+++ file_io.def 1999/06/23 15:00:06 1.3
@@ -29,5 +29,7 @@
ap_read @22
ap_write @23
ap_seek @24
+ap_get_filedata @25
+ap_set_filedata @26
1.2 +21 -0 apache-apr/apr/file_io/win32/fileacc.c
Index: fileacc.c
===
RCS file: /home/cvs/apache-apr/apr/file_io/win32/fileacc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fileacc.c 1999/06/03 19:43:44 1.1
+++ fileacc.c 1999/06/23 15:00:06 1.2
@@ -163,3 +163,24 @@
}
}
+ap_status_t ap_get_filedata(struct file_t *file, void *data)
+{
+if (file != NULL) {
+return ap_get_userdata(file->cntxt, &data);
+}
+else {
+data = NULL;
+return APR_ENOFILE;
+}
+}
+
+ap_status_t ap_set_filedata(struct file_t *file, void *data)
+{
+if (file != NULL) {
+return ap_set_userdata(file->cntxt, data);
+}
+else {
+data = NULL;
+return APR_ENOFILE;
+}
+}
1.2 +20 -0 apache-apr/apr/locks/win32/locks.c
Index: locks.c
===
RCS file: /home/cvs/apache-apr/apr/locks/win32/locks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.c 1999/06/18 19:10:59 1.1
+++ locks.c 1999/06/23 15:00:07 1.2
@@ -131,4 +131,24 @@
return APR_SUCCESS;
}
+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;
+}
+}
+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.2 +2 -0 apache-apr/apr/locks/win32/locks.def
Index: locks.def
===
RCS file: /home/cvs/apache-apr/apr/locks/win32/locks.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.def 1999/06/18 19:10:59 1.1
+++ locks.def 1999/06/23 15:00:07 1.2
@@ -10,3 +10,5 @@
ap_unlock @3
ap_destroy_lock @4
ap_child_init_lock @5
+ap_get_lockdata @6
+ap_set_lockdata @7
1.3 +2 -0 apache-apr/apr/misc/win32/misc.def
Index: misc.def
===
RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.def 1999/06/02 19:51:48 1.2
+++ misc.def 1999/06/23 15:00:08 1.3
@@ -13,3 +13,5 @@
ap_destroy_context @6
WinTimeToUnixTime @7
ap_get_oslevel @8
+ap_get_userdata @9
+ap_set_userdata @10
\ No newline at end of file
1.5 +18 -0 apache-apr/apr/misc/win32/start.c
Index: start.c
===
RCS file: /home/cvs/apache-apr/apr/misc/win32/start.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start.c 1999/06/15 17:43:16 1.4
+++ start.c 1999/06/23 15:00:08 1.5
@@ -176,3 +176,21 @@
return APR_EEXIST;
}
+ap_status_t ap_set_userdata(struct context_t *cont, void *data)
+{
+if (cont) {
+cont->prog_data = data;
+return APR_SUCCESS;
+}
+return APR_ENOCONT;
+}
+
+ap_status_t ap_get_userdata(struct context_t *cont, void **data)
+{
+if (cont) {
+(*data) = cont->prog_data;
+return APR_SUCCESS;
+}
+return APR_ENOCONT;
+}
+
1.2 +4 -0 apache-apr/apr/network_io/win32/network_io.def
Index: network
cvs commit: apache-2.0/mpm/src CHANGES
manoj 99/06/23 00:17:19 Modified:mpm/src CHANGES Log: Note the presence of mpm_mpmt_pthread Revision ChangesPath 1.10 +3 -0 apache-2.0/mpm/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -u -r1.9 -r1.10 --- CHANGES 1999/06/23 00:28:10 1.9 +++ CHANGES 1999/06/23 07:17:16 1.10 @@ -4,6 +4,9 @@ subdir in src/modules (eg: src/modules/mpm_prefork). Selection of method uses Rule MPM_METHOD. [Jim Jagielski] +* Port the hybrid server from the apache-apr repository as + mpm_mpmt_pthread [Manoj Kasichainula] + * os/unix/unixd.[ch]: detach, setuid, setgid, stuff which will be common amongst the unix MPMs
cvs commit: apache-1.3/htdocs/manual dso.html
rse 99/06/22 23:55:26 Modified:.INSTALL htdocs/manual dso.html Log: Add DGUX... Revision ChangesPath 1.57 +1 -1 apache-1.3/INSTALL Index: INSTALL === RCS file: /home/cvs/apache-1.3/INSTALL,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- INSTALL 1999/05/17 08:16:00 1.56 +++ INSTALL 1999/06/23 06:55:25 1.57 @@ -83,7 +83,7 @@ - FreeBSD - Solaris - AIX - Mac OS - OpenBSD - IRIX - SCO - OpenStep/Mach - NetBSD- HPUX - ReliantUNIX - - BSDI - Digital Unix + - BSDI - Digital Unix - DGUX o Entirely unsupported platforms are: - Ultrix 1.14 +1 -0 apache-1.3/htdocs/manual/dso.html Index: dso.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/dso.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dso.html 1999/05/17 08:16:02 1.13 +++ dso.html 1999/06/23 06:55:25 1.14 @@ -192,6 +192,7 @@ o Mac OS X Server(1.0) o Mac OS (10.0 preview 1) o OpenStep/Mach (4.2) +o DGUX (??)
cvs commit: apache-2.0/mpm/src/modules/mpm_mpmt_pthread Makefile.tmpl
jim 99/06/22 17:42:32 Modified:mpm/src Configuration.mpm mpm/src/modules/mpm_mpmt_pthread Makefile.tmpl Log: Final commit for name Revision ChangesPath 1.10 +3 -0 apache-2.0/mpm/src/Configuration.mpm Index: Configuration.mpm === RCS file: /export/home/cvs/apache-2.0/mpm/src/Configuration.mpm,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Configuration.mpm 1999/06/22 22:26:10 1.9 +++ Configuration.mpm 1999/06/23 00:42:25 1.10 @@ -24,6 +24,9 @@ Rule EXPAT=no Rule WANTHSREGEX=default Rule MPM_METHOD=default +#Rule MPM_METHOD=prefork +#Rule MPM_METHOD=mpmt_pthread +# # AddModule modules/experimental/mod_mmap_static.o AddModule modules/standard/mod_env.o AddModule modules/standard/mod_log_config.o 1.2 +5 -5 apache-2.0/mpm/src/modules/mpm_mpmt_pthread/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-2.0/mpm/src/modules/mpm_mpmt_pthread/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/23 00:28:24 1.1 +++ Makefile.tmpl 1999/06/23 00:42:30 1.2 @@ -1,5 +1,5 @@ -LIB=libmpm_pthread.$(LIBEXT) +LIB=libmpm_mpmt_pthread.$(LIBEXT) OBJS=\ mpm_mpmt_pthread.o acceptlock.o http_accept.o scoreboard.o @@ -10,18 +10,18 @@ lib: $(LIB) -libmpm_pthread.a: $(OBJS) +libmpm_mpmt_pthread.a: $(OBJS) rm -f $@ ar cr $@ $(OBJS) $(RANLIB) $@ -libmpm_pthread.so: $(OBJS_PIC) +libmpm_mpmt_pthread.so: $(OBJS_PIC) rm -f $@ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(LIBS_SHLIB) -libmpm_pthread.dll: $(OBJS_PIC) mpm_pthread.def +libmpm_mpmt_pthread.dll: $(OBJS_PIC) mpm_mpmt_pthread.def $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $* $(OBJS_PIC) $(LIBS_SHLIB) - emxbind -b -q -s -h0 -dmpm_pthread.def $* && \ + emxbind -b -q -s -h0 -dmpm_mpmt_pthread.def $* && \ rm $* .SUFFIXES: .o .lo .dll
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c
jim 99/06/22 17:39:12 Removed: mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c Log: Arg! Force name change
cvs commit: apache-2.0/mpm/src/modules/mpm_mpmt_pthread - New directory
jim 99/06/22 17:36:18 apache-2.0/mpm/src/modules/mpm_mpmt_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c mpm_prefork.c scoreboard.c
jim 99/06/22 17:30:41 Removed: mpm/src/modules/mpm Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c mpm_prefork.c scoreboard.c Log: Finish up... Moving the pthread and prefork was easier with the amount of changes
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl acceptlock.c acceptlock.h http_accept.c mpm_mpmt_pthread.c scoreboard.c
jim 99/06/22 17:28:26
Modified:mpm/src CHANGES Configure
Added: mpm/src/modules/mpm_prefork Makefile.libdir Makefile.tmpl
mpm_prefork.c
mpm/src/modules/mpm_pthread Makefile.libdir Makefile.tmpl
acceptlock.c acceptlock.h http_accept.c
mpm_mpmt_pthread.c scoreboard.c
Log:
Implement MPM methods as modules. Having src/modules/mpm/prefork,
for example, would be better, but would require work on Configure
that could be better spent elsewhere. Instead, we have, eg,
src/modules/mpm_prefork (or whatever).
Revision ChangesPath
1.9 +4 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CHANGES 1999/06/20 22:59:49 1.8
+++ CHANGES 1999/06/23 00:28:10 1.9
@@ -1,5 +1,9 @@
Changes with MPM
+* Implement mpm_* methods as "modules". Each method gets it's own
+ subdir in src/modules (eg: src/modules/mpm_prefork). Selection
+ of method uses Rule MPM_METHOD. [Jim Jagielski]
+
* os/unix/unixd.[ch]: detach, setuid, setgid, stuff which will be common
amongst the unix MPMs
1.7 +1 -6 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Configure 1999/06/20 23:49:28 1.6
+++ Configure 1999/06/23 00:28:11 1.7
@@ -1481,7 +1481,7 @@
##
# First, add the shadow MPM method module
##
-echo "AddModule modules/mpm/mpm_$RULE_MPM_METHOD.o" >> $tmpfile
+echo "AddModule modules/mpm_$RULE_MPM_METHOD/libmpm_$RULE_MPM_METHOD.a" >>
$tmpfile
MODFILES=`awk <$tmpfile '($1 == "AddModule" || $1 == "SharedModule") {
printf "%s ", $2 }'`
MODDIRS=`awk < $tmpfile '
@@ -1703,11 +1703,6 @@
## Now create modules.c
##
-
-## TODO: the mpm thing below should be controlled by a configuration
-## TODO: directive... it should really be like another module, with
-## TODO: a default selected depending on the platform
-## TODO: there should be an mpm/foo/ hierarchy for the MPM
$CAT > $awkfile < Makefile.new \
&& gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
-e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.tmpl \
&& rm Makefile.new
#Dependencies
$(OBJS) $(OBJS_PIC): Makefile
# DO NOT REMOVE
mpm_prefork.o: mpm_prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(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)/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_prefork/mpm_prefork.c
Index: mpm_prefork.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
cvs commit: apache-2.0/mpm/src/modules/mpm_pthread - New directory
jim 99/06/22 17:21:47 apache-2.0/mpm/src/modules/mpm_pthread - New directory
cvs commit: apache-2.0/mpm/src/modules/mpm_prefork - New directory
jim 99/06/22 17:21:31 apache-2.0/mpm/src/modules/mpm_prefork - New directory
