gozer 2004/09/16 14:59:39
Modified: . Changes
t/response/TestAPI module.pm
xs/Apache/Module Apache__Module.h
xs/maps apache_functions.map apache_structures.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
Apache::Module $mod->version() renamed $mod->apache_api_version()
for clarity
Revision Changes Path
1.486 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- Changes 16 Sep 2004 16:36:28 -0000 1.485
+++ Changes 16 Sep 2004 21:59:39 -0000 1.486
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+Apache::Module $mod->version() renamed $mod->apache_api_version()
+for clarity [Gozer]
+
Apache::Log changes: [Stas]
- moved to compat: Apache::warn, Apache->warn, Apache::Server->warn,
Apache::Server::warn
1.23 +1 -1 modperl-2.0/t/response/TestAPI/module.pm
Index: module.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- module.pm 13 Sep 2004 22:36:18 -0000 1.22
+++ module.pm 16 Sep 2004 21:59:39 -0000 1.23
@@ -84,7 +84,7 @@
my $name = $modp->name;
ok $name;
t_debug("Testing module: " . $modp->name);
- ok $modp->version == $mmn_major;
+ ok t_cmp $modp->apache_api_version, $mmn_major;
ok $modp->minor_version <= $mmn_minor;
ok $modp->module_index >= 0;
my $cmds = $modp->cmds;
1.14 +6 -0 modperl-2.0/xs/Apache/Module/Apache__Module.h
Index: Apache__Module.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Apache__Module.h 13 Sep 2004 22:36:19 -0000 1.13
+++ Apache__Module.h 16 Sep 2004 21:59:39 -0000 1.14
@@ -61,3 +61,9 @@
return SvREFCNT_inc(obj);
}
+
+static MP_INLINE
+int mpxs_Apache__Module_apache_api_version(pTHX_ module *mod)
+{
+ return mod->version;
+}
1.103 +1 -0 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- apache_functions.map 14 Sep 2004 17:48:15 -0000 1.102
+++ apache_functions.map 16 Sep 2004 21:59:39 -0000 1.103
@@ -214,6 +214,7 @@
mpxs_Apache__Module_loaded
#ap_get_module_config
mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
+ mpxs_Apache__Module_apache_api_version
MODULE=Apache::Directive
ap_directive_t *:DEFINE_conftree
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apache_structures.map 22 Aug 2004 20:47:37 -0000 1.46
+++ apache_structures.map 16 Sep 2004 21:59:39 -0000 1.47
@@ -131,7 +131,7 @@
</server_addr_rec>
<module>
-< version
+~ version
< minor_version
< module_index
< name
1.182 +15 -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.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- FunctionTable.pm 14 Sep 2004 13:37:21 -0000 1.181
+++ FunctionTable.pm 16 Sep 2004 21:59:39 -0000 1.182
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.010
-# ! Mon Sep 13 14:52:36 2004
+# ! Thu Sep 16 12:12:26 2004
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6163,6 +6163,20 @@
{
'type' => 'int',
'name' => 'query_code'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
+ 'name' => 'mpxs_Apache__Module_apache_api_version',
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'module *',
+ 'name' => 'mod'
}
]
},
