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/17 16:01:29 UTC
cvs commit: modperl/t/net/perl hooks.pl
dougm 98/07/17 07:01:29
Modified: . Changes ToDo
lib/Apache Status.pm
src/modules/perl Apache.xs mod_perl.c mod_perl.h
t/docs startup.pl
t/net/perl hooks.pl
Log:
TAINT_NOT just after perl_run(), otherwise 'make test' may choke (when
it shouldn't):
"Insecure dependency in eval while running with -T switch.
Callback called exit."
[Salvador Ortiz]
move "rwrite returned -1" message from warn level to debug level
Revision Changes Path
1.76 +8 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Changes 1998/07/15 15:05:12 1.75
+++ Changes 1998/07/17 14:01:23 1.76
@@ -7,6 +7,14 @@
=over 3
=item 1.13_01-dev
+
+TAINT_NOT just after perl_run(), otherwise 'make test' may choke (when
+it shouldn't):
+ "Insecure dependency in eval while running with -T switch.
+ Callback called exit."
+[Salvador Ortiz]
+
+move "rwrite returned -1" message from warn level to debug level
Makefile.PL fix for 'make test' and --enable-shared= modules
1.44 +2 -0 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ToDo 1998/07/13 13:25:22 1.43
+++ ToDo 1998/07/17 14:01:23 1.44
@@ -115,6 +115,8 @@
NEW STUFF
---------------------------------------------------------------------------
+- make Apache->server->register_cleanup work
+
- mod_perl C code symbols, should look at cleaning up names with a
common prefix, e.g. mp_, mod_perl_, mperl_ ?
also static-ize those functions we can
1.8 +2 -1 modperl/lib/Apache/Status.pm
Index: Status.pm
===================================================================
RCS file: /export/home/cvs/modperl/lib/Apache/Status.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Status.pm 1998/05/08 02:40:47 1.7
+++ Status.pm 1998/07/17 14:01:25 1.8
@@ -1,7 +1,7 @@
package Apache::Status;
use strict;
-$Apache::Status::VERSION = (qw$Revision: 1.7 $)[1];
+$Apache::Status::VERSION = (qw$Revision: 1.8 $)[1];
my %is_installed = ();
@@ -132,6 +132,7 @@
"</tr>";
foreach $file (sort keys %INC) {
+ local $^W = 0;
next if $file =~ m:^/:;
next unless $file =~ m:\.pm:;
next unless $INC{$file}; #e.g. fake Apache/TieHandle.pm
1.41 +2 -2 modperl/src/modules/perl/Apache.xs
Index: Apache.xs
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/Apache.xs,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Apache.xs 1998/07/13 01:55:17 1.40
+++ Apache.xs 1998/07/17 14:01:25 1.41
@@ -1031,7 +1031,7 @@
buffer += HUGE_STRING_LEN;
}
if(sent < 0) {
- mod_perl_warn(r->server, "mod_perl: rwrite returned -1");
+ mod_perl_debug(r->server, "mod_perl: rwrite returned -1");
break;
}
len -= sent;
@@ -1039,7 +1039,7 @@
}
#else
if((sent = rwrite(buffer, len, r)) < 0) {
- mod_perl_warn(r->server, "mod_perl: rwrite returned -1");
+ mod_perl_debug(r->server, "mod_perl: rwrite returned -1");
break;
}
RETVAL += sent;
1.32 +2 -0 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_perl.c 1998/07/14 00:51:37 1.31
+++ mod_perl.c 1998/07/17 14:01:25 1.32
@@ -552,6 +552,8 @@
status = perl_run(perl);
+ TAINT_NOT; /* At this time all is safe */
+
av_push(GvAV(incgv), newSVpv(server_root_relative(p,""),0));
av_push(GvAV(incgv), newSVpv(server_root_relative(p,"lib/perl"),0));
1.34 +5 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_perl.h 1998/07/13 13:25:25 1.33
+++ mod_perl.h 1998/07/17 14:01:26 1.34
@@ -214,7 +214,7 @@
my_setenv(key, val); \
}
-#define mp_debug mod_perl_debug
+#define mp_debug mod_perl_debug_flags
extern U32 mp_debug;
@@ -378,6 +378,9 @@
#define mod_perl_notice(s,msg) \
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, s, msg)
+#define mod_perl_debug(s,msg) \
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, s, msg)
+
#define mod_perl_log_reason(msg, file, r) \
aplog_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, r->server, \
"access to %s failed for %s, reason: %s", \
@@ -389,6 +392,7 @@
#else
#define mod_perl_error(s,msg) log_error(msg,s)
+#define mod_perl_debug mod_perl_error
#define mod_perl_warn mod_perl_error
#define mod_perl_notice mod_perl_error
#define mod_perl_log_reason log_reason
1.13 +2 -5 modperl/t/docs/startup.pl
Index: startup.pl
===================================================================
RCS file: /export/home/cvs/modperl/t/docs/startup.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- startup.pl 1998/07/14 00:51:39 1.12
+++ startup.pl 1998/07/17 14:01:27 1.13
@@ -45,17 +45,13 @@
#test Apache::RegistryLoader
{
- use Cwd ();
use Apache::RegistryLoader ();
use DirHandle ();
use strict;
- local $^W = 0; #shutup line 164 Cwd.pm
-
- my $cwd = Cwd::getcwd;
my $rl = Apache::RegistryLoader->new(trans => sub {
my $uri = shift;
- $cwd."/t/net${uri}";
+ $Apache::Server::CWD."/t/net${uri}";
});
my $d = DirHandle->new("t/net/perl");
@@ -63,6 +59,7 @@
for my $file ($d->read) {
next if $file eq "hooks.pl";
next unless $file =~ /\.pl$/;
+ Apache->untaint($file);
my $status = $rl->handler("/perl/$file");
unless($status == 200) {
die "pre-load of `/perl/$file' failed, status=$status\n";
1.5 +1 -4 modperl/t/net/perl/hooks.pl
Index: hooks.pl
===================================================================
RCS file: /export/home/cvs/modperl/t/net/perl/hooks.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hooks.pl 1998/07/14 00:51:42 1.4
+++ hooks.pl 1998/07/17 14:01:28 1.5
@@ -1,13 +1,10 @@
use Apache ();
-use Cwd 'getcwd';
my $tests = 0;
-my $pwd = getcwd;
my $r = Apache->request;
$r->content_type("text/html");
$r->send_http_header;
-my $doc_root = "$pwd/../../docs";
-#Apache->untaint($doc_root);
+my $doc_root = $r->document_root;
my $ht_access = "$doc_root/.htaccess";
my $hooks_file = "$doc_root/hooks.txt";