stevehay at apache
Jul 17, 2012, 1:43 AM
Post #1 of 1
(230 views)
Permalink
|
|
svn commit: r1362409 - /perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
|
|
Author: stevehay
Date: Tue Jul 17 08:43:28 2012
New Revision: 1362409
URL: http://svn.apache.org/viewvc?rev=1362409&view=rev
Log:
Fix commit 1362399: PL_phase/PERL_PHASE_DESTRUCT is only available in newer perls, so restore use of PL_dirty for older perls (where it was always available, regardless of whether PERL_CORE was defined).
Modified:
perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
Modified: perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c?rev=1362409&r1=1362408&r2=1362409&view=diff
==============================================================================
--- perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/trunk/xs/APR/PerlIO/modperl_apr_perlio.c Tue Jul 17 08:43:28 2012
@@ -289,7 +289,11 @@ static IV PerlIOAPR_close(pTHX_ PerlIO *
const char *new_path = NULL;
apr_os_file_t os_file;
+#ifdef PERL_PHASE_DESTRUCT
if (PL_phase != PERL_PHASE_DESTRUCT) {
+#else
+ if (!PL_dirty) {
+#endif
/* if this is called during perl_destruct we are in trouble */
apr_file_name_get(&new_path, st->file);
}
@@ -304,7 +308,11 @@ static IV PerlIOAPR_close(pTHX_ PerlIO *
new_path ? new_path : "(UNKNOWN)");
#endif
+#ifdef PERL_PHASE_DESTRUCT
if (PL_phase == PERL_PHASE_DESTRUCT) {
+#else
+ if (PL_dirty) {
+#endif
/* there should not be any PerlIOAPR handles open
* during perl_destruct
*/
|
