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/10/30 05:37:34 UTC
cvs commit: modperl/t/conf httpd.conf-dist httpd.conf.pl
dougm 98/10/29 20:37:34
Modified: . Makefile.PL SUPPORT
t/conf httpd.conf-dist httpd.conf.pl
Log:
s/^mod_perl_(error_log|httpd.pid)/$1/g
Revision Changes Path
1.107 +7 -7 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /export/home/cvs/modperl/Makefile.PL,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- Makefile.PL 1998/10/30 02:40:01 1.106
+++ Makefile.PL 1998/10/30 04:37:27 1.107
@@ -107,9 +107,9 @@
Apache/Apache.xs
Constants/Constants.xs
t/modules/ssi.t
- t/logs/mod_perl_error_log
+ t/logs/error_log
t/conf/srm.conf
- t/logs/mod_perl_httpd.pid
+ t/logs/httpd.pid
};
#t/conf/httpd.conf
#t/net/config.pl
@@ -151,7 +151,7 @@
$PERL_EXTRA_CFLAGS = "";
$SSLCacheServerPort = 8539;
$SSL_BASE = "";
-$Port = $Is_dougm ? 8530 : 8529;
+$Port = 8529;
#so Doug can 'make test' different-builds@sametime/samebox
if(!$Is_Win32 and $ENV{RANDOM_PORT} and $$ > 8000 and $$ < 30000) {
$PORT ||= $$;
@@ -1281,11 +1281,11 @@
TEST_VERBOSE=0
kill_httpd:
- kill `cat t/logs/mod_perl_httpd.pid`
+ kill `cat t/logs/httpd.pid`
@$(RM_F) t/conf/srm.conf
@$(RM_F) t/logs/mod_perl.lock*
- $(RM_F) t/logs/mod_perl_httpd.pid
- $(RM_F) t/logs/mod_perl_error_log
+ $(RM_F) t/logs/httpd.pid
+ $(RM_F) t/logs/error_log
start_httpd: test_pre_init
@(cd t/conf; test -f httpd.conf || cp httpd.conf-dist httpd.conf)
@@ -1293,7 +1293,7 @@
@$(TOUCH) t/conf/srm.conf
$(APACHE_SRC)/$(HTTPD) -f `pwd`/t/conf/httpd.conf -X -d `pwd`/t &
@echo httpd listening on port $(PORT)
- @echo will write error_log to: t/logs/mod_perl_error_log
+ @echo will write error_log to: t/logs/error_log
@echo "letting apache warm up...\c"
@sleep 2
@echo done
1.10 +2 -2 modperl/SUPPORT
Index: SUPPORT
===================================================================
RCS file: /export/home/cvs/modperl/SUPPORT,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SUPPORT 1998/08/26 01:47:10 1.9
+++ SUPPORT 1998/10/30 04:37:30 1.10
@@ -77,7 +77,7 @@
Server configuration details
-relevant sections of t/logs/mod_perl_error_log or logs/error_log
+relevant sections of your ErrorLog (make test's is: t/logs/error_log)
If 'make test' fails, the output of 'make test TEST_VERBOSE=1'
@@ -104,7 +104,7 @@
Here's how to get a backtrace:
% cd mod_perl-x.xx
- % touch /tmp/mod_perl_srm.conf
+ % touch conf/srm.conf
% gdb ../apache_x.xx/src/httpd
(gdb) run -X -f `pwd`/t/conf/httpd.conf -d `pwd`/t
[now make request that causes core dump]
1.16 +2 -2 modperl/t/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-dist,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- httpd.conf-dist 1998/10/29 19:04:39 1.15
+++ httpd.conf-dist 1998/10/30 04:37:31 1.16
@@ -144,8 +144,8 @@
#end mod_perl stuff
-ErrorLog logs/mod_perl_error_log
-PidFile logs/mod_perl_httpd.pid
+ErrorLog logs/error_log
+PidFile logs/httpd.pid
AccessConfig /dev/null
ResourceConfig conf/srm.conf
TypesConfig /dev/null
1.21 +2 -2 modperl/t/conf/httpd.conf.pl
Index: httpd.conf.pl
===================================================================
RCS file: /export/home/cvs/modperl/t/conf/httpd.conf.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- httpd.conf.pl 1998/10/01 03:21:47 1.20
+++ httpd.conf.pl 1998/10/30 04:37:32 1.21
@@ -191,8 +191,8 @@
};
}
-$ErrorLog = "logs/mod_perl_error_log";
-$PidFile = "logs/mod_perl_httpd.pid";
+$ErrorLog = "logs/error_log";
+$PidFile = "logs/httpd.pid";
$AccessConfig = $TypesConfig = $ScoreBoardFile = "$dir/docs/null.txt";