- revert user changes

[packages/boa.git] / boa-PLD.patch

diff --git a/boa-PLD.patch b/boa-PLD.patch
index c905c554211af616aad6d227244e74e221a81431..3a11af9727a018a7cc2e95d4cdb113eb0e3d4372 100644 (file)
--- a/boa-PLD.patch
+++ b/boa-PLD.patch
@@ -5,7 +5,7 @@
  #ifdef INET6
  #define SOCKADDR sockaddr_storage
 -#define S_FAMILY __s_family
-+#define S_FAMILY __ss_family
++#define S_FAMILY ss_family
  #define SERVER_AF AF_INET6
  #else
  #define SOCKADDR sockaddr_in
@@ -20,38 +20,6 @@
  #endif
  
  /***** Various stuff that you may want to tweak, but probably shouldn't *****/
---- ./src/ip.c.org      Sat Dec 22 23:29:05 2001
-+++ ./src/ip.c  Sat Dec 22 23:33:04 2001
-@@ -43,6 +43,7 @@
-     */
-
- #include "boa.h"
-+#include "compat.h"
- #include <arpa/inet.h>          /* inet_ntoa */
-
- /* Binds to the existing server_s, based on the configuration string
-@@ -89,8 +90,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) &&
---- ./src/request.c.orig       Mon Jul 30 13:48:11 2001
-+++ ./src/request.c    Mon Jul 30 13:49:29 2001
-@@ -191,7 +191,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++;
- 
 --- ./src/Makefile.in.orig     Mon Jul 30 13:52:33 2001
 +++ ./src/Makefile.in  Mon Jul 30 14:11:26 2001
 @@ -14,7 +14,8 @@
@@ -100,7 +68,7 @@
  # Comment out to disable server non user files.
  
 -DocumentRoot /var/www
-+DocumentRoot /home/httpd/html
++DocumentRoot /home/services/httpd/html
  
  # UserDir: The name of the directory which is appended onto a user's home
  # directory if a ~user request is recieved.
@@ -109,7 +77,7 @@
  # an error (though accessing files in the directory are still ok).
  
 -DirectoryMaker /usr/lib/boa/boa_indexer
-+DirectoryMaker /usr/sbin/boa/boa_indexer
++DirectoryMaker /usr/sbin/boa_indexer
  
  # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
  # has been commented out, the the on-the-fly indexing of Boa can be used
@@ -118,5 +86,5 @@
  # Example: ScriptAlias /htbin/ /www/htbin/
  
 -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-+ScriptAlias /cgi-bin/ /home/httpd/cgi-bin/
++ScriptAlias /cgi-bin/ /home/services/httpd/cgi-bin/