Author: stas
Date: Thu Mar 3 18:02:22 2005
New Revision: 156119
URL: http://svn.apache.org/viewcvs?view=rev&rev=156119
Log:
Apache::RequestUtil::slurp_filename now throws an APR::Error exception
object (before it was just croaking)
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/src/modules/perl/modperl_util.c
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=156118&r2=156119
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Mar 3 18:02:22 2005
@@ -12,6 +12,9 @@
=item 1.999_22-dev
+Apache::RequestUtil::slurp_filename now throws an APR::Error exception
+object (before it was just croaking). [Stas]
+
fix APR::Error's overload of '==' (it was always returning true
before), and add the corresponding '!=' [Stas]
Modified: perl/modperl/trunk/src/modules/perl/modperl_util.c
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_util.c?view=diff&r1=156118&r2=156119
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_util.c Thu Mar 3 18:02:22 2005
@@ -597,11 +597,13 @@
return (svp && *svp != &PL_sv_undef) ? 1 : 0;
}
-#define SLURP_SUCCESS(action) \
- if (rc != APR_SUCCESS) { \
- SvREFCNT_dec(sv); \
- Perl_croak(aTHX_ "Error " action " '%s': %s ", r->filename, \
- modperl_error_strerror(aTHX_ rc)); \
+#define SLURP_SUCCESS(action) \
+ if (rc != APR_SUCCESS) { \
+ SvREFCNT_dec(sv); \
+ modperl_croak(aTHX_ rc, \
+ apr_psprintf(r->pool, \
+ "slurp_filename('%s') / " action, \
+ r->filename)); \
}
MP_INLINE SV *modperl_slurp_filename(pTHX_ request_rec *r, int tainted)
