gozer 2004/09/16 17:07:25
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() and $mod->minor_version() renamed
to $mod->ap_api_major_version() and $mod->ap_api_minor_version
for clarity
Revision Changes Path
1.487 +2 -1 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- Changes 16 Sep 2004 21:59:39 -0000 1.486
+++ Changes 17 Sep 2004 00:07:24 -0000 1.487
@@ -12,7 +12,8 @@
=item 1.99_17-dev
-Apache::Module $mod->version() renamed $mod->apache_api_version()
+Apache::Module $mod->version() and $mod->minor_version() renamed
+to $mod->ap_api_major_version() and $mod->ap_api_minor_version
for clarity [Gozer]
Apache::Log changes: [Stas]
1.24 +2 -2 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- module.pm 16 Sep 2004 21:59:39 -0000 1.23
+++ module.pm 17 Sep 2004 00:07:24 -0000 1.24
@@ -84,8 +84,8 @@
my $name = $modp->name;
ok $name;
t_debug("Testing module: " . $modp->name);
- ok t_cmp $modp->apache_api_version, $mmn_major;
- ok $modp->minor_version <= $mmn_minor;
+ ok t_cmp $modp->ap_api_major_version, $mmn_major;
+ ok $modp->ap_api_minor_version <= $mmn_minor;
ok $modp->module_index >= 0;
my $cmds = $modp->cmds;
ok !defined($cmds) || ref($cmds) eq 'Apache::Command';
1.15 +7 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Apache__Module.h 16 Sep 2004 21:59:39 -0000 1.14
+++ Apache__Module.h 17 Sep 2004 00:07:24 -0000 1.15
@@ -63,7 +63,13 @@
}
static MP_INLINE
-int mpxs_Apache__Module_apache_api_version(pTHX_ module *mod)
+int mpxs_Apache__Module_ap_api_major_version(pTHX_ module *mod)
{
return mod->version;
+}
+
+static MP_INLINE
+int mpxs_Apache__Module_ap_api_minor_version(pTHX_ module *mod)
+{
+ return mod->minor_version;
}
1.104 +2 -1 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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- apache_functions.map 16 Sep 2004 21:59:39 -0000 1.103
+++ apache_functions.map 17 Sep 2004 00:07:24 -0000 1.104
@@ -214,7 +214,8 @@
mpxs_Apache__Module_loaded
#ap_get_module_config
mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
- mpxs_Apache__Module_apache_api_version
+ mpxs_Apache__Module_ap_api_major_version
+ mpxs_Apache__Module_ap_api_minor_version
MODULE=Apache::Directive
ap_directive_t *:DEFINE_conftree
1.48 +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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apache_structures.map 16 Sep 2004 21:59:39 -0000 1.47
+++ apache_structures.map 17 Sep 2004 00:07:24 -0000 1.48
@@ -132,7 +132,7 @@
<module>
~ version
-< minor_version
+~ minor_version
< module_index
< name
! dynamic_load_handle
1.183 +16 -2 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.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- FunctionTable.pm 16 Sep 2004 21:59:39 -0000 1.182
+++ FunctionTable.pm 17 Sep 2004 00:07:24 -0000 1.183
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.010
-# ! Thu Sep 16 12:12:26 2004
+# ! Thu Sep 16 16:51:25 2004
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6168,7 +6168,21 @@
},
{
'return_type' => 'int',
- 'name' => 'mpxs_Apache__Module_apache_api_version',
+ 'name' => 'mpxs_Apache__Module_ap_api_major_version',
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'module *',
+ 'name' => 'mod'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
+ 'name' => 'mpxs_Apache__Module_ap_api_minor_version',
'args' => [
{
'type' => 'PerlInterpreter *',
