You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rs...@locus.apache.org on 2000/02/29 15:24:28 UTC
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c proxy_http.c proxy_util.c
rse 00/02/29 06:24:28
Modified: src CHANGES
src/include ap_config.h
src/modules/proxy proxy_ftp.c proxy_http.c proxy_util.c
Log:
Fixes to mod_proxy for BeOS support.
Submitted by: David Reid <dr...@jetnet.co.uk>
Revision Changes Path
1.1520 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1519
retrieving revision 1.1520
diff -u -r1.1519 -r1.1520
--- CHANGES 2000/02/28 20:56:06 1.1519
+++ CHANGES 2000/02/29 14:24:26 1.1520
@@ -1,5 +1,8 @@
Changes with Apache 1.3.13
+ *) Fixes to mod_proxy for BeOS support.
+ [David Reid <dr...@jetnet.co.uk>]
+
*) Fix return value calculation in APXS' error messages.
This should avoid the confusion on APXS errors.
[Ralf S. Engelschall]
1.284 +2 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- ap_config.h 2000/02/27 07:55:25 1.283
+++ ap_config.h 2000/02/29 14:24:27 1.284
@@ -891,6 +891,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
1.82 +2 -2 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- proxy_ftp.c 2000/01/11 14:13:45 1.81
+++ proxy_ftp.c 2000/02/29 14:24:27 1.82
@@ -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) {
1.67 +1 -1 apache-1.3/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- proxy_http.c 2000/01/11 14:13:45 1.66
+++ proxy_http.c 2000/02/29 14:24:27 1.67
@@ -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))
1.86 +1 -1 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- proxy_util.c 2000/02/08 00:34:40 1.85
+++ proxy_util.c 2000/02/29 14:24:28 1.86
@@ -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))