here is a new patch.


sure, we can fix the internals later. what's important is to get the functionality right asap.

yup.


so I take it you're +1, save the below tweaks?


the only issue outstanding is with filter and ignoring the return status:

http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=105462573626731&w=2

I think I'm of the opinion that we should keep the current behavior (respecting return values for filters) until assert() works properly. in either case, I'd like to patch that separately to reduce all-at-once changes - this code works for everything that calls modperl_callback_run_handlers, which is everything except filters.


This behavior should also be documented in the normal docs, including the change for stacked handlers in the response phase in the compat doc.

oh, and the docs list PerlChildExitHandler as being of type RUN_ALL when actually it's coded as a VOID (the status is never checked) so I'll fix the docs there too once this is over.


Good.

Also please verify indentation, I have spotted at least a few files with probs, see below, but probably there are more.

Index: lib/ModPerl/Code.pm
===================================================================
RCS file: /home/cvspublic/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.100
diff -u -r1.100 Code.pm
--- lib/ModPerl/Code.pm    20 May 2003 01:31:49 -0000    1.100
+++ lib/ModPerl/Code.pm    7 Aug 2003 17:11:09 -0000
@@ -37,27 +37,32 @@

[...]


 sub canon_args {
     my $args = shift->{args};
-    my @in   = map { "$_->{type} *$_->{name}" } @$args;
     my @pass = map { $_->{name} } @$args;
+    my @in;
+    foreach my $href (@$args) {
+      push @in, "$href->{type} *$href->{name}"
+        unless $href->{type} eq 'dummy';
+    }
     return wantarray ? ([EMAIL PROTECTED], [EMAIL PROTECTED]) : [EMAIL PROTECTED];
 }


indent 4 please.

it wasn't indented 4 before I got there :)




Index: src/modules/perl/modperl_filter.c
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.64
diff -u -r1.64 modperl_filter.c
--- src/modules/perl/modperl_filter.c 13 May 2003 09:18:58 -0000 1.64
+++ src/modules/perl/modperl_filter.c 7 Aug 2003 17:11:14 -0000

[...]


@@ -384,6 +385,7 @@
av_push(args, newSViv(filter->readbytes));
}
+ /* filters are VOID handlers. should we ignore the status? */


probably put XXX, so we know it may need to be fixed.

good idea.



--- /dev/null 2003-01-30 05:24:37.000000000 -0500
+++ t/hooks/TestHooks/stacked_handlers2.pm 2003-08-07 12:57:11.000000000 -0400


again, indent 4 please

ok


--Geoff


--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to