-diff -ur boa-0.93.16.1/examples/boa.conf boa-0.93.16.1.new/examples/boa.conf
---- boa-0.93.16.1/examples/boa.conf Sun Mar 28 15:09:59 1999
-+++ boa-0.93.16.1.new/examples/boa.conf Fri Jul 16 17:18:24 1999
-@@ -24,8 +24,8 @@
+diff -bruN boa-0.94.8.2/boa.conf boa-0.94.8.2.pld/boa.conf
+--- boa-0.94.8.2/boa.conf Sun Jan 30 02:39:48 2000
++++ boa-0.94.8.2.pld/boa.conf Sun Sep 10 04:35:38 2000
+@@ -45,8 +45,8 @@
# User: The name or UID the server should run as.
# Group: The group name or GID the server should run as.
+Group http
# ServerAdmin: The email address where server problems should be sent.
- # Note: this is not currently used.
-@@ -36,28 +36,28 @@
- # with /, it is considered relative to the server root.
+ # Note: this is not currently used, except as an environment variable
+@@ -59,7 +59,7 @@
# Set to /dev/null if you don't want errors logged.
+ # If unset, defaults to /dev/stderr
-ErrorLog /var/log/boa/error_log
+ErrorLog /var/log/httpd/error_log
-
- # AccessLog: The location of the access log file. If this does not
- # start with /, it is considered relative to the server root.
+ # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
+ # is somewhat experimental and might fail under heavy load.
+ # "Usual libc implementations of printf will stall the whole
+@@ -71,7 +71,7 @@
# Comment out or set to /dev/null (less effective) to disable
# Access logging.
-AccessLog /var/log/boa/access_log
+AccessLog /var/log/httpd/access_log
-
- # RefererLog: The location of the referer log file. If this does not
- # start with /, it is considered relative to the server root.
- # Comment out or set to /dev/null (less effective) to disable
- # referer logging.
-
--RefererLog /var/log/boa/referer_log
-+RefererLog /var/log/httpd/referer_log
-
- # AgentLog: The location of the agent log file. If this does not
- # start with /, it is considered relative to the server root.
- # Comment out or set to /dev/null (less effective) to disable
- # User-Agent logging.
-
--AgentLog /var/log/boa/agent_log
-+AgentLog /var/log/httpd/agent_log
-
- # VerboseCGILogs: this is just a logical switch.
- # Comment out to disable.
-@@ -72,7 +72,7 @@
-
+ # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
+ # is somewhat experimental and might fail under heavy load.
+ # "Usual libc implementations of printf will stall the whole
+@@ -108,7 +108,7 @@
# DocumentRoot: The root directory of the HTML documents.
+ # Comment out to disable server non user files.
-DocumentRoot /var/www
-+DocumentRoot /home/httpd/htdocs
-
- # ChRoot: Boa root '/' directory. This is useful to improve security of
- # your system. Don't forget that ALL DIRECTORIES used by boa except logs
-@@ -93,12 +93,12 @@
-
- DirectoryIndex index.html
-
--DirectoryMaker /usr/local/sbin/boa_indexer
-+DirectoryMaker /usr/sbin/boa_indexer
++DocumentRoot /home/httpd/html
- # LocalCodepage: Local codepage. This is send to client in 'Content-Type:'
- # header by default.
+ # UserDir: The name of the directory which is appended onto a user's home
+ # directory if a ~user request is recieved.
+@@ -127,7 +127,7 @@
+ # DirectoryIndex are commented out, accessing a directory will give
+ # an error (though accessing files in the directory are still ok).
--#LocalCodepage iso-8859-1
-+#LocalCodepage iso-8859-2
+-DirectoryMaker /usr/lib/boa/boa_indexer
++DirectoryMaker /usr/sbin/boa/boa_indexer
- # Codepage: Load codepage conversion table from file. This table will be used
- # on-the-fly conversion.
-@@ -161,7 +161,7 @@
+ # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
+ # has been commented out, the the on-the-fly indexing of Boa can be used
+@@ -182,5 +182,5 @@
# ScriptAlias: Maps a virtual path to a directory for serving scripts
# Example: ScriptAlias /htbin/ /www/htbin/
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
- # VirtualHost: Maps a virtual host to a directory.
- # Example: VirtualHost cz.boa.org /html/htdocs/boa/
-diff -ur boa-0.93.16.1/src/defines.h boa-0.93.16.1.new/src/defines.h
---- boa-0.93.16.1/src/defines.h Tue Jan 5 23:19:54 1999
-+++ boa-0.93.16.1.new/src/defines.h Fri Jul 16 17:07:27 1999
-@@ -26,7 +26,7 @@
+diff -bruN boa-0.94.8.2/src/Makefile.in boa-0.94.8.2.pld/src/Makefile.in
+--- boa-0.94.8.2/src/Makefile.in Sat Feb 12 22:52:45 2000
++++ boa-0.94.8.2.pld/src/Makefile.in Sun Sep 10 04:37:16 2000
+@@ -12,7 +12,7 @@
+ # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof
+
+-LDFLAGS = @LIBS@ -g
+-CFLAGS = -O -Wall -g
++LDFLAGS = @LDFLAGS@
++CFLAGS = @CFLAGS@
+
+ # Change these if necessary
+
+diff -bruN boa-0.94.8.2/src/compat.h boa-0.94.8.2.pld/src/compat.h
+--- boa-0.94.8.2/src/compat.h Mon Apr 10 21:45:57 2000
++++ boa-0.94.8.2.pld/src/compat.h Sun Sep 10 05:02:16 2000
+@@ -71,7 +71,7 @@
+
+ #ifdef INET6
+ #define SOCKADDR sockaddr_storage
+-#define S_FAMILY __s_family
++#define S_FAMILY __ss_family
+ #define SERVER_AF AF_INET6
+ #else
+ #define SOCKADDR sockaddr_in
+diff -bruN boa-0.94.8.2/src/defines.h boa-0.94.8.2.pld/src/defines.h
+--- boa-0.94.8.2/src/defines.h Mon May 1 22:33:25 2000
++++ boa-0.94.8.2.pld/src/defines.h Sun Sep 10 04:38:02 2000
+@@ -27,7 +27,7 @@
/***** Change this, or use -c on the command line to specify it *****/
#ifndef SERVER_ROOT
-#define SERVER_ROOT "/etc/boa"
-+#define SERVER_ROOT "/home/httpd"
++#define SERVER_ROOT "/etc/httpd"
#endif
- /***** Logs *****************************************************************/
-@@ -41,7 +41,7 @@
- #define USE_NLS 1
- #define USE_NLS_REFERER_REDIR 1
- #define USE_CHARSET_HEADER 1
--#define DEFAULT_CHARSET "iso-8859-1"
-+#define DEFAULT_CHARSET "iso-8859-2"
-
- /****** Authorization ******************************************************/
-
-diff -ur boa-0.93.16.1/util/resolver.pl boa-0.93.16.1.new/util/resolver.pl
---- boa-0.93.16.1/util/resolver.pl Sun Dec 20 00:46:33 1998
-+++ boa-0.93.16.1.new/util/resolver.pl Fri Jul 16 17:08:09 1999
-@@ -1,10 +1,10 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # IP address resolver for Boa
-
- # If you want an "in place" change to the log file,
- # change the first line to
--#!/usr/local/bin/perl -i.bak
-+#!/usr/bin/perl -i.bak
- # Otherwise, send the output of this program wherever you want:
- # resolver.pl access_log >access_log_resolved
+ /***** Various stuff that you may want to tweak, but probably shouldn't *****/
+diff -bruN boa-0.94.8.2/src/ip.c boa-0.94.8.2.pld/src/ip.c
+--- boa-0.94.8.2/src/ip.c Sat Feb 12 22:52:45 2000
++++ boa-0.94.8.2.pld/src/ip.c Sun Sep 10 04:47:32 2000
+@@ -89,8 +89,6 @@
+ dest, len, NULL, 0, NI_NUMERICHOST)) {
+ fprintf(stderr, "[IPv6] getnameinfo failed\n");
+ *dest = '\0';
+- } else {
+- conn->local_ip_addr = strdup(host);
+ }
+ #ifdef WHEN_DOES_THIS_APPLY
+ if ((s->__ss_family == AF_INET6) &&
+diff -bruN boa-0.94.8.2/src/request.c boa-0.94.8.2.pld/src/request.c
+--- boa-0.94.8.2/src/request.c Fri May 26 04:46:03 2000
++++ boa-0.94.8.2.pld/src/request.c Sun Sep 10 04:58:44 2000
+@@ -186,7 +186,10 @@
+ ascii_sockaddr(&remote_addr, conn->remote_ip_addr, NI_MAXHOST);
+
+ /* for possible use by CGI programs */
++ /* the structure doesn't contain port
+ conn->remote_port = ntohs(remote_addr.sin_port);
++ */
++ conn->remote_port = 0;
+
+ status.requests++;
projects / packages / boa.git / blobdiff