dougm 02/05/20 19:50:16
Modified: t/modperl .cvsignore
xs/Apache/RequestRec Apache__RequestRec.h
xs/maps apache_structures.map modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
support 1.x subprocess_env functionality
Revision Changes Path
1.8 +1 -0 modperl-2.0/t/modperl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 15 Nov 2001 03:02:43 -0000 1.7
+++ .cvsignore 21 May 2002 02:50:15 -0000 1.8
@@ -5,3 +5,4 @@
print.t
pnotes.t
dir_config.t
+subenv.t
1.4 +12 -0 modperl-2.0/xs/Apache/RequestRec/Apache__RequestRec.h
Index: Apache__RequestRec.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestRec/Apache__RequestRec.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__RequestRec.h 21 May 2002 00:22:24 -0000 1.3
+++ Apache__RequestRec.h 21 May 2002 02:50:16 -0000 1.4
@@ -39,3 +39,15 @@
return retval;
}
+
+static MP_INLINE
+SV *mpxs_Apache__RequestRec_subprocess_env(pTHX_ request_rec *r,
+ char *key, SV *val)
+{
+ if (GIMME_V == G_VOID) {
+ modperl_env_request_populate(aTHX_ r);
+ }
+
+ return modperl_table_get_set(aTHX_ r->subprocess_env,
+ key, val, TRUE);
+}
1.17 +1 -1 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apache_structures.map 21 May 2002 00:22:24 -0000 1.16
+++ apache_structures.map 21 May 2002 02:50:16 -0000 1.17
@@ -38,7 +38,7 @@
headers_in
headers_out
err_headers_out
- subprocess_env
+~ subprocess_env
notes
~ content_type
handler
1.39 +3 -2 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- modperl_functions.map 21 May 2002 00:22:24 -0000 1.38
+++ modperl_functions.map 21 May 2002 02:50:16 -0000 1.39
@@ -9,8 +9,9 @@
mpxs_ModPerl__Global_special_list_clear
MODULE=Apache::RequestRec PACKAGE=Apache::RequestRec
- mpxs_Apache__RequestRec_content_type | | r, type=Nullsv
- mpxs_Apache__RequestRec_proxyreq | | r, val=Nullsv
+ mpxs_Apache__RequestRec_content_type | | r, type=Nullsv
+ mpxs_Apache__RequestRec_proxyreq | | r, val=Nullsv
+ mpxs_Apache__RequestRec_subprocess_env | | r, key=NULL, val=Nullsv
MODULE=Apache::RequestUtil PACKAGE=guess
mpxs_Apache__RequestRec_push_handlers
1.66 +23 -1 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- FunctionTable.pm 21 May 2002 00:22:24 -0000 1.65
+++ FunctionTable.pm 21 May 2002 02:50:16 -0000 1.66
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon May 20 16:47:17 2002
+# ! Mon May 20 19:15:12 2002
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4675,6 +4675,28 @@
{
'type' => 'apr_time_t',
'name' => 'mtime'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'SV *',
+ 'name' => 'mpxs_Apache__RequestRec_subprocess_env',
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'key'
+ },
+ {
+ 'type' => 'SV *',
+ 'name' => 'val'
}
]
},
