cvs commit: modperl-2.0/src/modules/perl modperl_perl_includes.h
dougm 2002/11/24 17:31:00 Modified:.Changes src/modules/perl modperl_perl_includes.h Log: Submitted by: Randy Kobes <[EMAIL PROTECTED]> Reviewed by: dougm fixes to compile with ActivePerl 5.8 beta Revision ChangesPath 1.62 +3 -0 modperl-2.0/Changes Index: Changes === RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- Changes 23 Nov 2002 23:25:32 - 1.61 +++ Changes 25 Nov 2002 01:31:00 - 1.62 @@ -10,6 +10,9 @@ =item 1.99_08-dev +fixes to compile with ActivePerl 5.8 beta +[Randy Kobes <[EMAIL PROTECTED]>] + fix for directive handlers within vhosts using threaded MPMs [Stephen Clouse <[EMAIL PROTECTED]>] 1.17 +15 -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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modperl_perl_includes.h 19 Jun 2002 05:18:04 - 1.16 +++ modperl_perl_includes.h 25 Nov 2002 01:31:00 - 1.17 @@ -36,11 +36,26 @@ #ifdef WIN32 # define uid_t perl_uid_t # define gid_t perl_gid_t +# ifdef exit +# define perl_exit exit +# undef exit +# endif #endif #include "EXTERN.h" #include "perl.h" #include "XSUB.h" + +#if defined(WIN32) && defined(USE_LARGE_FILES) +# ifdef malloc +# define perl_malloc malloc +# undef malloc +# endif +# ifdef free +# define perl_free free +# undef free +# endif +#endif #if (PERL_REVISION == 5) && (PERL_VERSION == 6) # define MP_PERL_5_6_x
cvs commit: modperl-2.0/src/modules/perl modperl_perl_includes.h modperl_util.c
dougm 2002/06/18 19:02:24
Modified:src/modules/perl modperl_perl_includes.h modperl_util.c
Log:
use mg_find to look for ~ magic in modperl_xs_sv2request_rec as there may be other
magic in the chain
Revision ChangesPath
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modperl_perl_includes.h 31 May 2002 01:06:39 - 1.14
+++ modperl_perl_includes.h 19 Jun 2002 02:02:24 - 1.15
@@ -67,6 +67,10 @@
# define PERL_MAGIC_tied 'P'
#endif
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
#if defined(__APPLE__) && !defined(PERL_CORE) && !defined(environ)
# include
# define environ (*_NSGetEnviron())
1.45 +2 -2 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- modperl_util.c31 May 2002 01:06:39 - 1.44
+++ modperl_util.c19 Jun 2002 02:02:24 - 1.45
@@ -120,8 +120,8 @@
return r;
}
-if ((mg = SvMAGIC(sv))) {
-return MgTypeExt(mg) ? (request_rec *)mg->mg_ptr : NULL;
+if ((mg = mg_find(sv, PERL_MAGIC_ext))) {
+return (request_rec *)mg->mg_ptr;
}
else {
if (classname && !sv_derived_from(in, classname)) {
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 ChangesPath
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 - 1.13
+++ modperl_perl_includes.h 31 May 2002 01:06:39 - 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.c29 May 2002 16:31:44 - 1.43
+++ modperl_util.c31 May 2002 01:06:39 - 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,
cvs commit: modperl-2.0/src/modules/perl modperl_perl_includes.h
dougm 02/05/29 18:23:28 Modified:src/modules/perl modperl_perl_includes.h Log: define environ on darwin if needed Revision ChangesPath 1.13 +5 -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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- modperl_perl_includes.h 23 May 2002 22:40:47 - 1.12 +++ modperl_perl_includes.h 30 May 2002 01:23:28 - 1.13 @@ -63,4 +63,9 @@ # define PERL_MAGIC_tied 'P' #endif +#if defined(__APPLE__) && !defined(PERL_CORE) && !defined(environ) +# include +# define environ (*_NSGetEnviron()) +#endif + #endif /* MODPERL_PERL_INCLUDES_H */
