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 1999/01/20 19:35:32 UTC
cvs commit: modperl/t/docs startup.pl
dougm 99/01/20 10:35:31
Modified: . Changes ToDo
Apache Apache.pm
Connection Connection.pm
Constants Constants.pm
File File.pm
Log Log.pm
ModuleConfig ModuleConfig.pm
PerlRunXS PerlRunXS.pm
Server Server.pm
Table Table.pm
URI URI.pm
Util Util.pm
lib mod_perl.pm
src/modules/perl mod_perl.c
t/docs startup.pl
Log:
loose @ISA 'DynaLoader' to avoid inheriting AutoLoader::AUTOLOAD
while we're at it, remove old subversion gunk and forget about unimport
Revision Changes Path
1.249 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- Changes 1999/01/19 22:36:06 1.248
+++ Changes 1999/01/20 18:35:18 1.249
@@ -9,6 +9,8 @@
=item 1.17_01-dev
+loose @ISA 'DynaLoader' to avoid inheriting AutoLoader::AUTOLOAD
+
added $r->server->timeout method
skip tests that use xs/ap_ code if installed MMN is not equal to
1.149 +3 -1 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- ToDo 1999/01/19 22:36:07 1.148
+++ ToDo 1999/01/20 18:35:18 1.149
@@ -3,7 +3,9 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
-- loose @ISA 'DynaLoader' to avoid AutoLoader::AUTOLOAD
+- revisit Apache::File::tmpfile
+
+- PerlRun undef &subroutine bug
- @PerlSetVar core dumps outside of %Location (Ask)
1.22 +12 -14 modperl/Apache/Apache.pm
Index: Apache.pm
===================================================================
RCS file: /export/home/cvs/modperl/Apache/Apache.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Apache.pm 1998/11/02 05:29:18 1.21
+++ Apache.pm 1999/01/20 18:35:20 1.22
@@ -1,30 +1,28 @@
package Apache;
+
use strict;
+use mod_perl ();
use Exporter ();
use Apache::Constants qw(OK DECLINED);
+use Apache::Connection ();
+use Apache::Server ();
use Apache::SIG ();
@Apache::EXPORT_OK = qw(exit warn);
-$Apache::VERSION = "1.25";
*import = \&Exporter::import;
-unless(defined &bootstrap) {
- require DynaLoader;
- @Apache::ISA = qw(DynaLoader);
-}
-
if (caller eq "CGI::Apache") {
#we must die here outside of httpd so CGI::Switch works
- bootstrap Apache $Apache::VERSION;
+ die unless $ENV{MOD_PERL};
}
-else {
- if(exists $ENV{MOD_PERL}) {
- require Apache::Server unless $mod_perl::UNIMPORT{'server'};
- require Apache::Connection unless $mod_perl::UNIMPORT{'connection'};
- bootstrap Apache $Apache::VERSION;
- }
- Apache::SIG->set;
+
+Apache::SIG->set;
+
+{
+ no strict;
+ $VERSION = "1.25";
+ __PACKAGE__->mod_perl::boot($VERSION);
}
if($ENV{MOD_PERL} && perl_hook("Sections")) {
1.2 +3 -8 modperl/Connection/Connection.pm
Index: Connection.pm
===================================================================
RCS file: /export/home/cvs/modperl/Connection/Connection.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Connection.pm 1998/07/28 17:09:13 1.1
+++ Connection.pm 1999/01/20 18:35:20 1.2
@@ -1,14 +1,9 @@
package Apache::Connection;
-use strict;
+use Apache ();
-use DynaLoader ();
-@Apache::Connection::ISA = qw(DynaLoader);
-$Apache::Connection::VERSION = '1.00';
-
-if ($ENV{MOD_PERL}) {
- bootstrap Apache::Connection $Apache::Connection::VERSION;
-}
+$VERSION = '1.00';
+__PACKAGE__->mod_perl::boot($VERSION);
1;
__END__
1.16 +5 -8 modperl/Constants/Constants.pm
Index: Constants.pm
===================================================================
RCS file: /export/home/cvs/modperl/Constants/Constants.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Constants.pm 1998/11/20 04:16:05 1.15
+++ Constants.pm 1999/01/20 18:35:21 1.16
@@ -1,14 +1,11 @@
package Apache::Constants;
-$Apache::Constants::VERSION = "1.09";
+use Apache ();
-unless(defined &bootstrap) {
- require DynaLoader;
- @Apache::Constants::ISA = qw(DynaLoader);
-}
-
-if(exists $ENV{MOD_PERL}) {
- bootstrap Apache::Constants $Apache::Constants::VERSION;
+{
+ no strict;
+ $VERSION = "1.09";
+ __PACKAGE__->mod_perl::boot($VERSION);
}
unless(defined &import) {
1.2 +7 -5 modperl/File/File.pm
Index: File.pm
===================================================================
RCS file: /export/home/cvs/modperl/File/File.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- File.pm 1998/09/26 16:09:34 1.1
+++ File.pm 1999/01/20 18:35:21 1.2
@@ -1,12 +1,14 @@
package Apache::File;
-use Apache ();
+use strict;
use Fcntl ();
-use DynaLoader ();
-@ISA = qw(DynaLoader);
-$VERSION = '1.01';
+use Apache ();
-__PACKAGE__->bootstrap($VERSION) if $ENV{MOD_PERL};
+{
+ no strict;
+ $VERSION = '1.01';
+ __PACKAGE__->mod_perl::boot($VERSION);
+}
my $TMPNAM = 'aaaaaa';
my $TMPDIR = $ENV{'TMPDIR'} || $ENV{'TEMP'} || '/tmp';
1.4 +1 -9 modperl/Log/Log.pm
Index: Log.pm
===================================================================
RCS file: /export/home/cvs/modperl/Log/Log.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Log.pm 1998/09/01 17:00:04 1.3
+++ Log.pm 1999/01/20 18:35:22 1.4
@@ -1,17 +1,9 @@
package Apache::Log;
-use strict;
use Apache ();
-use vars qw($VERSION @ISA);
-use DynaLoader ();
-@ISA = qw(DynaLoader);
-
$VERSION = '1.01';
-
-if($ENV{MOD_PERL}) {
- bootstrap Apache::Log $VERSION;
-}
+__PACKAGE__->mod_perl::boot($VERSION);
1;
__END__
1.3 +5 -8 modperl/ModuleConfig/ModuleConfig.pm
Index: ModuleConfig.pm
===================================================================
RCS file: /export/home/cvs/modperl/ModuleConfig/ModuleConfig.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModuleConfig.pm 1998/07/08 18:07:48 1.2
+++ ModuleConfig.pm 1999/01/20 18:35:23 1.3
@@ -1,14 +1,11 @@
package Apache::ModuleConfig;
-use strict;
-$Apache::ModuleConfig::VERSION = "0.01";
-unless(defined &bootstrap) {
- require DynaLoader;
- @Apache::ModuleConfig::ISA = qw(DynaLoader);
-}
+use strict;
-if($ENV{MOD_PERL}) {
- __PACKAGE__->bootstrap;
+{
+ no strict;
+ $VERSION = "0.01";
+ __PACKAGE__->mod_perl::boot($VERSION);
}
sub has_srv_config {
1.4 +2 -5 modperl/PerlRunXS/PerlRunXS.pm
Index: PerlRunXS.pm
===================================================================
RCS file: /export/home/cvs/modperl/PerlRunXS/PerlRunXS.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerlRunXS.pm 1998/09/17 19:16:11 1.3
+++ PerlRunXS.pm 1999/01/20 18:35:23 1.4
@@ -1,7 +1,7 @@
package Apache::PerlRunXS;
use strict;
-use vars qw($Debug $VERSION @ISA);
+use vars qw($Debug $VERSION);
use Apache::Constants qw(:common);
unless (defined $Apache::Registry::NameWithVirtualHost) {
@@ -12,11 +12,8 @@
my $Is_Win32 = $^O eq "MSWin32";
$VERSION = '0.03';
-@ISA = qw(DynaLoader);
-if($ENV{MOD_PERL}) {
- bootstrap Apache::PerlRunXS $VERSION;
-}
+__PACKAGE__->mod_perl::boot($VERSION);
sub new {
my($class, $r) = @_;
1.2 +3 -8 modperl/Server/Server.pm
Index: Server.pm
===================================================================
RCS file: /export/home/cvs/modperl/Server/Server.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Server.pm 1998/07/28 17:09:14 1.1
+++ Server.pm 1999/01/20 18:35:26 1.2
@@ -1,14 +1,9 @@
package Apache::Server;
-use strict;
+use Apache ();
-use DynaLoader ();
-@Apache::Server::ISA = qw(DynaLoader);
-$Apache::Server::VERSION = '1.00';
-
-if ($ENV{MOD_PERL}) {
- bootstrap Apache::Server $Apache::Server::VERSION;
-}
+$VERSION = '1.01';
+__PACKAGE__->mod_perl::boot($VERSION);
1;
__END__
1.4 +3 -8 modperl/Table/Table.pm
Index: Table.pm
===================================================================
RCS file: /export/home/cvs/modperl/Table/Table.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Table.pm 1998/11/04 02:28:51 1.3
+++ Table.pm 1999/01/20 18:35:26 1.4
@@ -1,14 +1,9 @@
package Apache::Table;
-use strict;
-use DynaLoader ();
-use vars qw(@ISA $VERSION);
-@ISA = qw(DynaLoader);
-$VERSION = '0.01';
+use Apache ();
-if($ENV{MOD_PERL}) {
- __PACKAGE__->bootstrap($VERSION);
-}
+$VERSION = '0.01';
+__PACKAGE__->mod_perl::boot($VERSION);
1;
1.3 +2 -7 modperl/URI/URI.pm
Index: URI.pm
===================================================================
RCS file: /export/home/cvs/modperl/URI/URI.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URI.pm 1998/09/17 19:16:13 1.2
+++ URI.pm 1999/01/20 18:35:27 1.3
@@ -1,14 +1,9 @@
package Apache::URI;
-use strict;
use Apache ();
-use DynaLoader ();
-@Apache::URI::ISA = qw(DynaLoader);
-$Apache::URI::VERSION = '1.00';
-if ($ENV{MOD_PERL}) {
- bootstrap Apache::URI $Apache::URI::VERSION;
-}
+$VERSION = '1.00';
+__PACKAGE__->mod_perl::boot($VERSION);
1;
__END__
1.5 +4 -5 modperl/Util/Util.pm
Index: Util.pm
===================================================================
RCS file: /export/home/cvs/modperl/Util/Util.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Util.pm 1998/09/17 15:23:17 1.4
+++ Util.pm 1999/01/20 18:35:27 1.5
@@ -1,7 +1,7 @@
package Apache::Util;
use strict;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
+use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS);
use Exporter ();
use DynaLoader ();
@@ -9,15 +9,14 @@
*unescape_uri = \&Apache::unescape_url;
*unescape_uri_info = \&Apache::unescape_url_info;
-@ISA = qw(Exporter DynaLoader);
+*import = \&Exporter::import;
+
@EXPORT_OK = qw(escape_html escape_uri unescape_uri unescape_uri_info
parsedate ht_time size_string);
%EXPORT_TAGS = (all => \@EXPORT_OK);
$VERSION = '1.01';
-if($ENV{MOD_PERL}) {
- bootstrap Apache::Util $VERSION;
-}
+__PACKAGE__->mod_perl::boot($VERSION);
1;
__END__
1.27 +11 -13 modperl/lib/mod_perl.pm
Index: mod_perl.pm
===================================================================
RCS file: /export/home/cvs/modperl/lib/mod_perl.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_perl.pm 1999/01/06 16:10:27 1.26
+++ mod_perl.pm 1999/01/20 18:35:28 1.27
@@ -1,13 +1,22 @@
package mod_perl;
use 5.003_97;
use strict;
+use DynaLoader ();
BEGIN {
$mod_perl::VERSION = "1.1701";
}
-sub subversion {
- print qq( -DSERVER_SUBVERSION=\\"mod_perl/$mod_perl::VERSION\\" );
+sub boot {
+ my($class, $version) = @_;
+ no strict 'refs';
+ *{$class.'::dl_load_flags'} = DynaLoader->can('dl_load_flags');
+ if ($ENV{MOD_PERL}) {
+ (defined &{$class.'::bootstrap'} ?
+ \&{$class.'::bootstrap'} :
+ \&DynaLoader::bootstrap)->
+ ($class, $version);
+ }
}
sub hook {
@@ -19,19 +28,8 @@
return Apache::perl_hook($try);
}
-sub unimport {
- my $class = shift;
- %mod_perl::UNIMPORT = map { lc($_),1 } @_;
-}
-
sub import {
my $class = shift;
-
- #so we can say EXTRA_CFLAGS = `perl -Mmod_perl -e subversion`
- unless(exists $ENV{MOD_PERL}) {
- *main::subversion = \&subversion;
- return;
- }
return unless @_;
1.71 +0 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mod_perl.c 1999/01/18 22:07:29 1.70
+++ mod_perl.c 1999/01/20 18:35:30 1.71
@@ -619,7 +619,6 @@
perl_tainting_set(s, cls->PerlTaintCheck);
(void)GvSV_init("Apache::__SendHeader");
(void)GvSV_init("Apache::__CurrentCallback");
- (void)GvHV_init("mod_perl::UNIMPORT");
Apache__ServerReStarting(FALSE); /* just for -w */
Apache__ServerStarting_on();
1.32 +0 -2 modperl/t/docs/startup.pl
Index: startup.pl
===================================================================
RCS file: /export/home/cvs/modperl/t/docs/startup.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- startup.pl 1999/01/04 15:10:17 1.31
+++ startup.pl 1999/01/20 18:35:31 1.32
@@ -37,8 +37,6 @@
Apache::Constants->export(qw(HTTP_MULTIPLE_CHOICES));
-#no mod_perl qw(Connection Server);
-
eval {
require Apache::PerlRunXS;
}; $@ = '' if $@;