You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@apache.org on 2002/01/30 13:32:07 UTC
cvs commit: httpd-2.0/server/mpm/mpmt_os2 mpm.h
bjh 02/01/30 04:32:07
Modified: . STATUS
server listen.c
server/mpm MPM.NAMING
server/mpm/mpmt_os2 mpm.h
Log:
Remove more spmt_os2 MPM leftovers.
Revision Changes Path
1.406 +1 -3 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -r1.405 -r1.406
--- STATUS 30 Jan 2002 06:33:18 -0000 1.405
+++ STATUS 30 Jan 2002 12:32:06 -0000 1.406
@@ -1,5 +1,5 @@
APACHE 2.0 STATUS: -*-text-*-
-Last modified at [$Date: 2002/01/30 06:33:18 $]
+Last modified at [$Date: 2002/01/30 12:32:06 $]
Release:
@@ -317,8 +317,6 @@
Common logging API.
* Document mod_file_cache.
-
- * OS/2: Make mod_status work for spmt_os2 MPM.
* Platforms that do not support fork (primarily Win32 and AS/400)
Architect start-up code that avoids initializing all the modules
1.68 +1 -4 httpd-2.0/server/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/listen.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- listen.c 2 Jan 2002 23:27:57 -0000 1.67
+++ listen.c 30 Jan 2002 12:32:07 -0000 1.68
@@ -271,10 +271,7 @@
ap_listeners = new;
}
-#if !defined(SPMT_OS2_MPM)
-static
-#endif
-int ap_listen_open(process_rec *process, apr_port_t port)
+static int ap_listen_open(process_rec *process, apr_port_t port)
{
apr_pool_t *pconf = process->pconf;
ap_listen_rec *lr;
1.12 +0 -1 httpd-2.0/server/mpm/MPM.NAMING
Index: MPM.NAMING
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/MPM.NAMING,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MPM.NAMING 19 Nov 2001 18:07:28 -0000 1.11
+++ MPM.NAMING 30 Jan 2002 12:32:07 -0000 1.12
@@ -5,7 +5,6 @@
perchild ...... Multi Process Model with Threading.
Constant number of processes, variable number of threads
each child process can have a different uid/gid.
- spmt_os2 ...... Single Process Model with Threading on OS/2
mpmt_os2 ...... Multi Process Model with Threading on OS/2
Constant number of processes, variable number of threads.
One acceptor thread per process, multiple workers threads.
1.3 +1 -1 httpd-2.0/server/mpm/mpmt_os2/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mpm.h 13 Nov 2001 01:24:41 -0000 1.2
+++ mpm.h 30 Jan 2002 12:32:07 -0000 1.3
@@ -72,4 +72,4 @@
#define AP_MPM_WANT_SET_MAX_REQUESTS
#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
-#endif /* APACHE_MPM_SPMT_OS2_H */
+#endif /* APACHE_MPM_MPMT_OS2_H */