hi all
the attached patch is required for me to get mod_proxy to compile with -Werror.
--Geoff
Index: modules/proxy/proxy_ftp.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.145
diff -u -r1.145 proxy_ftp.c
--- modules/proxy/proxy_ftp.c 11 Aug 2004 23:28:58 -0000 1.145
+++ modules/proxy/proxy_ftp.c 17 Aug 2004 15:47:01 -0000
@@ -745,7 +745,8 @@
return OK;
}
-static ftp_proxyerror(request_rec *r, proxy_conn_rec *conn, int statuscode, const char *message)
+static
+int ftp_proxyerror(request_rec *r, proxy_conn_rec *conn, int statuscode, const char *message)
{
proxy_ftp_cleanup(r, conn);
return ap_proxyerror(r, statuscode, message);
@@ -782,7 +783,6 @@
int len, rc;
int one = 1;
char *size = NULL;
- apr_socket_t *origin_sock = NULL;
char xfer_type = 'A'; /* after ftp login, the default is ASCII */
int dirlisting = 0;
#if defined(USE_MDTM) && (defined(HAVE_TIMEGM) || defined(HAVE_GMTOFF))
Index: modules/proxy/proxy_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
retrieving revision 1.135
diff -u -r1.135 proxy_util.c
--- modules/proxy/proxy_util.c 13 Aug 2004 12:20:53 -0000 1.135
+++ modules/proxy/proxy_util.c 17 Aug 2004 15:47:04 -0000
@@ -19,6 +19,10 @@
#include "scoreboard.h"
#include "apr_version.h"
+#if APR_HAVE_UNISTD_H
+#include <unistd.h> /* for getpid() */
+#endif
+
#if (APR_MAJOR_VERSION < 1)
#undef apr_socket_create
#define apr_socket_create apr_socket_create_ex
@@ -1247,23 +1251,6 @@
/* All the workers are busy */
access_status = HTTP_SERVICE_UNAVAILABLE;
}
- return access_status;
-}
-
-PROXY_DECLARE(int) ap_proxy_post_request(proxy_worker *worker,
- proxy_balancer *balancer,
- request_rec *r,
- proxy_server_conf *conf)
-{
- int access_status;
- if (balancer)
- access_status = proxy_run_post_request(worker, balancer, r, conf);
- else {
-
-
- access_status = OK;
- }
-
return access_status;
}
