summaryrefslogtreecommitdiff
path: root/www/apache22/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache22/files')
-rw-r--r--www/apache22/files/patch-ab77
-rw-r--r--www/apache22/files/patch-ag89
-rw-r--r--www/apache22/files/patch-ak50
-rw-r--r--www/apache22/files/patch-al44
4 files changed, 229 insertions, 31 deletions
diff --git a/www/apache22/files/patch-ab b/www/apache22/files/patch-ab
index 19eed9e69a58..c815f9f2b384 100644
--- a/www/apache22/files/patch-ab
+++ b/www/apache22/files/patch-ab
@@ -1,36 +1,51 @@
-*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
---- conf/access.conf-dist Fri Jul 5 06:32:54 1996
+*** src/main/fnmatch.h.orig Thu Oct 16 22:57:01 1997
+--- src/main/fnmatch.h Wed Oct 22 22:44:12 1997
***************
-*** 12,18 ****
+*** 35,40 ****
+--- 35,44 ----
- # This should be changed to whatever you set DocumentRoot to.
+ /* This file has been modified by the Apache Group. */
-! <Directory /usr/local/etc/httpd/htdocs>
++ #ifdef __FreeBSD__
++ #include "freebsd_fnmatch.h"
++ extern int is_fnmatch(const char *);
++ #else
+ #ifndef _FNMATCH_H_
+ #define _FNMATCH_H_
- # This may also be "None", "All", or any combination of "Indexes",
- # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
---- 12,18 ----
-
- # This should be changed to whatever you set DocumentRoot to.
-
-! <Directory /usr/local/www/data>
-
- # This may also be "None", "All", or any combination of "Indexes",
- # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
***************
-*** 38,44 ****
- # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
- # CGI directory exists, if you have that configured.
-
-! <Directory /usr/local/etc/httpd/cgi-bin>
- AllowOverride None
- Options None
- </Directory>
---- 38,44 ----
- # /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
- # CGI directory exists, if you have that configured.
-
-! <Directory /usr/local/www/cgi-bin>
- AllowOverride None
- Options None
- </Directory>
+*** 50,52 ****
+--- 54,57 ----
+ extern int is_fnmatch(const char *);
+
+ #endif /* !_FNMATCH_H_ */
++ #endif /* !FreeBSD */
+*** src/main/fnmatch.c.orig Thu Oct 16 22:57:01 1997
+--- src/main/fnmatch.c Wed Oct 22 22:40:52 1997
+***************
+*** 34,39 ****
+--- 34,40 ----
+ * SUCH DAMAGE.
+ */
+
++ #ifndef __FreeBSD__
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
+ #endif /* LIBC_SCCS and not lint */
+***************
+*** 169,175 ****
+ }
+ return (ok == negate ? NULL : pattern);
+ }
+!
+
+ /* This function is an Apache addition */
+ /* return non-zero if pattern has any glob chars in it */
+--- 170,176 ----
+ }
+ return (ok == negate ? NULL : pattern);
+ }
+! #endif /* !FreeBSD */
+
+ /* This function is an Apache addition */
+ /* return non-zero if pattern has any glob chars in it */
diff --git a/www/apache22/files/patch-ag b/www/apache22/files/patch-ag
new file mode 100644
index 000000000000..9e439016a195
--- /dev/null
+++ b/www/apache22/files/patch-ag
@@ -0,0 +1,89 @@
+*** conf/httpd.conf-dist.orig Thu Oct 16 22:55:54 1997
+--- conf/httpd.conf-dist Wed Oct 22 20:58:36 1997
+***************
+*** 34,40 ****
+ # suggested workaround is to create a user www and use that user.
+
+ User nobody
+! Group #-1
+
+ # ServerAdmin: Your address, where problems with the server should be
+ # e-mailed.
+--- 34,40 ----
+ # suggested workaround is to create a user www and use that user.
+
+ User nobody
+! Group nogroup
+
+ # ServerAdmin: Your address, where problems with the server should be
+ # e-mailed.
+***************
+*** 56,76 ****
+ # ErrorLog: The location of the error log file. If this does not start
+ # with /, ServerRoot is prepended to it.
+
+! ErrorLog logs/error_log
+
+ # TransferLog: The location of the transfer log file. If this does not
+ # start with /, ServerRoot is prepended to it.
+
+! TransferLog logs/access_log
+
+ # PidFile: The file the server should log its pid to
+! PidFile logs/httpd.pid
+
+ # ScoreBoardFile: File used to store internal server process information.
+ # Not all architectures require this. But if yours does (you'll know because
+ # this file is created when you run Apache) then you *must* ensure that
+ # no two invocations of Apache share the same scoreboard file.
+! ScoreBoardFile logs/apache_status
+
+ # ServerName allows you to set a host name which is sent back to clients for
+ # your server if it's different than the one the program would get (i.e. use
+--- 56,78 ----
+ # ErrorLog: The location of the error log file. If this does not start
+ # with /, ServerRoot is prepended to it.
+
+! ErrorLog /var/log/httpd-error.log
+
+ # TransferLog: The location of the transfer log file. If this does not
+ # start with /, ServerRoot is prepended to it.
+
+! TransferLog /var/log/httpd-access.log
+!
+! #LogFormat "%h %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-Agent}i\""
+
+ # PidFile: The file the server should log its pid to
+! PidFile /var/run/httpd.pid
+
+ # ScoreBoardFile: File used to store internal server process information.
+ # Not all architectures require this. But if yours does (you'll know because
+ # this file is created when you run Apache) then you *must* ensure that
+ # no two invocations of Apache share the same scoreboard file.
+! ScoreBoardFile /var/run/apache_runtime_status
+
+ # ServerName allows you to set a host name which is sent back to clients for
+ # your server if it's different than the one the program would get (i.e. use
+***************
+*** 175,184 ****
+
+ #<VirtualHost host.some_domain.com>
+ #ServerAdmin webmaster@host.some_domain.com
+! #DocumentRoot /www/docs/host.some_domain.com
+ #ServerName host.some_domain.com
+! #ErrorLog logs/host.some_domain.com-error_log
+! #TransferLog logs/host.some_domain.com-access_log
+ #</VirtualHost>
+
+
+--- 177,186 ----
+
+ #<VirtualHost host.some_domain.com>
+ #ServerAdmin webmaster@host.some_domain.com
+! #DocumentRoot /usr/local/www/host.some_domain.com/data
+ #ServerName host.some_domain.com
+! #ErrorLog /var/log/host.some_domain.com-error_log
+! #TransferLog /var/log/host.some_domain.com-access_log
+ #</VirtualHost>
+
+
diff --git a/www/apache22/files/patch-ak b/www/apache22/files/patch-ak
new file mode 100644
index 000000000000..6dfaab049632
--- /dev/null
+++ b/www/apache22/files/patch-ak
@@ -0,0 +1,50 @@
+*** src/support/apachectl.orig Thu Oct 16 22:58:26 1997
+--- src/support/apachectl Thu Oct 23 03:35:09 1997
+***************
+*** 21,30 ****
+ # -------------------- --------------------
+ #
+ # the path to your PID file
+! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
+ #
+ # the path to your httpd binary
+! HTTPD=/usr/local/etc/httpd/src/httpd
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line. Designed for lynx, however other
+--- 21,30 ----
+ # -------------------- --------------------
+ #
+ # the path to your PID file
+! PIDFILE=/var/run/httpd.pid
+ #
+ # the path to your httpd binary
+! HTTPD=/usr/local/sbin/httpd
+ #
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line. Designed for lynx, however other
+***************
+*** 33,42 ****
+ #
+ # the URL to your server's mod_status status page. If you do not
+ # have one, then status and fullstatus will not work.
+! STATUSURL="http://localhost/server-status"
+ #
+ # -------------------- --------------------
+ # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+
+ ERROR=0
+ ARGV="$@"
+--- 33,44 ----
+ #
+ # the URL to your server's mod_status status page. If you do not
+ # have one, then status and fullstatus will not work.
+! STATUSURL="http://localhost/status"
+ #
+ # -------------------- --------------------
+ # |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
++
++ eval `limits -e -C daemon`
+
+ ERROR=0
+ ARGV="$@"
diff --git a/www/apache22/files/patch-al b/www/apache22/files/patch-al
new file mode 100644
index 000000000000..a7dca4f5b423
--- /dev/null
+++ b/www/apache22/files/patch-al
@@ -0,0 +1,44 @@
+*** src/support/log_server_status.bak Thu Oct 16 22:58:27 1997
+--- src/support/log_server_status Thu Oct 23 00:13:07 1997
+***************
+*** 62,68 ****
+ #
+ require 'sys/socket.ph';
+
+! $wherelog = "/var/log/graph/"; # Logs will be like "/var/log/graph/960312"
+ $server = "localhost"; # Name of server, could be "www.foo.com"
+ $port = "80"; # Port on server
+ $request = "/status/?auto"; # Request to send
+--- 62,68 ----
+ #
+ require 'sys/socket.ph';
+
+! $wherelog = "/var/log/httpd-status-"; # Logs will be like "/var/log/graph/960312"
+ $server = "localhost"; # Name of server, could be "www.foo.com"
+ $port = "80"; # Port on server
+ $request = "/status/?auto"; # Request to send
+***************
+*** 88,98 ****
+ ### Main
+
+ {
+! $date=`date +%y%m%d:%H%M%S`;
+ chop($date);
+ ($day,$time)=split(/:/,$date);
+ $res=&tcp_connect($server,$port);
+! open(OUT,">>$wherelog$day");
+ if ($res) {
+ print OUT "$time:-1:-1:-1:-1:$res\n";
+ exit 1;
+--- 88,98 ----
+ ### Main
+
+ {
+! $date=`LC_TIME=C date +%y%m%d:%H%M%S`;
+ chop($date);
+ ($day,$time)=split(/:/,$date);
+ $res=&tcp_connect($server,$port);
+! open(OUT,">>$wherelog$day.log");
+ if ($res) {
+ print OUT "$time:-1:-1:-1:-1:$res\n";
+ exit 1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:15:25 +0000