From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 20 Feb 2022 15:08:30 +0000 (+0000)
Subject: Remove some APR 0.x stuff.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~486
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0050cc5c5a9c2e935ed65a2ca33901cf9e60e560;p=thirdparty%2Fapache%2Fhttpd.git

Remove some APR 0.x stuff.

The minimum supported version is 1.3 in 2.4.x

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

diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 7df4a26f324..0dc3917c85c 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -23,11 +23,6 @@
 #endif
 #include "apr_version.h"
 
-#if (APR_MAJOR_VERSION < 1)
-#undef apr_socket_create
-#define apr_socket_create apr_socket_create_ex
-#endif
-
 #define AUTODETECT_PWD
 /* Automatic timestamping (Last-Modified header) based on MDTM is used if:
  * 1) the FTP server supports the MDTM command and
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 73567c22810..1cc275e18c9 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -31,11 +31,6 @@
 #include <unistd.h>         /* for getpid() */
 #endif
 
-#if (APR_MAJOR_VERSION < 1)
-#undef apr_socket_create
-#define apr_socket_create apr_socket_create_ex
-#endif
-
 #if APR_HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif