You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by cl...@apache.org on 2004/06/14 19:28:25 UTC
cvs commit: httpd-2.0/modules/generators mod_cgi.c mod_cgi.h
clar 2004/06/14 10:28:25
Modified: modules/arch/netware mod_netware.c
modules/generators mod_cgi.c mod_cgi.h
Log:
Added new field in apr_procattr_t and cgi_exec_info_t structures to support loading in current or new address space (NetWare ONLY).
Replaced changes that added APR_PROGRAM_ADDRSPACE committed 6/11/04.
Reviewed by Brad Nicholes
Revision Changes Path
1.18 +2 -8 httpd-2.0/modules/arch/netware/mod_netware.c
Index: mod_netware.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/arch/netware/mod_netware.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_netware.c 11 Jun 2004 20:21:04 -0000 1.17
+++ mod_netware.c 14 Jun 2004 17:28:25 -0000 1.18
@@ -99,7 +99,6 @@
char *ext = NULL;
char *cmd_only, *ptr;
const char *new_cmd;
- const char *detached = NULL;
netware_dir_config *d;
apr_file_t *fh;
const char *args = "";
@@ -153,13 +152,8 @@
*cmd = apr_pstrcat (p, new_cmd, " ", cmd_only, NULL);
/* Run in its own address space if specified */
- detached = apr_table_get(d->file_handler_mode, ext);
- if (detached) {
- e_info->cmd_type = APR_PROGRAM_ADDRSPACE;
- }
- else {
- e_info->cmd_type = APR_PROGRAM;
- }
+ if(apr_table_get(d->file_handler_mode, ext))
+ e_info->addrspace = 1;
}
/* Tokenize the full command string into its arguments */
1.164 +4 -0 httpd-2.0/modules/generators/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- mod_cgi.c 5 May 2004 15:30:53 -0000 1.163
+++ mod_cgi.c 14 Jun 2004 17:28:25 -0000 1.164
@@ -432,6 +432,8 @@
((rc = apr_procattr_detach_set(procattr,
e_info->detached)) != APR_SUCCESS) ||
+ ((rc = apr_procattr_addrspace_set(procattr,
+ e_info->addrspace)) != APR_SUCCESS) ||
((rc = apr_procattr_child_errfn_set(procattr, cgi_child_errfn)) != APR_SUCCESS)) {
/* Something bad happened, tell the world. */
ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
@@ -788,6 +790,7 @@
e_info.bb = NULL;
e_info.ctx = NULL;
e_info.next = NULL;
+ e_info.addrspace = 0;
/* build the command line */
if ((rv = cgi_build_command(&command, &argv, r, p, &e_info)) != APR_SUCCESS) {
@@ -1055,6 +1058,7 @@
e_info.bb = &bb;
e_info.ctx = ctx;
e_info.next = f->next;
+ e_info.addrspace = 0;
if ((rv = cgi_build_command(&command, &argv, r, r->pool,
&e_info)) != APR_SUCCESS) {
1.14 +1 -0 httpd-2.0/modules/generators/mod_cgi.h
Index: mod_cgi.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_cgi.h 9 Feb 2004 20:29:19 -0000 1.13
+++ mod_cgi.h 14 Jun 2004 17:28:25 -0000 1.14
@@ -31,6 +31,7 @@
apr_bucket_brigade **bb;
include_ctx_t *ctx;
ap_filter_t *next;
+ apr_int32_t addrspace;
} cgi_exec_info_t;
/**