gozer 2004/09/14 10:48:16
Modified: . Changes
t/response/TestApache conftree.pm
xs/Apache/Directive Apache__Directive.h
xs/maps apache_functions.map
Log:
Apache::Directive conftree() changed from class method to
regular subroutine
Revision Changes Path
1.484 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- Changes 13 Sep 2004 23:36:08 -0000 1.483
+++ Changes 14 Sep 2004 17:48:15 -0000 1.484
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+Apache::Directive conftree() changed from class method to
+regular subroutine [Gozer]
+
Apache::Module top_module() and get_config() as class methods
added to Apache::compat for backwards compatibility [Gozer]
1.13 +2 -2 modperl-2.0/t/response/TestApache/conftree.pm
Index: conftree.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/conftree.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- conftree.pm 10 Aug 2004 22:48:27 -0000 1.12
+++ conftree.pm 14 Sep 2004 17:48:15 -0000 1.13
@@ -26,7 +26,7 @@
ok $vars;
- my $tree = Apache::Directive->conftree;
+ my $tree = Apache::Directive::conftree();
ok $tree;
@@ -82,7 +82,7 @@
sub traverse_tree {
my ($sub, $data) = @_;
- my $node = Apache::Directive->conftree;
+ my $node = Apache::Directive::conftree();
while ($node) {
$sub->($data, $node);
if (my $kid = $node->first_child) {
1.9 +1 -2 modperl-2.0/xs/Apache/Directive/Apache__Directive.h
Index: Apache__Directive.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Directive/Apache__Directive.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Apache__Directive.h 14 Apr 2004 03:41:39 -0000 1.8
+++ Apache__Directive.h 14 Sep 2004 17:48:15 -0000 1.9
@@ -13,8 +13,7 @@
* limitations under the License.
*/
-#define mpxs_Apache__Directive_conftree(CLASS) \
-(CLASS ? ap_conftree : ap_conftree)
+#define mpxs_Apache__Directive_conftree() ap_conftree
/* XXX: this is only useful for <Perl> at the moment */
static MP_INLINE SV *mpxs_Apache__Directive_as_string(pTHX_
1.102 +1 -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.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- apache_functions.map 13 Sep 2004 22:36:19 -0000 1.101
+++ apache_functions.map 14 Sep 2004 17:48:15 -0000 1.102
@@ -216,7 +216,7 @@
mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
MODULE=Apache::Directive
- ap_directive_t *:DEFINE_conftree | | SV *:CLASS
+ ap_directive_t *:DEFINE_conftree
!ap_add_node
!ap_build_config
!ap_build_cont_config
