[PATCH] BeOS in 1.3.12

[David Reid <dr...@jetnet.co.uk>]

This patch allows mod_proxy to build under BeOS 4.5.2. Once my setup is more
organized and I've unpacked a few more bits then I'll try to test it.
Meanwhile, here's the patch.

david

diff -ru apache_1.3.12/src/include/ap_config.h
apache_1.3.12_beos/src/include/ap_config.h
--- apache_1.3.12/src/include/ap_config.h Wed Feb 23 12:44:56 2000
+++ apache_1.3.12_beos/src/include/ap_config.h Sun Feb 27 10:41:55 2000
@@ -890,6 +890,8 @@
 #define NO_WRITEV
 #define NO_KILLPG
 #define NEED_INITGROUPS
+#define PF_INET AF_INET
+#define S_IEXEC S_IXUSR

 #elif defined(_CX_SX)
 #define JMP_BUF sigjmp_buf
diff -ru apache_1.3.12/src/modules/proxy/proxy_ftp.c
apache_1.3.12_beos/src/modules/proxy/proxy_ftp.c
--- apache_1.3.12/src/modules/proxy/proxy_ftp.c Tue Jan 11 14:13:45 2000
+++ apache_1.3.12_beos/src/modules/proxy/proxy_ftp.c Sun Feb 27 10:44:24
2000
@@ -561,7 +561,7 @@
  return HTTP_INTERNAL_SERVER_ERROR;
     }

-#ifndef TPF
+#if !defined(TPF) && !defined(BEOS)
     if (conf->recv_buffer_size > 0
  && setsockopt(sock, SOL_SOCKET, SO_RCVBUF,
          (const char *) &conf->recv_buffer_size, sizeof(int))
@@ -815,7 +815,7 @@
  return HTTP_INTERNAL_SERVER_ERROR;
     }

-#ifndef TPF
+#if !defined (TPF) && !defined(BEOS)
     if (conf->recv_buffer_size) {
  if (setsockopt(dsock, SOL_SOCKET, SO_RCVBUF,
         (const char *) &conf->recv_buffer_size, sizeof(int)) == -1) {
diff -ru apache_1.3.12/src/modules/proxy/proxy_http.c
apache_1.3.12_beos/src/modules/proxy/proxy_http.c
--- apache_1.3.12/src/modules/proxy/proxy_http.c Tue Jan 11 14:13:45 2000
+++ apache_1.3.12_beos/src/modules/proxy/proxy_http.c Sun Feb 27 10:45:06
2000
@@ -258,7 +258,7 @@
  return HTTP_INTERNAL_SERVER_ERROR;
     }

-#ifndef TPF
+#if !defined(TPF) && !defined(BEOS)
     if (conf->recv_buffer_size) {
  if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF,
          (const char *) &conf->recv_buffer_size, sizeof(int))
diff -ru apache_1.3.12/src/modules/proxy/proxy_util.c
apache_1.3.12_beos/src/modules/proxy/proxy_util.c
--- apache_1.3.12/src/modules/proxy/proxy_util.c Tue Feb  8 00:34:40 2000
+++ apache_1.3.12_beos/src/modules/proxy/proxy_util.c Sun Feb 27 10:46:03
2000
@@ -280,7 +280,7 @@
  if (!ap_isdigit(host[i]) && host[i] != '.')
      break;
     /* must be an IP address */
-#if defined(WIN32) || defined(NETWARE) || defined(TPF)
+#if defined(WIN32) || defined(NETWARE) || defined(TPF) || defined(BEOS)
     if (host[i] == '\0' && (inet_addr(host) == -1))
 #else
     if (host[i] == '\0' && (ap_inet_addr(host) == -1 || inet_network(host)
== -1))