cvs commit: modperl-2.0/src/modules/perl modperl_interp.h
dougm 01/10/20 23:48:39 Modified:src/modules/perl modperl_interp.h Log: remove prototypes of dead functions Revision ChangesPath 1.14 +0 -6 modperl-2.0/src/modules/perl/modperl_interp.h Index: modperl_interp.h === RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- modperl_interp.h 2001/09/16 17:28:43 1.13 +++ modperl_interp.h 2001/10/21 06:48:39 1.14 @@ -33,12 +33,6 @@ apr_status_t modperl_interp_pool_destroy(void *data); -void modperl_interp_pool_add(modperl_interp_pool_t *mip, - modperl_interp_t *interp); - -void modperl_interp_pool_remove(modperl_interp_pool_t *mip, -modperl_interp_t *interp); - typedef apr_status_t (*modperl_interp_mip_walker_t)(pTHX_ modperl_interp_pool_t *mip, void *data);
cvs commit: modperl-2.0/ModPerl-Registry/t/cgi-bin special_blocks.pl
stas01/10/20 23:53:28
Modified:ModPerl-Registry/t special_blocks.t
Added: ModPerl-Registry/t/cgi-bin special_blocks.pl
Log:
- adding the forgotten file
Revision ChangesPath
1.2 +2 -2 modperl-2.0/ModPerl-Registry/t/special_blocks.t
Index: special_blocks.t
===
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/special_blocks.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- special_blocks.t 2001/10/19 07:36:13 1.1
+++ special_blocks.t 2001/10/21 06:53:28 1.2
@@ -22,7 +22,7 @@
# PerlRun always run BEGIN/END since it's never cached
my $alias = perlrun;
-my $url = /same_interp/$alias/blocks.pl;
+my $url = /same_interp/$alias/special_blocks.pl;
my $same_interp = Apache::TestRequest::same_interp_tie($url);
ok t_cmp(
@@ -56,7 +56,7 @@
for my $alias (grep !/^perlrun$/, @aliases) {
-my $url = /same_interp/$alias/blocks.pl;
+my $url = /same_interp/$alias/special_blocks.pl;
my $same_interp = Apache::TestRequest::same_interp_tie($url);
# clear the cache of the registry package for the script in $url
1.1 modperl-2.0/ModPerl-Registry/t/cgi-bin/special_blocks.pl
Index: special_blocks.pl
===
#!perl -w
# test BEGIN/END blocks
use ModPerl::RegistryCooker ();
use vars qw($query);
$query = '' unless defined $query;
BEGIN {
$query = $ENV{QUERY_STRING};
}
print Content-type: text/plain\r\n\r\n;
my $r = shift;
my %args = $r-Apache::args;
our $test = exists $args{test} ? $args{test} : '';
if ($test eq 'uncache') {
# mark the script as non-cached for the next execution
require ModPerl::RegistryCooker;
ModPerl::RegistryCooker::uncache_myself();
}
elsif ($test eq 'begin') {
print begin ok if $query eq 'test=begin';
# reset the global
$query = '';
}
END {
if ($test eq 'end') {
print end ok;
}
}
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/10/20 23:57:07
Modified:lib/Apache Build.pm
Log:
include -def:modperl_ithreads.def for win32
Revision ChangesPath
1.63 +1 -1 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Build.pm 2001/10/21 06:43:34 1.62
+++ Build.pm 2001/10/21 06:57:07 1.63
@@ -765,7 +765,7 @@
sub dynamic_link_MSWin32 {
my $self = shift;
my @defs = map -def:$self-{cwd}/xs/modperl$_.def,
-(, _inline);
+(, _inline, _ithreads);
return $self-dynamic_link_header_default .
@defs . 'EOF';
-out:$@
cvs commit: modperl-2.0/src/modules/perl modperl_filter.c modperl_handler.c modperl_log.c modperl_perl_includes.h
dougm 01/10/21 15:11:34
Modified:src/modules/perl modperl_filter.c modperl_handler.c
modperl_log.c modperl_perl_includes.h
Log:
tweaks so we could compile without -DPERL_CORE on win32
Revision ChangesPath
1.28 +2 -1 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- modperl_filter.c 2001/10/14 17:18:10 1.27
+++ modperl_filter.c 2001/10/21 22:11:34 1.28
@@ -556,7 +556,7 @@
{
apr_bucket *bucket;
int i = 0;
-
+#ifndef WIN32
if (fp == NULL) {
fp = stderr;
}
@@ -572,4 +572,5 @@
(unsigned long)bucket-data);
i++;
}
+#endif
}
1.10 +2 -0 modperl-2.0/src/modules/perl/modperl_handler.c
Index: modperl_handler.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_handler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- modperl_handler.c 2001/04/19 17:57:15 1.9
+++ modperl_handler.c 2001/10/21 22:11:34 1.10
@@ -215,7 +215,9 @@
if (!avp) {
/* should never happen */
+#if 0
fprintf(stderr, PANIC: no such handler type: %d\n, type);
+#endif
return NULL;
}
1.5 +4 -0 modperl-2.0/src/modules/perl/modperl_log.c
Index: modperl_log.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_log.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_log.c 2000/06/20 16:04:40 1.4
+++ modperl_log.c 2001/10/21 22:11:34 1.5
@@ -1,9 +1,12 @@
#include mod_perl.h
+#undef getenv /* from XSUB.h */
+
U32 MP_debug_level = 0;
void modperl_trace(char *func, const char *fmt, ...)
{
+#ifndef WIN32 /* XXX */
va_list args;
if (func) {
@@ -13,6 +16,7 @@
va_start(args, fmt);
vfprintf(stderr, fmt, args);
va_end(args);
+#endif
}
void modperl_trace_level_set(const char *level)
1.7 +12 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modperl_perl_includes.h 2001/09/25 19:44:02 1.6
+++ modperl_perl_includes.h 2001/10/21 22:11:34 1.7
@@ -38,6 +38,18 @@
/* avoiding namespace collisions */
+/* from XSUB.h */
+/* mod_perl.c calls exit() in a few places */
+#undef exit
+/* modperl_tipool.c references abort() */
+#undef abort
+/* these three clash with apr bucket structure member names */
+#undef link
+#undef read
+#undef free
+/* modperl_perl.c */
+#undef getpid
+
#ifdef list
# undef list
#endif
cvs commit: modperl-2.0 Makefile.PL
dougm 01/10/21 16:07:01
Modified:.Makefile.PL
Log:
always using .so extension for libmodperl
Revision ChangesPath
1.48 +2 -2 modperl-2.0/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.PL 2001/10/21 06:43:34 1.47
+++ Makefile.PL 2001/10/21 23:07:01 1.48
@@ -299,9 +299,9 @@
sub MY::post_initialize {
my $self = shift;
-# install libmodperl.so, MODPERL_LIB is not known here yet
+# install libmodperl.so
if (exists $build-{MP_USE_DSO} $build-{MP_USE_DSO}) {
-my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, $Config{dlext};
+my $MODPERL_LIB = join '.', $build-{MP_LIBNAME}, 'so';
$self-{PM}-{src/modules/perl/$MODPERL_LIB} =
\$(APACHE_LIBDIR)/$MODPERL_LIB;
}
cvs commit: modperl-2.0/lib/ModPerl MM.pm
dougm 01/10/21 16:37:30
Modified:lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
need to include $Config{ccflags} in CCFLAGS passed to MakeMaker
Revision ChangesPath
1.64 +6 -2 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Build.pm 2001/10/21 06:57:07 1.63
+++ Build.pm 2001/10/21 23:37:30 1.64
@@ -194,6 +194,10 @@
$ccopts;
}
+sub perl_ccopts {
+shift-strip_lfs( $Config{ccflags} );
+}
+
sub ccopts_hpux {
my $cflags = shift;
#return if $Config{cc} eq 'gcc'; #XXX?
@@ -204,8 +208,8 @@
sub ccopts {
my($self) = @_;
-my $cflags = $self-strip_lfs(ExtUtils::Embed::ccopts()) .
- $self-ap_ccopts;
+my $cflags = $self-perl_ccopts . ExtUtils::Embed::perl_inc() .
+ $self-ap_ccopts;
my $fixup = \{ccopts_$^O};
if (defined $fixup) {
1.11 +2 -1 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MM.pm 2001/04/11 22:46:57 1.10
+++ MM.pm 2001/10/21 23:37:30 1.11
@@ -63,7 +63,8 @@
}
}
-my @opts = (INC = $inc, CCFLAGS = $build-ap_ccopts);
+my $ccflags = $build-perl_ccopts . $build-ap_ccopts;
+my @opts = (INC = $inc, CCFLAGS = $ccflags);
my @typemaps;
my $pwd = Cwd::fastcwd();
cvs commit: modperl-2.0/lib/ModPerl MM.pm
dougm 01/10/21 16:43:42 Modified:lib/ModPerl MM.pm Log: link apache libs against xs modules Revision ChangesPath 1.12 +7 -1 modperl-2.0/lib/ModPerl/MM.pm Index: MM.pm === RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- MM.pm 2001/10/21 23:37:30 1.11 +++ MM.pm 2001/10/21 23:43:42 1.12 @@ -63,8 +63,14 @@ } } +my $libs = $build-apache_libs; my $ccflags = $build-perl_ccopts . $build-ap_ccopts; -my @opts = (INC = $inc, CCFLAGS = $ccflags); + +my @opts = ( +INC = $inc, +CCFLAGS = $ccflags, +LIBS= $libs, +); my @typemaps; my $pwd = Cwd::fastcwd();
cvs commit: modperl-2.0/lib/ModPerl MM.pm
dougm 01/10/21 17:10:13
Modified:lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
add .def files to otherldflags for MakeMaker
Revision ChangesPath
1.65 +20 -11modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Build.pm 2001/10/21 23:37:30 1.64
+++ Build.pm 2001/10/22 00:10:13 1.65
@@ -748,6 +748,12 @@
}
}
+sub export_files_MSWin32 {
+my $self = shift;
+map -def:$self-{cwd}/xs/modperl$_.def,
+(, _inline, _ithreads);
+}
+
sub dynamic_link_header_default {
return 'EOF';
$(MODPERL_LIBNAME).$(MODPERL_DLEXT): $(MODPERL_PIC_OBJS)
@@ -768,8 +774,7 @@
sub dynamic_link_MSWin32 {
my $self = shift;
-my @defs = map -def:$self-{cwd}/xs/modperl$_.def,
-(, _inline, _ithreads);
+my @defs = $self-export_files_MSWin32;
return $self-dynamic_link_header_default .
@defs . 'EOF';
-out:$@
@@ -910,16 +915,20 @@
sub otherldflags {
my $self = shift;
-my @ldflags = ();
+my $flags = \{otherldflags_$^O};
+return unless defined $flags;
+$flags-($self);
+}
-if ($^O eq 'aix') {
-if (my $file = find_in_inc('mod_perl.exp')) {
-push @ldflags, '-bI:' . $file;
-}
-my $httpdexp = $self-apxs('-q' = 'LIBEXECDIR') . '/httpd.exp';
-push @ldflags, -bI:$httpdexp if -e $httpdexp;
-}
-return join(' ', @ldflags);
+#XXX: install *.def / search @INC
+sub otherldflags_MSWin32 {
+my $self = shift;
+my(@defs) = $self-export_files_MSWin32;
+return @defs;
+}
+
+sub otherldflags_aix {
+; #XXX: -bI:*.exp files
}
sub typemaps {
1.13 +1 -0 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MM.pm 2001/10/21 23:43:42 1.12
+++ MM.pm 2001/10/22 00:10:13 1.13
@@ -70,6 +70,7 @@
INC = $inc,
CCFLAGS = $ccflags,
LIBS= $libs,
+dynamic_lib = { OTHERLDFLAGS = $build-otherldflags },
);
my @typemaps;
cvs commit: modperl-2.0/lib/ModPerl MM.pm
dougm 01/10/21 18:38:06
Modified:lib/Apache Build.pm
lib/ModPerl MM.pm
Log:
win32 .xs - .dll's need to link against libmodperl.lib
Revision ChangesPath
1.68 +13 -0 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Build.pm 2001/10/22 01:34:57 1.67
+++ Build.pm 2001/10/22 01:38:06 1.68
@@ -801,6 +801,19 @@
$libs-($self);
}
+sub modperl_libs_MSWin32 {
+my $self = shift;
+#XXX: install/use libmodperl.lib for 3rd party xs modules
+$self-{cwd}/src/modules/perl/libmodperl.lib;
+}
+
+sub modperl_libs {
+my $self = shift;
+my $libs = \{modperl_libs_$^O};
+return unless defined $libs;
+$libs-($self);
+}
+
sub write_src_makefile {
my $self = shift;
my $code = ModPerl::Code-new;
1.14 +1 -1 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MM.pm 2001/10/22 00:10:13 1.13
+++ MM.pm 2001/10/22 01:38:06 1.14
@@ -63,7 +63,7 @@
}
}
-my $libs = $build-apache_libs;
+my $libs = join ' ', $build-apache_libs, $build-modperl_libs;
my $ccflags = $build-perl_ccopts . $build-ap_ccopts;
my @opts = (
cvs commit: modperl-2.0/xs/ModPerl/Const Const.xs
dougm 01/10/21 20:41:38
Modified:src/modules/perl modperl_const.h
xs/APR/Const Const.xs
xs/Apache/Const Const.xs
xs/ModPerl/Const Const.xs
Log:
tweak {ModPerl,APR,Apache}::Const so XS_modperl_const_compile is not directly
referenced outside ModPerl/Const.so
Revision ChangesPath
1.2 +5 -0 modperl-2.0/src/modules/perl/modperl_const.h
Index: modperl_const.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_const.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modperl_const.h 2001/04/11 22:48:29 1.1
+++ modperl_const.h 2001/10/22 03:41:37 1.2
@@ -9,4 +9,9 @@
XS(XS_modperl_const_compile);
+#define MP_newModPerlConstXS(name) \
+ newXS(name ::Const::compile, \
+ CvXSUB(get_cv(ModPerl::Const::compile, TRUE)), \
+ __FILE__)
+
#endif /* MODPERL_CONST_H */
1.3 +2 -1 modperl-2.0/xs/APR/Const/Const.xs
Index: Const.xs
===
RCS file: /home/cvs/modperl-2.0/xs/APR/Const/Const.xs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Const.xs 2001/06/17 03:39:19 1.2
+++ Const.xs 2001/10/22 03:41:37 1.3
@@ -6,4 +6,5 @@
PROTOTYPES: disable
BOOT:
-newXS(APR::Const::compile, XS_modperl_const_compile, __FILE__);
+MP_newModPerlConstXS(APR);
+
1.4 +1 -1 modperl-2.0/xs/Apache/Const/Const.xs
Index: Const.xs
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Const/Const.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Const.xs 2001/06/16 19:14:09 1.3
+++ Const.xs 2001/10/22 03:41:37 1.4
@@ -6,4 +6,4 @@
PROTOTYPES: disable
BOOT:
-newXS(Apache::Const::compile, XS_modperl_const_compile, __FILE__);
+MP_newModPerlConstXS(Apache);
1.4 +8 -0 modperl-2.0/xs/ModPerl/Const/Const.xs
Index: Const.xs
===
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Const/Const.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Const.xs 2001/06/16 19:14:08 1.3
+++ Const.xs 2001/10/22 03:41:38 1.4
@@ -1,6 +1,14 @@
#include mod_perl.h
+#include modperl_const.h
MODULE = ModPerl::ConstPACKAGE = ModPerl::Const
PROTOTYPES: disable
+
+BOOT:
+#XXX:
+#currently used just for {APR,Apache}/Const.{so,dll} to lookup
+#XS_modperl_const_compile
+#linking is fun.
+newXS(ModPerl::Const::compile, XS_modperl_const_compile, __FILE__);
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/10/21 20:49:49
Modified:lib/Apache Build.pm
Log:
cosmetic: add missing \t in win32 Makefile
Revision ChangesPath
1.69 +1 -3 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Build.pm 2001/10/22 01:38:06 1.68
+++ Build.pm 2001/10/22 03:49:49 1.69
@@ -775,9 +775,7 @@
my $self = shift;
my $defs = $self-export_files_MSWin32;
return $self-dynamic_link_header_default .
- $defs . 'EOF';
- -out:$@
-EOF
+ \t$defs . ' -out:$@';
}
sub dynamic_link {
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/10/21 20:57:59
Modified:lib/Apache Build.pm
Log:
clean win32 files (libmodperl.{lib,exp}
Revision ChangesPath
1.70 +3 -1 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Build.pm 2001/10/22 03:49:49 1.69
+++ Build.pm 2001/10/22 03:57:59 1.70
@@ -899,7 +899,9 @@
-c $*.c $(MODPERL_MV) $*$(MODPERL_OBJ_EXT) $*.lo
clean:
- $(MODPERL_RM_F) *.a *.so *.xsc *$(MODPERL_OBJ_EXT) *.lo *.i *.s \
+ $(MODPERL_RM_F) *.a *.so *.xsc \
+ $(MODPERL_LIBNAME).exp $(MODPERL_LIBNAME).lib \
+ *$(MODPERL_OBJ_EXT) *.lo *.i *.s \
$(MODPERL_CLEAN_FILES) \
$(MODPERL_XS_CLEAN_FILES)
cvs commit: modperl-2.0/t/conf .cvsignore
dougm 01/10/21 20:58:26 Modified:src/modules/perl .cvsignore t/conf .cvsignore Log: ignores Revision ChangesPath 1.9 +2 -0 modperl-2.0/src/modules/perl/.cvsignore Index: .cvsignore === RCS file: /home/cvs/modperl-2.0/src/modules/perl/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore2001/04/12 00:30:06 1.8 +++ .cvsignore2001/10/22 03:58:26 1.9 @@ -13,6 +13,8 @@ *.a *.so *.i +*.exp +*.lib TAGS modperl_constants.h modperl_constants.c 1.3 +1 -0 modperl-2.0/t/conf/.cvsignore Index: .cvsignore === RCS file: /home/cvs/modperl-2.0/t/conf/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore2001/09/12 17:11:48 1.2 +++ .cvsignore2001/10/22 03:58:26 1.3 @@ -1,5 +1,6 @@ httpd.conf extra.conf +mime.types modperl_inc.pl modperl_startup.pl apache_test_config.pm
cvs commit: modperl-2.0/src/modules/perl modperl_const.c
dougm 01/10/21 22:42:23 Modified:src/modules/perl modperl_const.c Log: XSRETURN_YES in ModPerl::Const::import makes win32 blowup; XSRETURN_EMPTY is ok Revision ChangesPath 1.8 +1 -1 modperl-2.0/src/modules/perl/modperl_const.c Index: modperl_const.c === RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_const.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- modperl_const.c 2001/05/04 03:44:23 1.7 +++ modperl_const.c 2001/10/22 05:42:23 1.8 @@ -106,5 +106,5 @@ (void)modperl_const_compile(aTHX_ classname, arg, SvPV(ST(i), n_a)); } -XSRETURN_YES; +XSRETURN_EMPTY; }
