stas 2003/01/23 21:09:40
Modified: src/modules/perl modperl_mgv.c
. Changes
Log:
Skip the handler package::func resolving error, only when the error
message matches "Can't locate .*? in @INC", rather than just "Can't
locate", since there are many other errors that start with that
string.
Revision Changes Path
1.22 +4 -3 modperl-2.0/src/modules/perl/modperl_mgv.c
Index: modperl_mgv.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_mgv.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- modperl_mgv.c 6 Jan 2003 05:12:37 -0000 1.21
+++ modperl_mgv.c 24 Jan 2003 05:09:39 -0000 1.22
@@ -290,10 +290,11 @@
}
else {
/* however, if require has failed and the error
- * wasn't "Can't locate ...", we did find the
- * package, and there is a problem with it
+ * wasn't "Can't locate ... in @INC", we did find
+ * the package, and there is a problem with it
*/
- if (strnNE(SvPVX(ERRSV), "Can't locate", 12)) {
+ if (!(strnEQ(SvPVX(ERRSV), "Can't locate", 12)
+ && ap_strstr(SvPVX(ERRSV), "in @INC"))) {
errlen = SvCUR(ERRSV);
errpv = apr_pstrndup(p, SvPVX(ERRSV), errlen);
}
1.113 +6 -1 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- Changes 23 Jan 2003 05:16:30 -0000 1.112
+++ Changes 24 Jan 2003 05:09:40 -0000 1.113
@@ -10,7 +10,12 @@
=item 1.99_09-dev
-the top level 'make test' now descend into the ModPerl-Registry dir
+Skip the handler package::func resolving error, only when the error
+message matches "Can't locate .*? in @INC", rather than just "Can't
+locate", since there are many other errors that start with that
+string. [Stas]
+
+the top level 'make test' now descends into the ModPerl-Registry dir
to run 'make test' there [Stas]
Apache::Test: don't inherit loading of the mod_perl object from the
