]>
Commit | Line | Data |
---|---|---|
8c6f8622 PG |
1 | --- ./src/compat.h.orig Mon Jul 30 13:44:30 2001 |
2 | +++ ./src/compat.h Mon Jul 30 14:16:47 2001 | |
3 | @@ -71,7 +71,7 @@ | |
4 | ||
5 | #ifdef INET6 | |
6 | #define SOCKADDR sockaddr_storage | |
7 | -#define S_FAMILY __s_family | |
8 | +#define S_FAMILY __ss_family | |
9 | #define SERVER_AF AF_INET6 | |
10 | #else | |
11 | #define SOCKADDR sockaddr_in | |
12 | --- ./src/defines.h.orig Mon Jul 30 13:45:47 2001 | |
13 | +++ ./src/defines.h Mon Jul 30 13:46:46 2001 | |
14 | @@ -27,7 +27,7 @@ | |
15 | /***** Change this, or use -c on the command line to specify it *****/ | |
16 | ||
17 | #ifndef SERVER_ROOT | |
18 | -#define SERVER_ROOT "/etc/boa" | |
19 | +#define SERVER_ROOT "/etc/httpd" | |
20 | #endif | |
21 | ||
22 | /***** Various stuff that you may want to tweak, but probably shouldn't *****/ | |
a8e914d2 PG |
23 | --- ./src/ip.c.org Sat Dec 22 23:29:05 2001 |
24 | +++ ./src/ip.c Sat Dec 22 23:33:04 2001 | |
8c6f8622 PG |
25 | @@ -43,6 +43,7 @@ |
26 | */ | |
a8e914d2 | 27 | |
8c6f8622 PG |
28 | #include "boa.h" |
29 | +#include "compat.h" | |
a8e914d2 PG |
30 | #include <arpa/inet.h> /* inet_ntoa */ |
31 | ||
32 | /* Binds to the existing server_s, based on the configuration string | |
8c6f8622 PG |
33 | @@ -89,8 +90,6 @@ |
34 | dest, len, NULL, 0, NI_NUMERICHOST)) { | |
35 | fprintf(stderr, "[IPv6] getnameinfo failed\n"); | |
36 | *dest = '\0'; | |
37 | - } else { | |
38 | - conn->local_ip_addr = strdup(host); | |
39 | } | |
40 | #ifdef WHEN_DOES_THIS_APPLY | |
41 | if ((s->__ss_family == AF_INET6) && | |
42 | --- ./src/request.c.orig Mon Jul 30 13:48:11 2001 | |
43 | +++ ./src/request.c Mon Jul 30 13:49:29 2001 | |
44 | @@ -191,7 +191,10 @@ | |
45 | ascii_sockaddr(&remote_addr, conn->remote_ip_addr, NI_MAXHOST); | |
46 | ||
47 | /* for possible use by CGI programs */ | |
48 | + /* the structure doesn't contain port | |
49 | conn->remote_port = ntohs(remote_addr.sin_port); | |
50 | + */ | |
51 | + conn->remote_port = 0; | |
52 | ||
53 | status.requests++; | |
54 | ||
55 | --- ./src/Makefile.in.orig Mon Jul 30 13:52:33 2001 | |
56 | +++ ./src/Makefile.in Mon Jul 30 14:11:26 2001 | |
57 | @@ -14,7 +14,8 @@ | |
58 | ||
59 | LDFLAGS = @LDFLAGS@ | |
60 | LIBS = @LIBS@ | |
61 | -CFLAGS = @CFLAGS@ -I. | |
62 | +#CFLAGS = @CFLAGS@ -I. | |
63 | +CFLAGS = @CFLAGS@ | |
64 | ||
65 | # Change these if necessary | |
66 | ||
67 | --- ./boa.conf.orig Mon Jul 30 13:49:43 2001 | |
68 | +++ ./boa.conf Mon Jul 30 13:52:00 2001 | |
1e3d5c08 | 69 | @@ -45,8 +45,8 @@ |
944accd6 JR |
70 | # User: The name or UID the server should run as. |
71 | # Group: The group name or GID the server should run as. | |
72 | ||
73 | -User nobody | |
74 | -Group nogroup | |
75 | +User http | |
76 | +Group http | |
77 | ||
78 | # ServerAdmin: The email address where server problems should be sent. | |
1e3d5c08 | 79 | # Note: this is not currently used, except as an environment variable |
80 | @@ -59,7 +59,7 @@ | |
18bbd9d3 | 81 | # Set to /dev/null if you don't want errors logged. |
1e3d5c08 | 82 | # If unset, defaults to /dev/stderr |
18bbd9d3 JR |
83 | |
84 | -ErrorLog /var/log/boa/error_log | |
85 | +ErrorLog /var/log/httpd/error_log | |
1e3d5c08 | 86 | # Please NOTE: Sending the logs to a pipe ('|'), as shown below, |
87 | # is somewhat experimental and might fail under heavy load. | |
88 | # "Usual libc implementations of printf will stall the whole | |
89 | @@ -71,7 +71,7 @@ | |
18bbd9d3 JR |
90 | # Comment out or set to /dev/null (less effective) to disable |
91 | # Access logging. | |
92 | ||
93 | -AccessLog /var/log/boa/access_log | |
94 | +AccessLog /var/log/httpd/access_log | |
1e3d5c08 | 95 | # Please NOTE: Sending the logs to a pipe ('|'), as shown below, |
96 | # is somewhat experimental and might fail under heavy load. | |
97 | # "Usual libc implementations of printf will stall the whole | |
98 | @@ -108,7 +108,7 @@ | |
944accd6 | 99 | # DocumentRoot: The root directory of the HTML documents. |
1e3d5c08 | 100 | # Comment out to disable server non user files. |
944accd6 JR |
101 | |
102 | -DocumentRoot /var/www | |
ff223964 | 103 | +DocumentRoot /home/httpd/html |
944accd6 | 104 | |
1e3d5c08 | 105 | # UserDir: The name of the directory which is appended onto a user's home |
106 | # directory if a ~user request is recieved. | |
107 | @@ -127,7 +127,7 @@ | |
108 | # DirectoryIndex are commented out, accessing a directory will give | |
109 | # an error (though accessing files in the directory are still ok). | |
944accd6 | 110 | |
1e3d5c08 | 111 | -DirectoryMaker /usr/lib/boa/boa_indexer |
240d4b68 | 112 | +DirectoryMaker /usr/sbin/boa_indexer |
944accd6 | 113 | |
1e3d5c08 | 114 | # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker |
115 | # has been commented out, the the on-the-fly indexing of Boa can be used | |
116 | @@ -182,5 +182,5 @@ | |
944accd6 JR |
117 | # ScriptAlias: Maps a virtual path to a directory for serving scripts |
118 | # Example: ScriptAlias /htbin/ /www/htbin/ | |
119 | ||
120 | -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ | |
f0dafed8 | 121 | +ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/ |
944accd6 | 122 |