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...@hyperreal.org on 1998/07/23 04:59:39 UTC
cvs commit: modperl/src/modules/perl perl_PL.h Constants.xs Makefile mod_perl.h
dougm 98/07/22 19:59:38
Modified: . Changes MANIFEST Makefile.PL ToDo
apaci mod_perl.config.sh
src/modules/perl Constants.xs Makefile mod_perl.h
Added: src/modules/perl perl_PL.h
Log:
deal with PL_ renaming in 5.004_76+
Revision Changes Path
1.88 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- Changes 1998/07/22 22:59:32 1.87
+++ Changes 1998/07/23 02:59:33 1.88
@@ -8,6 +8,8 @@
=item 1.14_01-dev
+deal with PL_ renaming in 5.004_76+
+
fixes to support to apache_1.3.0+ssl_1.19 [Salvador Ortiz]
add another dTHR so we build/run with threaded Perl again
1.30 +1 -0 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /export/home/cvs/modperl/MANIFEST,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MANIFEST 1998/07/20 16:16:28 1.29
+++ MANIFEST 1998/07/23 02:59:33 1.30
@@ -58,6 +58,7 @@
Symbol/Symbol.pm
Symbol/Symbol.xs
Symbol/test.pl
+src/modules/perl/perl_PL.h
src/modules/perl/mod_perl_version.h
src/modules/perl/Exports.c
src/modules/perl/Constants.xs
1.75 +12 -1 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile.PL 1998/07/22 22:59:32 1.74
+++ Makefile.PL 1998/07/23 02:59:33 1.75
@@ -33,6 +33,8 @@
my $USE_THREADS =
(defined($Config{usethreads}) && ($Config{usethreads} eq "define"));
+$PERL_VERSION = perl_version();
+
require "./lib/mod_perl.pm";
$VERSION = $mod_perl::VERSION = $mod_perl::VERSION;
{
@@ -688,6 +690,7 @@
#---------------------------------------------------------------------
MOD_PERL_VERSION = $VERSION
+PERL_VERSION = $PERL_VERSION
INCDIR = $incdir
@@ -1487,7 +1490,7 @@
$inc .= $SSL_INCLUDE if $SSL_INCLUDE;
$inc .= " -DSTRONGHOLD" if is_ssl() =~ /stronghold/i;
$inc .= " $PERL_EXTRA_CFLAGS" if $PERL_EXTRA_CFLAGS;
- $inc .= " -DMOD_PERL";
+ $inc .= " -DMOD_PERL -DPERL_VERSION=$PERL_VERSION";
while (<$fh>) {
push @file, $_;
@@ -1725,6 +1728,13 @@
$Embed::ldopts;
}
+sub perl_version {
+ my $v = "$]";
+ $v =~ s/\.//g;
+ $v .= "0" while length($v) < 6;
+ $v;
+}
+
sub APACI::init {
my $lib_cfg;
if($USE_APXS) {
@@ -1757,6 +1767,7 @@
# mod_perl version
MOD_PERL_VERSION = $VERSION
+PERL_VERSION = $PERL_VERSION
# Perl interpreter to use
PERL = $^X
1.50 +0 -2 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ToDo 1998/07/22 22:59:32 1.49
+++ ToDo 1998/07/23 02:59:34 1.50
@@ -18,8 +18,6 @@
- move /tmp/mod_perl_* to t/logs
-- deal with PL_ renaming in 5.005-beta2
-
- move unescape_url and unescape_url_info to Apache::Util
- add crit/emerg aliases to Apache::Log
1.8 +1 -0 modperl/apaci/mod_perl.config.sh
Index: mod_perl.config.sh
===================================================================
RCS file: /export/home/cvs/modperl/apaci/mod_perl.config.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_perl.config.sh 1998/07/18 22:21:14 1.7
+++ mod_perl.config.sh 1998/07/23 02:59:35 1.8
@@ -154,6 +154,7 @@
perl_defs=''
perl_defs="$perl_defs -DMOD_PERL_VERSION=\\\"$param_MOD_PERL_VERSION\\\""
perl_defs="$perl_defs -DMOD_PERL_STRING_VERSION=\\\"mod_perl/$param_MOD_PERL_VERSION\\\""
+perl_defs="$perl_defs -DPERL_VERSION=$param_PERL_VERSION"
OIFS="$IFS" IFS="$DIFS"
for hook in \
DISPATCH CHILD_INIT CHILD_EXIT POST_READ_REQUEST TRANS HEADER_PARSER \
1.11 +3 -3 modperl/src/modules/perl/Constants.xs
Index: Constants.xs
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/Constants.xs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Constants.xs 1998/07/14 16:24:56 1.10
+++ Constants.xs 1998/07/23 02:59:36 1.11
@@ -66,7 +66,7 @@
block_end(block_start(TRUE), newOP(OP_STUB,0)));
}
-static void newCONSTSUB(HV *stash, char *name, SV *sv)
+static void my_newCONSTSUB(HV *stash, char *name, SV *sv)
{
#ifdef dTHR
dTHR;
@@ -838,7 +838,7 @@
#endif
char *name = EXP_NAME;
double val = constant(name);
- newCONSTSUB(stash, name, newSViv(val));
+ my_newCONSTSUB(stash, name, newSViv(val));
}
}
@@ -884,7 +884,7 @@
if(errno != 0)
croak("Your vendor has not defined Apache::Constants macro `%s'", name);
else
- newCONSTSUB(stash, name, newSViv(val));
+ my_newCONSTSUB(stash, name, newSViv(val));
const char *
SERVER_VERSION()
1.9 +2 -2 modperl/src/modules/perl/Makefile
Index: Makefile
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 1998/07/15 15:05:14 1.8
+++ Makefile 1998/07/23 02:59:37 1.9
@@ -50,7 +50,7 @@
#
# Makefile for the Apache mod_perl library
#
-# $Id: Makefile,v 1.8 1998/07/15 15:05:14 dougm Exp $
+# $Id: Makefile,v 1.9 1998/07/23 02:59:37 dougm Exp $
#
#__ORIGINAL__
@@ -115,7 +115,7 @@
# AUX_CFLAGS comes from higher level Makefile
CFLAGS=-I. -I$(INCDIR) -I$(INCDIR)/regex -I$(INCDIR)/../$(OSDIR) $(AUX_CFLAGS) \
$(APACHE_SSL) $(PERL_CCFLAGS) \
- -DMOD_PERL_VERSION=\"$(MOD_PERL_VERSION)\" $(PERL_VERSION) \
+ -DMOD_PERL_VERSION=\"$(MOD_PERL_VERSION)\" \
$(INCLUDES)
all: $(LIB)
1.37 +16 -0 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mod_perl.h 1998/07/22 22:59:34 1.36
+++ mod_perl.h 1998/07/23 02:59:37 1.37
@@ -44,6 +44,22 @@
#endif
#include "XSUB.h"
+
+/* patchlevel.h causes a -Wall warning,
+ * plus chance that another patchlevel.h might be in -I paths
+ * so try to avoid it if possible
+ */
+#ifdef PERL_VERSION
+#if PERL_VERSION >= 500476
+#include "perl_PL.h"
+#endif
+#else
+#include "patchlevel.h"
+#if ((PATCHLEVEL >= 4) && (SUBVERSION >= 76)) || (PATCHLEVEL >= 5)
+#include "perl_PL.h"
+#endif
+#endif /*PERL_VERSION*/
+
#ifdef PERL_OBJECT
#include <perlhost.h>
#include "win32iop.h"
1.1 modperl/src/modules/perl/perl_PL.h
Index: perl_PL.h
===================================================================
#ifndef beginav
#define beginav PL_beginav
#endif
#ifndef defoutgv
#define defoutgv PL_defoutgv
#endif
#ifndef defstash
#define defstash PL_defstash
#endif
#ifndef egid
#define egid PL_egid
#endif
#ifndef endav
#define endav PL_endav
#endif
#ifndef envgv
#define envgv PL_envgv
#endif
#ifndef euid
#define euid PL_euid
#endif
#ifndef gid
#define gid PL_gid
#endif
#ifndef hints
#define hints PL_hints
#endif
#ifndef incgv
#define incgv PL_incgv
#endif
#ifndef pidstatus
#define pidstatus PL_pidstatus
#endif
#ifndef scopestack_ix
#define scopestack_ix PL_scopestack_ix
#endif
#ifndef siggv
#define siggv PL_siggv
#endif
#ifndef uid
#define uid PL_uid
#endif
#ifndef warnhook
#define warnhook PL_warnhook
#endif
#ifndef diehook
#define diehook PL_diehook
#endif
#ifndef perl_destruct_level
#define perl_destruct_level PL_perl_destruct_level
#endif
#ifndef sv_count
#define sv_count PL_sv_count
#endif
#ifndef sv_objcount
#define sv_objcount PL_sv_objcount
#endif