summaryrefslogtreecommitdiff
path: root/www/apache22/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache22/files')
-rw-r--r--www/apache22/files/apache.sh17
-rw-r--r--www/apache22/files/config.layout22
-rw-r--r--www/apache22/files/patch-Makefile.in74
-rw-r--r--www/apache22/files/patch-configure21
-rw-r--r--www/apache22/files/patch-docs:conf:httpd-std.conf.in56
-rw-r--r--www/apache22/files/patch-docs:conf:ssl-std.conf116
-rw-r--r--www/apache22/files/patch-srclib:apr-util:configure11
-rw-r--r--www/apache22/files/patch-srclib:apr:include:apr_atomic.h17
-rw-r--r--www/apache22/files/patch-support:apachectl.in10
-rw-r--r--www/apache22/files/patch-support:apxs.in49
-rw-r--r--www/apache22/files/patch-support:log_server_status.in24
11 files changed, 0 insertions, 417 deletions
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache.sh
deleted file mode 100644
index 82405c6e8e2c..000000000000
--- a/www/apache22/files/apache.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-PREFIX=@@PREFIX@@
-
-case "$1" in
-start)
- [ "@@SSL@@" = "ssl" -a -f "$PREFIX/etc/apache2/ssl.crt/server.crt" ] && SSL=ssl
- [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start${SSL} > /dev/null && echo -n ' apache2'
- ;;
-stop)
- [ -r @@DESTDIR@@/var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache2'
- ;;
-*)
- echo "Usage: `basename $0` {start|stop}" >&2
- ;;
-esac
-
-exit 0
diff --git a/www/apache22/files/config.layout b/www/apache22/files/config.layout
deleted file mode 100644
index 9344b823d0a2..000000000000
--- a/www/apache22/files/config.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<Layout FreeBSD>
- prefix: /usr/local
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libexecdir: ${exec_prefix}/libexec/apache2
- mandir: ${prefix}/man
- sysconfdir: ${prefix}/etc/apache2
- datadir: ${prefix}/www
- installbuilddir: ${prefix}/share/apache2
- errordir: ${datadir}/error
- iconsdir: ${datadir}/icons
- htdocsdir: ${datadir}/data
- manualdir: ${prefix}/share/doc/apache2
- cgidir: ${datadir}/cgi-bin
- includedir: ${prefix}/include/apache2
- localstatedir: @@DESTDIR@@/var
- runtimedir: ${localstatedir}/run
- logfiledir: ${localstatedir}/log
- proxycachedir: ${datadir}/proxy
- infodir: ${exec_prefix}/share/info
-</Layout>
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
deleted file mode 100644
index 5d49a5d426a9..000000000000
--- a/www/apache22/files/patch-Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
---- Makefile.in.orig Sun Apr 28 16:41:25 2002
-+++ Makefile.in Tue May 7 19:05:12 2002
-@@ -33,23 +33,27 @@
- @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
- @cd $(top_srcdir)/docs/conf; \
- for i in mime.types magic; do \
-- $(INSTALL_DATA) $$i $(sysconfdir); \
-+ test -f $(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(sysconfdir); \
-+ cp -f $$i $$i.default; \
-+ $(INSTALL_DATA) $$i.default $(sysconfdir); \
- done; \
- for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- cd $$j ; \
- for i in *-std*.conf ssl.conf; do \
-- [ -f $$i ] || continue; \
-+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
- ( \
- n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
- sed -e 's#@@ServerRoot@@#$(prefix)#g' \
- -e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
- -e '/@@LoadModule@@/d' \
- < $$i; \
- else \
- sed -n -e '/@@LoadModule@@/q' \
- -e 's#@@ServerRoot@@#$(prefix)#g' \
- -e 's#@@Port@@#$(PORT)#g' \
-+ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
- -e 'p' \
- < $$i; \
- for j in $(DSO_MODULES) "^EOL^"; do \
-@@ -57,7 +61,7 @@
- echo "<IfDefine SSL>"; \
- fi; \
- if test $$j != "^EOL^"; then \
-- echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
-+ echo "LoadModule $${j}_module ${libexecdir:S|^${prefix}/||}/mod_$${j}.so"; \
- fi; \
- if test "x$$j" = "xssl"; then \
- echo "</IfDefine>"; \
-@@ -106,12 +110,14 @@
-
- install-htdocs:
- @echo Installing HTML documents
-- @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
-- @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-+ @test -d $(htdocsdir).default || $(MKINSTALLDIRS) $(htdocsdir).default
-+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir).default)
-+ @test -e $(htdocsdir) || ln -sf $(htdocsdir).default $(htdocsdir)
-+.if !defined(NOPORTDOCS)
- @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
- @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
-- @test "x$(htdocsdir)" != "x" && cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;
--
-+.endif
-+ @test "x$(htdocsdir)" != "x" && cd $(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf {} \;
- install-error:
- @echo Installing error documents
- @test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
-@@ -126,9 +132,10 @@
-
- install-cgi:
- @echo Installing CGIs
-- @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
-- @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir)
-- @test "x$(cgidir)" != "x" && cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;
-+ @test -d $(cgidir).default || $(MKINSTALLDIRS) $(cgidir).default
-+ @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir).default)
-+ @test -e $(cgidir) || ln -sf $(cgidir).default $(cgidir)
-+ @test "x$(cgidir)" != "x" && cd $(cgidir).default && find . -name "CVS" -print | xargs rm -rf {} \;
-
- install-other:
- @test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
diff --git a/www/apache22/files/patch-configure b/www/apache22/files/patch-configure
deleted file mode 100644
index 942d1b071371..000000000000
--- a/www/apache22/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Thu May 2 05:53:00 2002
-+++ configure Wed May 8 16:12:46 2002
-@@ -1503,7 +1503,7 @@
- $srcdir/config.layout > $pldconf
- layout_name=$LAYOUT
- . $pldconf
-- rm $pldconf
-+ rm -f $pldconf
- for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir errordir iconsdir htdocsdir cgidir \
- includedir localstatedir runtimedir logfiledir libdir \
-@@ -15077,6 +15077,9 @@
-
- cat >>confdefs.h <<_ACEOF
- #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
-+#define DEFAULT_ERRORLOG "${rel_logfiledir}/httpd-error.log"
-+#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
-+#define DOCUMENT_LOCATION "${rel_htdocsdir}"
- _ACEOF
-
-
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf.in b/www/apache22/files/patch-docs:conf:httpd-std.conf.in
deleted file mode 100644
index d87b8bdcc679..000000000000
--- a/www/apache22/files/patch-docs:conf:httpd-std.conf.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- docs/conf/httpd-std.conf.in.orig Wed Apr 24 07:24:35 2002
-+++ docs/conf/httpd-std.conf.in Tue May 7 19:29:28 2002
-@@ -68,7 +68,7 @@
- #
- <IfModule !mpm_netware.c>
- <IfModule !perchild.c>
--#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
-+#ScoreBoardFile @rel_runtimedir@/apache_runtime_status
- </IfModule>
- </IfModule>
-
-@@ -263,8 +263,8 @@
- # when the value of (unsigned)Group is above 60000;
- # don't use Group #-1 on these systems!
- #
--User nobody
--Group #-1
-+User www
-+Group www
- </IfModule>
- </IfModule>
-
-@@ -450,7 +450,7 @@
- # logged here. If you *do* define an error logfile for a <VirtualHost>
- # container, that host's errors will be logged there and not here.
- #
--ErrorLog @rel_logfiledir@/error_log
-+ErrorLog @rel_logfiledir@/httpd-error.log
-
- #
- # LogLevel: Control the number of messages logged to the error_log.
-@@ -475,20 +475,20 @@
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
--CustomLog @rel_logfiledir@/access_log common
-+#CustomLog @rel_logfiledir@/httpd-access.log common
-
- #
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
--#CustomLog @rel_logfiledir@/referer_log referer
--#CustomLog @rel_logfiledir@/agent_log agent
-+#CustomLog @rel_logfiledir@/httpd-referer.log referer
-+#CustomLog @rel_logfiledir@/httpd-agent.log agent
-
- #
- # If you prefer a single logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
--#CustomLog @rel_logfiledir@/access_log combined
-+CustomLog @rel_logfiledir@/httpd-access.log combined
-
- #
- # Optionally add a line containing the server version and virtual host
diff --git a/www/apache22/files/patch-docs:conf:ssl-std.conf b/www/apache22/files/patch-docs:conf:ssl-std.conf
deleted file mode 100644
index 267aaae4d9e4..000000000000
--- a/www/apache22/files/patch-docs:conf:ssl-std.conf
+++ /dev/null
@@ -1,116 +0,0 @@
---- docs/conf/ssl-std.conf.orig Thu Nov 8 07:16:09 2001
-+++ docs/conf/ssl-std.conf Sun Apr 7 09:26:02 2002
-@@ -55,15 +55,15 @@
- # Configure the SSL Session Cache: First the mechanism
- # to use and second the expiring timeout (in seconds).
- #SSLSessionCache none
--#SSLSessionCache shmht:logs/ssl_scache(512000)
--#SSLSessionCache shmcb:logs/ssl_scache(512000)
--SSLSessionCache dbm:logs/ssl_scache
-+#SSLSessionCache shmht:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
-+#SSLSessionCache shmcb:@@DESTDIR@@/var/log/httpd-ssl_scache(512000)
-+SSLSessionCache dbm:@@DESTDIR@@/var/log/httpd-ssl_scache
- SSLSessionCacheTimeout 300
-
- # Semaphore:
- # Configure the path to the mutual exclusion semaphore the
- # SSL engine uses internally for inter-process synchronization.
--SSLMutex file:logs/ssl_mutex
-+SSLMutex file:@@DESTDIR@@/var/log/httpd-ssl_mutex
-
- # Pseudo Random Number Generator (PRNG):
- # Configure one or more sources to seed the PRNG of the
-@@ -89,7 +89,7 @@
- # a real server (i.e. somewhere where only root can write).
- # Log levels are (ascending order: higher ones include lower ones):
- # none, error, warn, info, trace, debug.
--SSLLog logs/ssl_engine_log
-+SSLLog @@DESTDIR@@/var/log/httpd-ssl_engine_log
- SSLLogLevel info
-
- ##
-@@ -99,11 +99,11 @@
- <VirtualHost _default_:443>
-
- # General setup for the virtual host
--DocumentRoot "@@ServerRoot@@/htdocs"
-+DocumentRoot "@@ServerRoot@@/www/data"
- ServerName new.host.name:443
- ServerAdmin you@your.address
--ErrorLog logs/error_log
--TransferLog logs/access_log
-+ErrorLog @@DESTDIR@@/var/log/httpd-error.log
-+TransferLog @@DESTDIR@@/var/log/httpd-access.log
-
- # SSL Engine Switch:
- # Enable/Disable SSL for this virtual host.
-@@ -122,16 +122,16 @@
- # built time. Keep in mind that if you've both a RSA and a DSA
- # certificate you can configure both in parallel (to also allow
- # the use of DSA ciphers, etc.)
--SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server.crt
--#SSLCertificateFile @@ServerRoot@@/conf/ssl.crt/server-dsa.crt
-+SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server.crt
-+#SSLCertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/server-dsa.crt
-
- # Server Private Key:
- # If the key is not combined with the certificate, use this
- # directive to point at the key file. Keep in mind that if
- # you've both a RSA and a DSA private key you can configure
- # both in parallel (to also allow the use of DSA ciphers, etc.)
--SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server.key
--#SSLCertificateKeyFile @@ServerRoot@@/conf/ssl.key/server-dsa.key
-+SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server.key
-+#SSLCertificateKeyFile @@ServerRoot@@/etc/apache2/ssl.key/server-dsa.key
-
- # Server Certificate Chain:
- # Point SSLCertificateChainFile at a file containing the
-@@ -140,7 +140,7 @@
- # the referenced file can be the same as SSLCertificateFile
- # when the CA certificates are directly appended to the server
- # certificate for convinience.
--#SSLCertificateChainFile @@ServerRoot@@/conf/ssl.crt/ca.crt
-+#SSLCertificateChainFile @@ServerRoot@@/etc/apache2/ssl.crt/ca.crt
-
- # Certificate Authority (CA):
- # Set the CA certificate verification path where to find CA
-@@ -149,8 +149,8 @@
- # Note: Inside SSLCACertificatePath you need hash symlinks
- # to point to the certificate files. Use the provided
- # Makefile to update the hash symlinks after changes.
--#SSLCACertificatePath @@ServerRoot@@/conf/ssl.crt
--#SSLCACertificateFile @@ServerRoot@@/conf/ssl.crt/ca-bundle.crt
-+#SSLCACertificatePath @@ServerRoot@@/etc/apache2/ssl.crt
-+#SSLCACertificateFile @@ServerRoot@@/etc/apache2/ssl.crt/ca-bundle.crt
-
- # Certificate Revocation Lists (CRL):
- # Set the CA revocation path where to find CA CRLs for client
-@@ -159,8 +159,8 @@
- # Note: Inside SSLCARevocationPath you need hash symlinks
- # to point to the certificate files. Use the provided
- # Makefile to update the hash symlinks after changes.
--#SSLCARevocationPath @@ServerRoot@@/conf/ssl.crl
--#SSLCARevocationFile @@ServerRoot@@/conf/ssl.crl/ca-bundle.crl
-+#SSLCARevocationPath @@ServerRoot@@/etc/apache2/ssl.crl
-+#SSLCARevocationFile @@ServerRoot@@/etc/apache2/ssl.crl/ca-bundle.crl
-
- # Client Authentication (Type):
- # Client certificate verification type and depth. Types are
-@@ -220,7 +220,7 @@
- <Files ~ "\.(cgi|shtml|phtml|php3?)$">
- SSLOptions +StdEnvVars
- </Files>
--<Directory "@@ServerRoot@@/cgi-bin">
-+<Directory "@@ServerRoot@@/www/cgi-bin">
- SSLOptions +StdEnvVars
- </Directory>
-
-@@ -255,7 +255,7 @@
- # Per-Server Logging:
- # The home of a custom SSL log file. Use this when you want a
- # compact non-error SSL logfile on a virtual host basis.
--CustomLog logs/ssl_request_log \
-+CustomLog @@DESTDIR@@/var/log/httpd-ssl_request.log \
- "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
- </VirtualHost>
diff --git a/www/apache22/files/patch-srclib:apr-util:configure b/www/apache22/files/patch-srclib:apr-util:configure
deleted file mode 100644
index 755790d2b41c..000000000000
--- a/www/apache22/files/patch-srclib:apr-util:configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- srclib/apr-util/configure.orig Wed May 1 13:52:45 2002
-+++ srclib/apr-util/configure Tue May 7 19:34:07 2002
-@@ -11419,7 +11419,7 @@
- fi;
-
- if test -z "$expat_include_dir"; then
-- for d in /usr /usr/local xml/expat-cvs xml/expat $srcdir/xml/expat ; do
-+ for d in xml/expat-cvs xml/expat $srcdir/xml/expat ; do
-
- echo "$as_me:$LINENO: checking for Expat in $d" >&5
- echo $ECHO_N "checking for Expat in $d... $ECHO_C" >&6
diff --git a/www/apache22/files/patch-srclib:apr:include:apr_atomic.h b/www/apache22/files/patch-srclib:apr:include:apr_atomic.h
deleted file mode 100644
index 14d1dd444ba3..000000000000
--- a/www/apache22/files/patch-srclib:apr:include:apr_atomic.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- srclib/apr/include/apr_atomic.h.orig Wed May 1 03:41:59 2002
-+++ srclib/apr/include/apr_atomic.h Tue May 7 19:37:45 2002
-@@ -175,10 +175,10 @@
- #include <machine/atomic.h>
-
- #define apr_atomic_t apr_uint32_t
--#define apr_atomic_add(mem, val) atomic_add_int(mem,val)
--#define apr_atomic_dec(mem) atomic_subtract_int(mem,1)
--#define apr_atomic_inc(mem) atomic_add_int(mem,1)
--#define apr_atomic_set(mem, val) atomic_set_int(mem, val)
-+#define apr_atomic_add(mem, val) (atomic_add_int(mem,val),mem)
-+#define apr_atomic_dec(mem) (atomic_subtract_int(mem,1),mem)
-+#define apr_atomic_inc(mem) (atomic_add_int(mem,1),mem)
-+#define apr_atomic_set(mem, val) (atomic_set_int(mem, val),mem)
- #define apr_atomic_read(mem) (*mem)
-
- #define APR_ATOMIC_NEED_CAS_DEFAULT 1
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in
deleted file mode 100644
index 0287f77bed6b..000000000000
--- a/www/apache22/files/patch-support:apachectl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- support/apachectl.in.orig Thu Apr 4 18:15:44 2002
-+++ support/apachectl.in Sun Apr 7 08:49:25 2002
-@@ -47,6 +47,7 @@
- #
- # -------------------- --------------------
- # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
-+eval `limits -e -C daemon` >/dev/null 2>&1
-
- ERROR=0
- if [ "x$ARGV" = "x" ] ; then
diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in
deleted file mode 100644
index ffa21a1ff918..000000000000
--- a/www/apache22/files/patch-support:apxs.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- support/apxs.in.orig Tue Apr 30 03:09:02 2002
-+++ support/apxs.in Wed May 8 19:41:06 2002
-@@ -66,7 +66,7 @@
-
- # read the configuration variables once
- my %config_vars = ();
--get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
-+get_config_vars("$prefix/share/apache2/config_vars.mk",\%config_vars);
-
- my $exec_prefix = get_vars("exec_prefix");
- my $CFG_TARGET = get_vars("progname");
-@@ -223,7 +223,7 @@
- my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
- $httpd = eval qq("$httpd");
- $httpd = eval qq("$httpd");
--my $envvars = get_vars("bindir") . "/envvars";
-+my $envvars = get_vars("sbindir") . "/envvars";
- $envvars = eval qq("$envvars");
- $envvars = eval qq("$envvars");
-
-@@ -418,7 +418,7 @@
- $la =~ s|\.c$|.la|;
- my $o = $s;
- $o =~ s|\.c$|.o|;
-- push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-+ push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
- unshift(@objs, $lo);
- }
-
-@@ -443,7 +443,7 @@
- $opt .= " -l$opt_l";
- }
-
-- push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
-+ push(@cmds, "$prefix/share/apache2/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
-
- # execute the commands
- &execute_cmds(@cmds);
-@@ -474,8 +474,8 @@
- $t =~ s|^.+/([^/]+)$|$1|;
- $t =~ s|\.la$|\.so|;
- if ($opt_i) {
-- push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
-- "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
-+ push(@cmds, "$prefix/share/apache2/instdso.sh SH_LIBTOOL='" .
-+ "$prefix/share/apache2/libtool' $f $CFG_LIBEXECDIR");
- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
- }
-
diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support:log_server_status.in
deleted file mode 100644
index 652edf444a4c..000000000000
--- a/www/apache22/files/patch-support:log_server_status.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- support/log_server_status.in.orig Thu Mar 14 05:48:06 2002
-+++ support/log_server_status.in Sun Apr 7 08:47:53 2002
-@@ -63,10 +63,10 @@
- #
- require 'sys/socket.ph';
-
--$wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/19960312"
-+$wherelog = "@logfiledir@/httpd-status-"; # Logs will be like "/var/log/httpd-status-19960312.log"
- $server = "localhost"; # Name of server, could be "www.foo.com"
- $port = "80"; # Port on server
--$request = "/status/?auto"; # Request to send
-+$request = "/status-status/?auto"; # Request to send
-
- sub tcp_connect
- {
-@@ -96,7 +96,7 @@
- chomp($date);
- ($day,$time)=split(/:/,$date);
- $res=&tcp_connect($server,$port);
-- open(OUT,">>$wherelog$day");
-+ open(OUT,">>$wherelog$day.log");
- if ($res) {
- print OUT "$time:-1:-1:-1:-1:$res\n";
- exit 1;