1 diff -bruN boa-0.94.8.2/boa.conf boa-0.94.8.2.pld/boa.conf
2 --- boa-0.94.8.2/boa.conf Sun Jan 30 02:39:48 2000
3 +++ boa-0.94.8.2.pld/boa.conf Sun Sep 10 04:35:38 2000
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, except as an environment variable
16 # Set to /dev/null if you don't want errors logged.
17 # If unset, defaults to /dev/stderr
19 -ErrorLog /var/log/boa/error_log
20 +ErrorLog /var/log/httpd/error_log
21 # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
22 # is somewhat experimental and might fail under heavy load.
23 # "Usual libc implementations of printf will stall the whole
25 # Comment out or set to /dev/null (less effective) to disable
28 -AccessLog /var/log/boa/access_log
29 +AccessLog /var/log/httpd/access_log
30 # Please NOTE: Sending the logs to a pipe ('|'), as shown below,
31 # is somewhat experimental and might fail under heavy load.
32 # "Usual libc implementations of printf will stall the whole
34 # DocumentRoot: The root directory of the HTML documents.
35 # Comment out to disable server non user files.
37 -DocumentRoot /var/www
38 +DocumentRoot /home/httpd/html
40 # UserDir: The name of the directory which is appended onto a user's home
41 # directory if a ~user request is recieved.
43 # DirectoryIndex are commented out, accessing a directory will give
44 # an error (though accessing files in the directory are still ok).
46 -DirectoryMaker /usr/lib/boa/boa_indexer
47 +DirectoryMaker /usr/sbin/boa/boa_indexer
49 # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
50 # has been commented out, the the on-the-fly indexing of Boa can be used
52 # ScriptAlias: Maps a virtual path to a directory for serving scripts
53 # Example: ScriptAlias /htbin/ /www/htbin/
55 -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
56 +ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
58 diff -bruN boa-0.94.8.2/src/Makefile.in boa-0.94.8.2.pld/src/Makefile.in
59 --- boa-0.94.8.2/src/Makefile.in Sat Feb 12 22:52:45 2000
60 +++ boa-0.94.8.2.pld/src/Makefile.in Sun Sep 10 04:37:16 2000
62 # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof
69 # Change these if necessary
71 diff -bruN boa-0.94.8.2/src/compat.h boa-0.94.8.2.pld/src/compat.h
72 --- boa-0.94.8.2/src/compat.h Mon Apr 10 21:45:57 2000
73 +++ boa-0.94.8.2.pld/src/compat.h Sun Sep 10 05:02:16 2000
77 #define SOCKADDR sockaddr_storage
78 -#define S_FAMILY __s_family
79 +#define S_FAMILY __ss_family
80 #define SERVER_AF AF_INET6
82 #define SOCKADDR sockaddr_in
83 diff -bruN boa-0.94.8.2/src/defines.h boa-0.94.8.2.pld/src/defines.h
84 --- boa-0.94.8.2/src/defines.h Mon May 1 22:33:25 2000
85 +++ boa-0.94.8.2.pld/src/defines.h Sun Sep 10 04:38:02 2000
87 /***** Change this, or use -c on the command line to specify it *****/
90 -#define SERVER_ROOT "/etc/boa"
91 +#define SERVER_ROOT "/etc/httpd"
94 /***** Various stuff that you may want to tweak, but probably shouldn't *****/
95 diff -bruN boa-0.94.8.2/src/ip.c boa-0.94.8.2.pld/src/ip.c
96 --- boa-0.94.8.2/src/ip.c Sat Feb 12 22:52:45 2000
97 +++ boa-0.94.8.2.pld/src/ip.c Sun Sep 10 04:47:32 2000
99 dest, len, NULL, 0, NI_NUMERICHOST)) {
100 fprintf(stderr, "[IPv6] getnameinfo failed\n");
103 - conn->local_ip_addr = strdup(host);
105 #ifdef WHEN_DOES_THIS_APPLY
106 if ((s->__ss_family == AF_INET6) &&
107 diff -bruN boa-0.94.8.2/src/request.c boa-0.94.8.2.pld/src/request.c
108 --- boa-0.94.8.2/src/request.c Fri May 26 04:46:03 2000
109 +++ boa-0.94.8.2.pld/src/request.c Sun Sep 10 04:58:44 2000
111 ascii_sockaddr(&remote_addr, conn->remote_ip_addr, NI_MAXHOST);
113 /* for possible use by CGI programs */
114 + /* the structure doesn't contain port
115 conn->remote_port = ntohs(remote_addr.sin_port);
117 + conn->remote_port = 0;