Fix bug concerning 'error-notes' having no value on

errordocument redirect [supplied by Guy Albertelli II
<[email protected]>].


git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@436617 13f79535-47bb-0310-9956-ffa450edef68

Author: randyk

Changes

@@ -12,6 +12,10 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes
 
 =item 2.0.3-dev
 
+Fix bug concerning 'error-notes' having no value on 
+errordocument redirect.
+[Guy Albertelli II <[email protected]>]
+
 Multi-line $PerlConfig is now working [Gozer]
 
 PerlOptions None was previously incorrectly reported as invalid

src/modules/perl/modperl_callback.c

@@ -130,7 +130,7 @@ int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
 
     if (status == HTTP_INTERNAL_SERVER_ERROR) {
         if (r && r->notes) {
-            apr_table_mergen(r->notes, "error-notes", SvPV_nolen(ERRSV));
+            apr_table_merge(r->notes, "error-notes", SvPV_nolen(ERRSV));
         }
     }
 

t/hooks/TestHooks/error.pm

@@ -0,0 +1,43 @@
+package TestHooks::error;
+
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+
+use Apache2::Const -compile => 'OK';
+
+use APR::Table ();
+
+sub handler {
+    my $r = shift;
+    my $args = $r->args();
+    if (defined($args) && $args ne '') {
+        $r->notes->set('error-notes' => $args);
+    }
+    &bomb();
+    Apache2::Const::OK;
+}
+
+sub fail {
+    my $r = shift;
+    $r->print('Error: '.$r->prev->notes->get('error-notes'));
+    Apache2::Const::OK;
+}
+
+1;
+__DATA__
+<NoAutoConfig>
+  <Location /TestHooks__error>
+      SetHandler modperl
+      PerlResponseHandler TestHooks::error
+      ErrorDocument 500 /TestHooks__error__fail
+  </Location>
+  <Location /TestHooks__error__fail>
+      SetHandler modperl
+      PerlResponseHandler TestHooks::error::fail
+  </Location>
+</NoAutoConfig>

t/hooks/error.t

@@ -0,0 +1,27 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestUtil;
+use Apache::TestRequest;
+
+plan tests => 2;
+
+{
+    # this registers and performs cleanups, but we test whether the
+    # cleanup was run only in the next sub-test
+    my $location = "/TestHooks__error";
+    my $expected = qr/^Error: Undefined subroutine/;
+    my $received = GET_BODY $location;
+    ok t_cmp($received, $expected, "error-notes set on ErrorDocument");
+}
+
+{
+    # this registers and performs cleanups, but we test whether the
+    # cleanup was run only in the next sub-test
+    my $error_seed_text = 'seed_text';
+    my $location = "/TestHooks__error?$error_seed_text";
+    my $expected = qr/^Error: \Q$error_seed_text\E, Undefined subroutine/;
+    my $received = GET_BODY $location;
+    ok t_cmp($received, $expected, "seeded error-notes set on ErrorDocument");
+}