dougm 2002/10/07 08:45:52
Modified: lib/Apache PerlSection.pm
src/modules/perl modperl_cmd.c modperl_handler.c
Log:
Submitted by: gozer
Reviewed by: dougm
support APR::Table tie in modperl_handler_make_args
Revision Changes Path
1.3 +1 -2 modperl-2.0/lib/Apache/PerlSection.pm
Index: PerlSection.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/PerlSection.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PerlSection.pm 7 Oct 2002 05:01:44 -0000 1.2
+++ PerlSection.pm 7 Oct 2002 15:45:52 -0000 1.3
@@ -5,7 +5,6 @@
our $VERSION = '0.01';
-
use Apache::CmdParms ();
use Apache::Directive ();
@@ -18,7 +17,7 @@
sub server { return shift->{'parms'}->server() }
sub directives { return shift->{'directives'} ||= [] }
-sub package { return shift->{'args'}->get('package') }
+sub package { return shift->{'args'}->{'package'} }
sub handler : method {
my($self, $parms, $args) = @_;
1.33 +0 -1 modperl-2.0/src/modules/perl/modperl_cmd.c
Index: modperl_cmd.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- modperl_cmd.c 7 Oct 2002 02:35:18 -0000 1.32
+++ modperl_cmd.c 7 Oct 2002 15:45:52 -0000 1.33
@@ -371,7 +371,6 @@
}
if (handler) {
- /*XXX: This will return a blessed APR::Table, but not a tied one ;-( */
modperl_handler_make_args(aTHX_ &args,
"Apache::CmdParms", parms,
"APR::Table", options,
1.13 +5 -0 modperl-2.0/src/modules/perl/modperl_handler.c
Index: modperl_handler.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_handler.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modperl_handler.c 24 Aug 2002 16:03:27 -0000 1.12
+++ modperl_handler.c 7 Oct 2002 15:45:52 -0000 1.13
@@ -143,6 +143,11 @@
ptr = va_arg(args, void *);
switch (*classname) {
+ case 'A':
+ if (strEQ(classname, "APR::Table")) {
+ sv = modperl_hash_tie(aTHX_ classname, Nullsv, ptr);
+ break;
+ }
case 'I':
if (strEQ(classname, "IV")) {
sv = ptr ? newSViv((IV)ptr) : &PL_sv_undef;
