From bf820c325118b6ab78aab53693ebdb23df9e9d27 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Wed, 18 Aug 2004 13:34:17 +0000 Subject: [PATCH] Fix some compiler warnings in proxy PR: Obtained from: Submitted by: Geoffrey Young Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104708 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/proxy/mod_proxy.h | 1 + modules/proxy/proxy_ftp.c | 4 ++-- modules/proxy/proxy_util.c | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index ca521b9c7c..a2ac4a0621 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) Fix some compiler warnings in proxy + [Geoffrey Young ] + *) suexec: Pass the SERVER_SIGNATURE envvar through to CGIs. [Zvi Har'El ] diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 6d4d295dfc..995d688ec6 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -388,6 +388,7 @@ PROXY_DECLARE(struct proxy_balancer *) ap_proxy_get_balancer(apr_pool_t *p, prox PROXY_DECLARE(const char *) ap_proxy_add_balancer(proxy_balancer **balancer, apr_pool_t *p, proxy_server_conf *conf, const char *url); PROXY_DECLARE(void) ap_proxy_add_worker_to_balancer(apr_pool_t *pool, proxy_balancer *balancer, proxy_worker *worker); PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, proxy_balancer **balancer, request_rec *r, proxy_server_conf *conf, char **url); +PROXY_DECLARE(int) ap_proxy_post_request(proxy_worker *worker, proxy_balancer *balancer, request_rec *r, proxy_server_conf *conf); PROXY_DECLARE(int) ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, proxy_server_conf *conf, proxy_worker *worker, proxy_conn_rec *conn, apr_pool_t *ppool, apr_uri_t *uri, char **url, const char *proxyname, apr_port_t proxyport, char *server_portstr, int server_portstr_size); diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index a61c609225..e82636d265 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -745,7 +745,8 @@ apr_status_t proxy_ftp_cleanup(request_rec *r, proxy_conn_rec *backend) 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 ap_proxy_ftp_handler(request_rec *r, proxy_worker *worker, proxy_server_conf 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)) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 1bc52afc6f..9a0eed8ef0 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -19,6 +19,10 @@ #include "scoreboard.h" #include "apr_version.h" +#if APR_HAVE_UNISTD_H +#include /* for getpid() */ +#endif + #if (APR_MAJOR_VERSION < 1) #undef apr_socket_create #define apr_socket_create apr_socket_create_ex -- 2.40.0