You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by po...@prf.com on 2005/01/17 06:51:53 UTC

Autoreply: svn commit: r125400 - /perl/modperl/trunk/Changes /perl/modperl/trunk/src/modules/perl/modperl_cmd.c

Your message reads:

Received: from mail.apache.org (unverified [209.237.227.199]) by mail.hotspace.com.au
 (Rockliffe SMTPRA 4.5.6) with SMTP id <B0...@mail.hotspace.com.au> for <98...@prf.com>;
 Mon, 17 Jan 2005 16:51:52 +1100
Received: (qmail 20419 invoked by uid 500); 17 Jan 2005 05:53:21 -0000
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
list-help: <ma...@perl.apache.org>
list-unsubscribe: <ma...@perl.apache.org>
list-post: <ma...@perl.apache.org>
Reply-To: dev@perl.apache.org
Delivered-To: mailing list modperl-cvs@perl.apache.org
Received: (qmail 20399 invoked by uid 99); 17 Jan 2005 05:53:21 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 16 Jan 2005 21:53:21 -0800
Received: (qmail 72710 invoked by uid 65534); 17 Jan 2005 05:53:20 -0000
Date: 17 Jan 2005 05:53:20 -0000
Message-ID: <20...@minotaur.apache.org>
From: gozer@apache.org
To: modperl-cvs@perl.apache.org
Subject: svn commit: r125400 - /perl/modperl/trunk/Changes /perl/modperl/trunk/src/modules/perl/modperl_cmd.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked

Author: gozer
Date: Sun Jan 16 21:53:18 2005
New Revision: 125400

URL: http://svn.apache.org/viewcvs?view=rev&rev=125400
Log:
PerlPostConfigRequire was trying to detect missing files early on,
but without searching thru @INC, causing false negatives. Better off
skipping that check and leave it to modperl_require_file() to report
problems with finding the file.  

Reported-By: Patrick LeBoutillier <pa...@gmail.com>


Modified:
   perl/modperl/trunk/Changes
   perl/modperl/trunk/src/modules/perl/modperl_cmd.c

Modified: perl/modperl/trunk/Changes
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=125400&p1=perl/modperl/trunk/Changes&r1=125399&p2=perl/modperl/trunk/Changes&r2=125400
==============================================================================
--- perl/modperl/trunk/Changes	(original)
+++ perl/modperl/trunk/Changes	Sun Jan 16 21:53:18 2005
@@ -12,6 +12,12 @@
 
 =item 1.999_21-dev
 
+PerlPostConfigRequire was trying to detect missing files early on,
+but without searching thru @INC, causing false negatives. Better off
+skipping that check and leave it to modperl_require_file() to report
+problems with finding the file.  [Patrick LeBoutillier
+<pa...@gmail.com>, Gozer]
+
 add a perl bug workaround: with USE_ITHREADS perl leaks pthread_key_t
 on every reload of libperl.{a,so} (it's allocated on the very first
 perl_alloc() and never freed). This becomes a problem on apache

Modified: perl/modperl/trunk/src/modules/perl/modperl_cmd.c
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_cmd.c?view=diff&rev=125400&p1=perl/modperl/trunk/src/modules/perl/modperl_cmd.c&r1=125399&p2=perl/modperl/trunk/src/modules/perl/modperl_cmd.c&r2=125400
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_cmd.c	(original)
+++ perl/modperl/trunk/src/modules/perl/modperl_cmd.c	Sun Jan 16 21:53:18 2005
@@ -251,23 +251,15 @@
 {
     apr_pool_t *p = parms->temp_pool;
     modperl_config_dir_t *dcfg = (modperl_config_dir_t *)mconfig;
-    apr_finfo_t finfo;
     MP_dSCFG(parms->server);
 
-    if (APR_SUCCESS == apr_stat(&finfo, arg, APR_FINFO_TYPE, p)) {
-        if (finfo.filetype != APR_NOFILE) {
-            modperl_require_file_t *require = apr_pcalloc(p, sizeof(*require));
-            MP_TRACE_d(MP_FUNC, "push PerlPostConfigRequire for %s\n", arg);
-            require->file = arg;
-            require->dcfg = dcfg;
-            
-            *(modperl_require_file_t **)
-                apr_array_push(scfg->PerlPostConfigRequire) = require;
-        }
-    }
-    else {
-        return apr_pstrcat(p, "No such file : ", arg, NULL);   
-    }   
+    modperl_require_file_t *require = apr_pcalloc(p, sizeof(*require));
+    MP_TRACE_d(MP_FUNC, "push PerlPostConfigRequire for %s\n", arg);
+    require->file = arg;
+    require->dcfg = dcfg;
+
+    *(modperl_require_file_t **)
+        apr_array_push(scfg->PerlPostConfigRequire) = require;
 
     return NULL;
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org