You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@apache.org on 2002/05/31 03:06:39 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_perl_includes.h modperl_util.c
dougm 2002/05/30 18:06:39
Modified: src/modules/perl modperl_perl_includes.h modperl_util.c
Log:
Perl_croak(NULL) segvs with 5.6.0; apply bandaid
Revision Changes Path
1.14 +4 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- modperl_perl_includes.h 30 May 2002 01:23:28 -0000 1.13
+++ modperl_perl_includes.h 31 May 2002 01:06:39 -0000 1.14
@@ -44,6 +44,10 @@
# define MP_PERL_5_6_x
#endif
+#if defined(MP_PERL_5_6_x) && (PERL_SUBVERSION == 0)
+# define MP_PERL_5_6_0
+#endif
+
#if defined(MP_PERL_5_6_x) && (PERL_SUBVERSION == 1)
# define MP_PERL_5_6_1
#endif
1.44 +5 -1 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- modperl_util.c 29 May 2002 16:31:44 -0000 1.43
+++ modperl_util.c 31 May 2002 01:06:39 -0000 1.44
@@ -530,11 +530,15 @@
void modperl_perl_exit(pTHX_ int status)
{
+ const char *pat = NULL;
ENTER;
SAVESPTR(PL_diehook);
PL_diehook = Nullsv;
sv_setpv(ERRSV, "");
- Perl_croak(aTHX_ NULL);
+#ifdef MP_PERL_5_6_0
+ pat = ""; /* NULL segvs in 5.6.0 */
+#endif
+ Perl_croak(aTHX_ pat);
}
MP_INLINE SV *modperl_dir_config(pTHX_ request_rec *r, server_rec *s,