]>
Commit | Line | Data |
---|---|---|
1e3d5c08 | 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 | |
4 | @@ -45,8 +45,8 @@ | |
944accd6 JR |
5 | # User: The name or UID the server should run as. |
6 | # Group: The group name or GID the server should run as. | |
7 | ||
8 | -User nobody | |
9 | -Group nogroup | |
10 | +User http | |
11 | +Group http | |
12 | ||
13 | # ServerAdmin: The email address where server problems should be sent. | |
1e3d5c08 | 14 | # Note: this is not currently used, except as an environment variable |
15 | @@ -59,7 +59,7 @@ | |
18bbd9d3 | 16 | # Set to /dev/null if you don't want errors logged. |
1e3d5c08 | 17 | # If unset, defaults to /dev/stderr |
18bbd9d3 JR |
18 | |
19 | -ErrorLog /var/log/boa/error_log | |
20 | +ErrorLog /var/log/httpd/error_log | |
1e3d5c08 | 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 | |
24 | @@ -71,7 +71,7 @@ | |
18bbd9d3 JR |
25 | # Comment out or set to /dev/null (less effective) to disable |
26 | # Access logging. | |
27 | ||
28 | -AccessLog /var/log/boa/access_log | |
29 | +AccessLog /var/log/httpd/access_log | |
1e3d5c08 | 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 | |
33 | @@ -108,7 +108,7 @@ | |
944accd6 | 34 | # DocumentRoot: The root directory of the HTML documents. |
1e3d5c08 | 35 | # Comment out to disable server non user files. |
944accd6 JR |
36 | |
37 | -DocumentRoot /var/www | |
ff223964 | 38 | +DocumentRoot /home/httpd/html |
944accd6 | 39 | |
1e3d5c08 | 40 | # UserDir: The name of the directory which is appended onto a user's home |
41 | # directory if a ~user request is recieved. | |
42 | @@ -127,7 +127,7 @@ | |
43 | # DirectoryIndex are commented out, accessing a directory will give | |
44 | # an error (though accessing files in the directory are still ok). | |
944accd6 | 45 | |
1e3d5c08 | 46 | -DirectoryMaker /usr/lib/boa/boa_indexer |
47 | +DirectoryMaker /usr/sbin/boa/boa_indexer | |
944accd6 | 48 | |
1e3d5c08 | 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 | |
51 | @@ -182,5 +182,5 @@ | |
944accd6 JR |
52 | # ScriptAlias: Maps a virtual path to a directory for serving scripts |
53 | # Example: ScriptAlias /htbin/ /www/htbin/ | |
54 | ||
55 | -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ | |
f0dafed8 | 56 | +ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/ |
944accd6 | 57 | |
1e3d5c08 | 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 | |
d109d286 | 61 | @@ -12,7 +12,7 @@ |
1e3d5c08 | 62 | # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof |
1afa61a6 | 63 | |
d109d286 | 64 | -LDFLAGS = @LIBS@ -g |
1e3d5c08 | 65 | -CFLAGS = -O -Wall -g |
d109d286 | 66 | +LDFLAGS = @LDFLAGS@ |
f3533654 | 67 | +CFLAGS = @CFLAGS@ |
1afa61a6 AM |
68 | |
69 | # Change these if necessary | |
70 | ||
0df726c2 | 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 | |
74 | @@ -71,7 +71,7 @@ | |
75 | ||
76 | #ifdef INET6 | |
77 | #define SOCKADDR sockaddr_storage | |
78 | -#define S_FAMILY __s_family | |
79 | +#define S_FAMILY __ss_family | |
80 | #define SERVER_AF AF_INET6 | |
81 | #else | |
82 | #define SOCKADDR sockaddr_in | |
1e3d5c08 | 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 | |
86 | @@ -27,7 +27,7 @@ | |
944accd6 JR |
87 | /***** Change this, or use -c on the command line to specify it *****/ |
88 | ||
89 | #ifndef SERVER_ROOT | |
90 | -#define SERVER_ROOT "/etc/boa" | |
ff223964 | 91 | +#define SERVER_ROOT "/etc/httpd" |
944accd6 JR |
92 | #endif |
93 | ||
1e3d5c08 | 94 | /***** Various stuff that you may want to tweak, but probably shouldn't *****/ |
612bc391 | 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 | |
98 | @@ -89,8 +89,6 @@ | |
99 | dest, len, NULL, 0, NI_NUMERICHOST)) { | |
100 | fprintf(stderr, "[IPv6] getnameinfo failed\n"); | |
101 | *dest = '\0'; | |
102 | - } else { | |
103 | - conn->local_ip_addr = strdup(host); | |
104 | } | |
105 | #ifdef WHEN_DOES_THIS_APPLY | |
106 | if ((s->__ss_family == AF_INET6) && | |
85ea3191 | 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 | |
110 | @@ -186,7 +186,10 @@ | |
111 | ascii_sockaddr(&remote_addr, conn->remote_ip_addr, NI_MAXHOST); | |
112 | ||
113 | /* for possible use by CGI programs */ | |
114 | + /* the structure doesn't contain port | |
115 | conn->remote_port = ntohs(remote_addr.sin_port); | |
116 | + */ | |
117 | + conn->remote_port = 0; | |
118 | ||
119 | status.requests++; | |
120 |