You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/13 18:05:10 UTC
cvs commit: apache-2.0/src/include ap_listen.h
rbb 00/07/13 09:05:08
Modified: src/main listen.c
src/include ap_listen.h
Log:
Fix the prefork MPM to make it compile and work again out-of-the-box.
Revision Changes Path
1.27 +3 -2 apache-2.0/src/main/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- listen.c 2000/07/10 21:37:13 1.26
+++ listen.c 2000/07/13 16:05:06 1.27
@@ -64,6 +64,7 @@
#include "http_config.h"
#include "ap_listen.h"
#include "http_log.h"
+#include "mpm.h"
#ifdef HAVE_STRING_H
#include <string.h>
#endif
@@ -201,7 +202,7 @@
ap_listeners = new;
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
static
#endif
int ap_listen_open(process_rec *process, unsigned port)
@@ -243,7 +244,7 @@
return num_open ? 0 : -1;
}
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
int ap_setup_listeners(server_rec *s)
{
ap_listen_rec *lr;
1.15 +2 -1 apache-2.0/src/include/ap_listen.h
Index: ap_listen.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_listen.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ap_listen.h 2000/07/10 21:37:11 1.14
+++ ap_listen.h 2000/07/13 16:05:07 1.15
@@ -57,6 +57,7 @@
#include "apr_network_io.h"
#include "http_config.h"
+#include "mpm.h"
typedef struct ap_listen_rec ap_listen_rec;
struct ap_listen_rec {
@@ -72,7 +73,7 @@
extern ap_listen_rec *ap_listeners;
void ap_listen_pre_config(void);
-#ifndef WIN32
+#if !defined(WIN32) && !defined(PREFORK_MPM)
int ap_setup_listeners(server_rec *s);
#else
int ap_listen_open(process_rec *process, unsigned port);
Re: cvs commit: apache-2.0/src/include ap_listen.h
Posted by Greg Ames <gr...@raleigh.ibm.com>.
rbb@locus.apache.org wrote:
>
> rbb 00/07/13 09:05:08
>
> Modified: src/main listen.c
> src/include ap_listen.h
> Log:
> Fix the prefork MPM to make it compile and work again out-of-the-box.
>
Thanks!
Greg