Goodbye more dead code.

PR:
Obtained from:
Reviewed by:

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

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 7b61bbf9f793c6165308e2e9b04186e38f820148..377d70b5c4aeceaaff3a35a9c2d776565d6e419f 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -134,26 +134,6 @@ enum enctype {
 #define CRLF   "\015\012"
 #endif /*APR_CHARSET_EBCDIC*/
 
-#if 0
-#define        DEFAULT_FTP_DATA_PORT   20
-#define        DEFAULT_FTP_PORT        21
-#define        DEFAULT_GOPHER_PORT     70
-#define        DEFAULT_NNTP_PORT       119
-#define        DEFAULT_WAIS_PORT       210
-#define        DEFAULT_HTTPS_PORT      443
-#define        DEFAULT_SNEWS_PORT      563
-#define        DEFAULT_PROSPERO_PORT   1525    /* WARNING: conflict w/Oracle */
-
-#define DEFAULT_CACHE_COMPLETION (0.9)
-#endif
-
-#if 0
-/* Some WWW schemes and their default ports; this is basically /etc/services */
-struct proxy_services {
-    const char *scheme;
-    int port;
-};
-#endif
 
 /* static information about a remote proxy */
 struct proxy_remote {

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index 43425fe84207e06f7d86572cdbfe24f82b2c5a2b..975bd1e0eb1e80a0f69ecf01c66a3073f6d88b1f 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -62,11 +62,6 @@
 
 #include "mod_proxy.h"
 
-#if 0
-#ifdef HAVE_BSTRING_H
-#include <bstring.h>           /* for IRIX, FD_SET calls bzero() */
-#endif
-#endif
 
 /*  
  * This handles Netscape CONNECT method secure proxy requests.
@@ -316,23 +311,6 @@ int ap_proxy_connect_handler(request_rec *r, char *url,
     }
 
     /* Add client side to the poll */
-#if 0
-/* FIXME !!!! SDM !!! If someone can figure out how to turn a conn_rec into a ap_sock_t or something
-   this code might work. However if we must we can change r->connection->client to non-blocking and
-   just see if a recv gives us anything and do the same to sock (server) side, I'll leave this as TBD so
-   one can decide the best path to take
-*/
-    if(apr_os_sock_put(&client_sock,
-        (apr_os_sock_t *)get_socket(r->connection->client),
-                      r->pool) != APR_SUCCESS)
-    {
-       apr_socket_close(sock);
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-            "proxy: CONNECT: error creating client apr_socket_t");
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-/*    apr_poll_socket_add(pollfd, client_sock, APR_POLLIN);*/
-#endif
     apr_poll_socket_add(pollfd, r->connection->client_socket, APR_POLLIN);
 
     /* Add the server side to the poll */