summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2000-06-06 23:45:16 +0200
committerRyan Bloom <rbb@apache.org>2000-06-06 23:45:16 +0200
commit3c8e0cb24f3d2bd699b89ac441f8489ce2c8bfcc (patch)
tree0d0a059d81c421f80641f93c951f892039d46f24 /server
parentOS/390: avoid unconditional -ldl and -export-dynamic (other (diff)
downloadapache2-3c8e0cb24f3d2bd699b89ac441f8489ce2c8bfcc.tar.xz
apache2-3c8e0cb24f3d2bd699b89ac441f8489ce2c8bfcc.zip
Add the resource limiting code back to Apache 2.0. This only works on
Unix because I can't find any other platforms with rlimit. If there are other platforms that need this code, then some of the code needs to move. This has just barely been tested, so it could probably use some good testing. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85449 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/mpm/dexter/mpm.h1
-rw-r--r--server/mpm/mpmt_pthread/mpm.h1
-rw-r--r--server/mpm/prefork/mpm.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/server/mpm/dexter/mpm.h b/server/mpm/dexter/mpm.h
index 5fd932fe2a..e950de3f29 100644
--- a/server/mpm/dexter/mpm.h
+++ b/server/mpm/dexter/mpm.h
@@ -58,6 +58,7 @@
#include "httpd.h"
#include "mpm_default.h"
+#include "unixd.h"
#ifndef APACHE_MPM_DEXTER_H
#define APACHE_MPM_DEXTER_H
diff --git a/server/mpm/mpmt_pthread/mpm.h b/server/mpm/mpmt_pthread/mpm.h
index b0a119095d..33497a1979 100644
--- a/server/mpm/mpmt_pthread/mpm.h
+++ b/server/mpm/mpmt_pthread/mpm.h
@@ -56,6 +56,7 @@
* University of Illinois, Urbana-Champaign.
*/
#include "scoreboard.h"
+#include "unixd.h"
#ifndef APACHE_MPM_MPMT_PTHREAD_H
#define APACHE_MPM_MPMT_PTHREAD_H
diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index df8ea97d62..2d45e743c8 100644
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -59,6 +59,7 @@
#include "httpd.h"
#include "mpm_default.h"
#include "scoreboard.h"
+#include "unixd.h"
#ifndef APACHE_MPM_PREFORK_H
#define APACHE_MPM_PREFORK_H