Fix some compiler warnings in proxy

PR:
Obtained from:
Submitted by:	Geoffrey Young <geoff@modperlcookbook.org>
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104708 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ca521b9c7c792abcb9fa361c2d69b2ee0bb56b23..a2ac4a06212142145be5d355ed81e3907e608fd9 100644 (file)
--- 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 <geoff@modperlcookbook.org>]
+
   *) suexec: Pass the SERVER_SIGNATURE envvar through to CGIs.
      [Zvi Har'El <rl math.technion.ac.il>]
 

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 6d4d295dfcf0a98acbff6aef22ab6683ce575646..995d688ec6f4d922edbe3b55edffaa154d703172 100644 (file)
--- 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 a61c6092255d49f71e751bff132746826b69f287..e82636d26596e5c846af92bc061d07bfb7d2f222 100644 (file)
--- 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 1bc52afc6fea0350dc7b78c2d8c5ee30aca476eb..9a0eed8ef0b7e1ba72abb1776c9dba77f2a810e0 100644 (file)
--- 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 <unistd.h>         /* for getpid() */
+#endif
+
 #if (APR_MAJOR_VERSION < 1)
 #undef apr_socket_create
 #define apr_socket_create apr_socket_create_ex