www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Add support for RLimit* in mod_cgid. PR 42135.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2010-12-04 14:54:31 +00:00
parent 81ba030297
commit 8f05af0707
2 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -2,6 +2,9 @@
Changes with Apache 2.3.10
*) mod_cgid: RLimit* directive support for mod_cgid. PR 42135
[Eric Covener]
*) core: Fail startup when the argument to ServerName looks like a glob
or a regular expression instead of a hostname (*?[]). PR 39863
[Rahul Nair <rahul.g.nair gmail.com>]

111
modules/generators/mod_cgid.c
View File

@@ -168,6 +168,24 @@ typedef struct {
int bufbytes;
} cgid_server_conf;
#if defined (RLIMIT_CPU) || defined (RLMIT_NPROC) || defined (RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
typedef struct {
#ifdef RLIMIT_CPU
int limit_cpu_set;
struct rlimit limit_cpu;
#endif
#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
int limit_mem_set;
struct rlimit limit_mem;
#endif
#ifdef RLIMIT_NPROC
int limit_nproc_set;
struct rlimit limit_nproc;
#endif
} cgid_rlimit_t;
#endif
typedef struct {
int req_type; /* request type (CGI_REQ, SSI_REQ, etc.) */
unsigned long conn_id; /* connection id; daemon uses this as a hash value
@@ -185,6 +203,9 @@ typedef struct {
apr_size_t uri_len;
apr_size_t args_len;
int loglevel; /* to stuff in server_rec */
#if defined (RLIMIT_CPU) || defined (RLMIT_NPROC) || defined (RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
cgid_rlimit_t limits;
#endif
} cgid_req_t;
/* This routine is called to create the argument list to be passed
@@ -438,39 +459,9 @@ static apr_status_t get_req(int fd, request_rec *r, char **argv0, char ***env,
}
*env = environ;
#if 0
#ifdef RLIMIT_CPU
sock_read(fd, &j, sizeof(int));
if (j) {
temp_core->limit_cpu = (struct rlimit *)apr_palloc (sizeof(struct rlimit));
sock_read(fd, temp_core->limit_cpu, sizeof(struct rlimit));
}
else {
temp_core->limit_cpu = NULL;
}
#endif
#if defined (RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
sock_read(fd, &j, sizeof(int));
if (j) {
temp_core->limit_mem = (struct rlimit *)apr_palloc(r->pool, sizeof(struct rlimit));
sock_read(fd, temp_core->limit_mem, sizeof(struct rlimit));
}
else {
temp_core->limit_mem = NULL;
}
#endif
#ifdef RLIMIT_NPROC
sock_read(fd, &j, sizeof(int));
if (j) {
temp_core->limit_nproc = (struct rlimit *)apr_palloc(r->pool, sizeof(struct rlimit));
sock_read(fd, temp_core->limit_nproc, sizeof(struct rlimit));
}
else {
temp_core->limit_nproc = NULL;
}
#endif
#if defined (RLIMIT_CPU) || defined (RLMIT_NPROC) || defined (RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
if ((stat = sock_read(fd, &(req->limits), sizeof(cgid_rlimit_t))) != APR_SUCCESS)
return stat;
#endif
return APR_SUCCESS;
@@ -483,6 +474,9 @@ static apr_status_t send_req(int fd, request_rec *r, char *argv0, char **env,
cgid_req_t req = {0};
apr_status_t stat;
ap_unix_identity_t * ugid = ap_run_get_suexec_identity(r);
core_dir_config *core_conf = ap_get_module_config(r->per_dir_config,
&core_module);
if (ugid == NULL) {
req.ugid = empty_ugid;
@@ -532,44 +526,42 @@ static apr_status_t send_req(int fd, request_rec *r, char *argv0, char **env,
return stat;
}
}
#if 0
#ifdef RLIMIT_CPU
if (conf->limit_cpu) {
len = 1;
stat = sock_write(fd, &len, sizeof(int));
stat = sock_write(fd, conf->limit_cpu, sizeof(struct rlimit));
if (core_conf->limit_cpu) {
req.limits.limit_cpu = *(core_conf->limit_cpu);
req.limits.limit_cpu_set = 1;
}
else {
len = 0;
stat = sock_write(fd, &len, sizeof(int));
req.limits.limit_cpu_set = 0;
}
#endif
#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
if (conf->limit_mem) {
len = 1;
stat = sock_write(fd, &len, sizeof(int));
stat = sock_write(fd, conf->limit_mem, sizeof(struct rlimit));
if (core_conf->limit_mem) {
req.limits.limit_mem = *(core_conf->limit_mem);
req.limits.limit_mem_set = 1;
}
else {
len = 0;
stat = sock_write(fd, &len, sizeof(int));
req.limits.limit_mem_set = 0;
}
#endif
#ifdef RLIMIT_NPROC
if (conf->limit_nproc) {
len = 1;
stat = sock_write(fd, &len, sizeof(int));
stat = sock_write(fd, conf->limit_nproc, sizeof(struct rlimit));
if (core_conf->limit_nproc) {
req.limits.limit_nproc = *(core_conf->limit_nproc);
req.limits.limit_nproc_set = 1;
}
else {
len = 0;
stat = sock_write(fd, &len, sizeof(int));
req.limits.limit_nproc_set = 0;
}
#endif
#if defined (RLIMIT_CPU) || defined (RLMIT_NPROC) || defined (RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
if ( (stat = sock_write(fd, &(req.limits), sizeof(cgid_rlimit_t))) != APR_SUCCESS)
return stat;
#endif
return APR_SUCCESS;
}
@@ -771,6 +763,19 @@ static int cgid_server(void *data)
((rc = apr_procattr_dir_set(procattr,
ap_make_dirstr_parent(r->pool, r->filename))) != APR_SUCCESS) ||
((rc = apr_procattr_cmdtype_set(procattr, cmd_type)) != APR_SUCCESS) ||
#ifdef RLIMIT_CPU
( (cgid_req.limits.limit_cpu_set) && ((rc = apr_procattr_limit_set(procattr, APR_LIMIT_CPU,
&cgid_req.limits.limit_cpu)) != APR_SUCCESS)) ||
#endif
#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
( (cgid_req.limits.limit_mem_set) && ((rc = apr_procattr_limit_set(procattr, APR_LIMIT_MEM,
&cgid_req.limits.limit_mem)) != APR_SUCCESS)) ||
#endif
#ifdef RLIMIT_NPROC
( (cgid_req.limits.limit_nproc_set) && ((rc = apr_procattr_limit_set(procattr, APR_LIMIT_NPROC,
&cgid_req.limits.limit_nproc)) != APR_SUCCESS)) ||
#endif
((rc = apr_procattr_child_errfn_set(procattr, cgid_child_errfn)) != APR_SUCCESS)) {
/* Something bad happened, tell the world.
* ap_log_rerror() won't work because the header table used by