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/05/28 19:43:43 UTC
cvs commit: modperl/t/modules cgi.t embperl.t
dougm 98/05/28 10:43:43
Modified: . .cvsignore MANIFEST Makefile.PL ToDo
t .cvsignore
t/docs .cvsignore
t/modules cgi.t embperl.t
Added: lib .cvsignore mod_perl.pm.PL
src/modules/perl .cvsignore
t/docs/subr .exists
Removed: . test
lib mod_perl.pm
Log:
misc cleanups
Revision Changes Path
1.3 +15 -0 modperl/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/modperl/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1998/05/22 07:43:34 1.2
+++ .cvsignore 1998/05/28 17:43:32 1.3
@@ -1,6 +1,21 @@
diff.txt
+status.txt
Makefile
pod2html-itemcache
pod2html-dircache
pm_to_blib
blib
+lib/Apache/MyConfig.pm
+t/conf/httpd.conf
+t/conf/httpd.conf.old
+t/docs/blib.pl
+t/docs/subr/index.html
+t/docs/test.shtml
+t/httpd
+t/httpd.conf
+t/net/config.pl
+t/net/perl/cgi.pl
+t/report
+src/modules/perl/mod_perl_version.h
+lib/mod_perl.pm
+*.tar.gz
1.17 +6 -1 modperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /export/home/cvs/modperl/MANIFEST,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MANIFEST 1998/05/22 19:31:05 1.16
+++ MANIFEST 1998/05/28 17:43:32 1.17
@@ -24,7 +24,7 @@
eg/test.pl
eg/registry.pl
eg/README
-lib/mod_perl.pm
+lib/mod_perl.pm.PL
lib/Apache/src.pm
lib/Apache/httpd_conf.pm
lib/Apache/fork.pm
@@ -164,3 +164,8 @@
apaci/libperl.module
apaci/mod_perl.config
apaci/mod_perl.config.sh
+.gdbinit
+INSTALL.simple
+INSTALL.simple.ssl
+INSTALL.simple.stronghold
+t/docs/subr/.exists
1.31 +6 -9 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.PL 1998/05/22 06:09:18 1.30
+++ Makefile.PL 1998/05/28 17:43:33 1.31
@@ -60,14 +60,6 @@
"mod_ssl.h" => "Stronghold",
);
-unless ($Is_Win32) {
- # Patch up the Makefiles we are going to use with Apache
- system $^X, "-pi", "-e", "s!^PERL\\s*=.*!PERL=$Config{'perlpath'}!",
- <src/Makefile.tmpl*>, "src/modules/perl/Makefile";
-
- mkdir "t/logs", 0755;
-}
-
unless (-e "t/docs/test.shtml") {
cp "t/docs/test.html", "t/docs/test.shtml";
}
@@ -75,6 +67,7 @@
chmod 0644, "t/conf/mod_perl_srm.conf";
unless ($Is_Win32) {
+ mkdir "t/logs", 0755;
system "chmod a+x t/net/perl/* t/net/perl/io/*";
}
@@ -101,7 +94,6 @@
}
rmtree "t/docs/stacked", 0, 0;
-rmtree "t/docs/subr", 0, 0;
my(@test_pre_init) = qq(
test_pre_init:
@@ -501,6 +493,9 @@
setup_for_static();
+ iedit "$APACHE_SRC/modules/perl/Makefile",
+ "s!^PERL\\s*=.*!PERL=$Config{'perlpath'}!";
+
for (@callback_hooks) {
($k,$v) = ($_,$callback_hooks{$_});
@@ -721,6 +716,7 @@
$pmv =~ s/-dev$//;
my $hooks = "@mod_perl_hooks";
my $dummy = "hooks=`$hooks'\n" unless $hooks;
+ cp "lib/mod_perl.pm.PL", "lib/mod_perl.pm";
iedit "lib/mod_perl.pm", qq(s/VERSION .*/VERSION = "$pmv";/);
iedit "lib/mod_perl.pm",
@@ -1435,6 +1431,7 @@
sub write_version_h {
my $d = shift;
+ unlink "$d/mod_perl_version.h";
local *FH;
open FH, ">$d/mod_perl_version.h" or die "can't write $d/mod_perl_version.h $!";
print FH <<EOF;
1.24 +17 -0 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ToDo 1998/05/22 06:02:00 1.23
+++ ToDo 1998/05/28 17:43:33 1.24
@@ -16,6 +16,8 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
+- post_request_handler for r->proxyreq
+
- Gerald's report of Embperl/sub-request/print breakage
- make sure SERVER_VERSION/SERVER_SUBVERSION, etc. is in sync w/ 1.3b7 changes
@@ -45,6 +47,18 @@
- $ENV{PATH}: don't let perl_clear_env() change it's value
+- PATH_INFO can break Apache::Registry
+ "Jeffrey W. Baker" <jw...@tamu.edu>
+
+- File::copy($file,*STDOUT) doesn't work
+ Bill Coffman <co...@value.net>
+
+- something broken inside #ifndef PERL_MARK_WHERE
+ "Kermit Tensmeyer" <ke...@brite.net>
+
+- solaris 2.6/apache1.2.6/mod_perl1.11 exploit
+ sfarrell+lists@farrell.org
+
- documentation
+ modperl.opensrc.org
+ PerlRun::handler
@@ -135,6 +149,9 @@
---------------------------------------------------------------------------
NEW STUFF
---------------------------------------------------------------------------
+
+- provide namespace protection when 'use Foo' might be two different modules
+ i.e. re-visit Apache::Safe
- move away from read_client_block to {setup,should,get}_client_block
see Apache.pm/Apache::new_read
1.1 modperl/lib/.cvsignore
Index: .cvsignore
===================================================================
mod_perl.pm
1.1 modperl/lib/mod_perl.pm.PL
Index: mod_perl.pm.PL
===================================================================
package mod_perl;
use 5.003_97;
use strict;
BEGIN {
$mod_perl::VERSION = "1.1101";
}
sub subversion {
print qq( -DSERVER_SUBVERSION=\\"mod_perl/$mod_perl::VERSION\\" );
}
sub hook {
my $hook = shift;
return 1 if $hook =~ /^PerlHandler$/;
(my $try = $hook) =~ s/^Perl//;
$try =~ s/Handler$//;
return Apache::perl_hook($try);
}
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;
}
$ENV{MOD_PERL} = $mod_perl::VERSION;
$ENV{GATEWAY_INTERFACE} = "CGI-Perl/1.1";
return unless @_;
if($_[0] =~ /^\d/) {
$class->UNIVERSAL::VERSION(shift);
}
for my $hook (@_) {
require Apache;
my $enabled = hook($hook);
next if $enabled > 0;
if($enabled < 0) {
die "unknown mod_perl option `$hook'\n";
}
else {
(my $flag = $hook) =~ s/([A-Z])/_$1/g;
$flag = uc $flag;
die "`$hook' not enabled, rebuild mod_perl with PERL$flag=1\n";
}
}
}
sub hooks { qw() }
1;
__END__
1.1 modperl/src/modules/perl/.cvsignore
Index: .cvsignore
===================================================================
mod_perl_version.h
1.2 +4 -1 modperl/t/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/modperl/t/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/05/01 03:17:19 1.1
+++ .cvsignore 1998/05/28 17:43:37 1.2
@@ -1,3 +1,6 @@
report
logs
-httpd.conf
\ No newline at end of file
+httpd.conf
+httpd.conf.old
+httpd
+
1.2 +1 -0 modperl/t/docs/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/modperl/t/docs/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1998/05/01 03:17:20 1.1
+++ .cvsignore 1998/05/28 17:43:39 1.2
@@ -1 +1,2 @@
test.shtml
+blib.pl
1.1 modperl/t/docs/subr/.exists
Index: .exists
===================================================================
Thu May 28 10:42:33 EDT 1998
1.3 +3 -1 modperl/t/modules/cgi.t
Index: cgi.t
===================================================================
RCS file: /export/home/cvs/modperl/t/modules/cgi.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cgi.t 1998/05/04 23:52:58 1.2
+++ cgi.t 1998/05/28 17:43:41 1.3
@@ -11,7 +11,9 @@
eval {
require HTTP::Request::Common;
- if($CGI::VERSION >= 2.39) {
+ if($CGI::VERSION >= 2.39 and
+ $HTTP::Request::Common::VERSION >= 1.08)
+ {
$tests += 2;
$have_com = 1;
}
1.4 +1 -1 modperl/t/modules/embperl.t
Index: embperl.t
===================================================================
RCS file: /export/home/cvs/modperl/t/modules/embperl.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- embperl.t 1998/05/17 23:31:55 1.3
+++ embperl.t 1998/05/28 17:43:42 1.4
@@ -1,7 +1,7 @@
use Apache::test;
-if($ENV{USER} eq 'dougm' and
+if(defined $ENV{USER} and $ENV{USER} eq 'dougm' and
$net::callback_hooks{MMN} < 19980413)
{
skip_test; #1.3b6 broke binary compat