perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1539487 - /perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c
Date Wed, 06 Nov 2013 22:39:41 GMT
Author: stevehay
Date: Wed Nov  6 22:39:41 2013
New Revision: 1539487

URL: http://svn.apache.org/r1539487
Log:
Provide a better return value from perl_parse_require_line() in the case where interp is NULL
and add a comment to explain why we currently don't expect this to happen.

Thanks again to Jeff Trawick for this.

Modified:
    perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c

Modified: perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c?rev=1539487&r1=1539486&r2=1539487&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c Wed Nov  6 22:39:41
2013
@@ -1001,11 +1001,17 @@ static const char *perl_parse_require_li
     }
 
     {
+        /* PerlAddAuthzProvider currently does not support an optional second
+         * handler, so ab->cb2 should always be NULL above and we will never get
+         * here. If such support is added in the future then this code will be
+         * reached, but cannot succeed in the absence of an interpreter. The
+         * second handler would be called at init to check a Require line for
+         * errors, but in the current design there is no interpreter available
+         * at that time.
+         */
         MP_dINTERP_POOLa(cmd->pool, cmd->server);
         if (!interp) {
-            MP_TRACE_d(MP_FUNC, "require handler is not currently supported "
-                                "in this context");
-	    return NULL;
+	    return "Require handler is not currently supported in this context";
 	}
 
         {



Mime
View raw message