1 diff -urN boa-0.93.16.1.orig/examples/boa.conf boa-0.93.16.1/examples/boa.conf
2 --- boa-0.93.16.1.orig/examples/boa.conf Sat Aug 14 17:10:00 1999
3 +++ boa-0.93.16.1/examples/boa.conf Sat Aug 14 17:10:04 1999
5 # User: The name or UID the server should run as.
6 # Group: The group name or GID the server should run as.
13 # ServerAdmin: The email address where server problems should be sent.
14 # Note: this is not currently used.
16 # with /, it is considered relative to the server root.
17 # Set to /dev/null if you don't want errors logged.
19 -ErrorLog /var/log/boa/error_log
20 +ErrorLog /var/log/httpd/error_log
22 # AccessLog: The location of the access log file. If this does not
23 # start with /, it is considered relative to the server root.
24 # Comment out or set to /dev/null (less effective) to disable
27 -AccessLog /var/log/boa/access_log
28 +AccessLog /var/log/httpd/access_log
30 # RefererLog: The location of the referer log file. If this does not
31 # start with /, it is considered relative to the server root.
32 # Comment out or set to /dev/null (less effective) to disable
35 -RefererLog /var/log/boa/referer_log
36 +RefererLog /var/log/httpd/referer_log
38 # AgentLog: The location of the agent log file. If this does not
39 # start with /, it is considered relative to the server root.
40 # Comment out or set to /dev/null (less effective) to disable
43 -AgentLog /var/log/boa/agent_log
44 +AgentLog /var/log/httpd/agent_log
46 # VerboseCGILogs: this is just a logical switch.
47 # Comment out to disable.
50 # DocumentRoot: The root directory of the HTML documents.
52 -DocumentRoot /var/www
53 +DocumentRoot /home/httpd/htdocs
55 # ChRoot: Boa root '/' directory. This is useful to improve security of
56 # your system. Don't forget that ALL DIRECTORIES used by boa except logs
59 DirectoryIndex index.html
61 -DirectoryMaker /usr/local/sbin/boa_indexer
62 +DirectoryMaker /usr/sbin/boa_indexer
64 # LocalCodepage: Local codepage. This is send to client in 'Content-Type:'
67 -#LocalCodepage iso-8859-1
68 +#LocalCodepage iso-8859-2
70 # Codepage: Load codepage conversion table from file. This table will be used
71 # on-the-fly conversion.
73 # ScriptAlias: Maps a virtual path to a directory for serving scripts
74 # Example: ScriptAlias /htbin/ /www/htbin/
76 -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
77 +ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
79 # VirtualHost: Maps a virtual host to a directory.
80 # Example: VirtualHost cz.boa.org /html/htdocs/boa/
81 diff -urN boa-0.93.16.1.orig/src/Makefile.in boa-0.93.16.1/src/Makefile.in
82 --- boa-0.93.16.1.orig/src/Makefile.in Sat Aug 14 17:10:00 1999
83 +++ boa-0.93.16.1/src/Makefile.in Sat Aug 14 17:11:25 1999
86 # Add -DNO_DAEMON if you do not want the server to fork upon launch
89 +CFLAGS = $(RPM_OPT_FLAGS)
91 MANDIR = /usr/local/man
92 BINDIR = /usr/local/sbin
94 # FreeBSD's make doesn't like `ifdef`, but likes `.ifdef`
96 -LDFLAGS += -L/usr/inet6/lib -linet6
97 -CFLAGS += -DINET6 -I/usr/inet6/include
101 # Change these if necessary
103 diff -urN boa-0.93.16.1.orig/src/defines.h boa-0.93.16.1/src/defines.h
104 --- boa-0.93.16.1.orig/src/defines.h Sat Aug 14 17:10:00 1999
105 +++ boa-0.93.16.1/src/defines.h Sat Aug 14 17:10:04 1999
107 /***** Change this, or use -c on the command line to specify it *****/
110 -#define SERVER_ROOT "/etc/boa"
111 +#define SERVER_ROOT "/home/httpd"
114 /***** Logs *****************************************************************/
117 #define USE_NLS_REFERER_REDIR 1
118 #define USE_CHARSET_HEADER 1
119 -#define DEFAULT_CHARSET "iso-8859-1"
120 +#define DEFAULT_CHARSET "iso-8859-2"
122 /****** Authorization ******************************************************/
124 diff -urN boa-0.93.16.1.orig/src/request.c boa-0.93.16.1/src/request.c
125 --- boa-0.93.16.1.orig/src/request.c Sat Aug 14 17:10:00 1999
126 +++ boa-0.93.16.1/src/request.c Sat Aug 14 17:14:43 1999
128 #include <netinet/tcp.h>
132 -#include <support.h>
135 int sockbufsize = SOCKETBUF_SIZE;
137 extern int server_s; /* boa socket */
139 /* for log file and possible use by CGI programs */
141 if (getnameinfo((struct sockaddr *)&remote_addr,
142 - NRL_SA_LEN((struct sockaddr *)&remote_addr),
143 + SA_LEN((struct sockaddr *)&remote_addr),
144 conn->remote_ip_addr, 20,
145 NULL, 0, NI_NUMERICHOST)) {
146 fprintf(stderr, "[IPv6] getnameinfo failed\n");
148 if (getsockname(conn->fd, (struct sockaddr *) &salocal, &dummy) == -1)
150 if (getnameinfo((struct sockaddr *)&salocal,
151 - NRL_SA_LEN((struct sockaddr *)&salocal),
152 + SA_LEN((struct sockaddr *)&salocal),
154 NULL, 0, NI_NUMERICHOST)) {
155 fprintf(stderr, "[IPv6] getnameinfo failed\n");
156 diff -urN boa-0.93.16.1.orig/util/Makefile boa-0.93.16.1/util/Makefile
157 --- boa-0.93.16.1.orig/util/Makefile Sat Aug 14 17:10:00 1999
158 +++ boa-0.93.16.1/util/Makefile Sat Aug 14 17:10:04 1999
162 cpsel: cpsel.c cpsel.config.h
163 - gcc -o cpsel cpsel.c
164 + gcc $(RPM_OPT_FLAGS) -o cpsel cpsel.c
167 - gcc -o cp-test cp-test.c
168 + gcc $(RPM_OPT_FLAGS) -o cp-test cp-test.c
170 boa_indexer: index_dir.c
171 - gcc -o boa_indexer index_dir.c
172 + gcc $(RPM_OPT_FLAGS) -o boa_indexer index_dir.c
173 diff -urN boa-0.93.16.1.orig/util/resolver.pl boa-0.93.16.1/util/resolver.pl
174 --- boa-0.93.16.1.orig/util/resolver.pl Sat Aug 14 17:10:00 1999
175 +++ boa-0.93.16.1/util/resolver.pl Sat Aug 14 17:10:04 1999
177 -#!/usr/local/bin/perl
180 # IP address resolver for Boa
182 # If you want an "in place" change to the log file,
183 # change the first line to
184 -#!/usr/local/bin/perl -i.bak
185 +#!/usr/bin/perl -i.bak
186 # Otherwise, send the output of this program wherever you want:
187 # resolver.pl access_log >access_log_resolved