You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2022/02/20 15:08:31 UTC
svn commit: r1898255 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ftp.c proxy_util.c
Author: jailletc36
Date: Sun Feb 20 15:08:30 2022
New Revision: 1898255
URL: http://svn.apache.org/viewvc?rev=1898255&view=rev
Log:
Remove some APR 0.x stuff.
The minimum supported version is 1.3 in 2.4.x
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=1898255&r1=1898254&r2=1898255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Sun Feb 20 15:08:30 2022
@@ -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
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1898255&r1=1898254&r2=1898255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sun Feb 20 15:08:30 2022
@@ -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
Re: svn commit: r1898255 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ftp.c proxy_util.c
Posted by Stefan Eissing <st...@eissing.org>.
Hero!
> Am 20.02.2022 um 16:08 schrieb jailletc36@apache.org:
>
> Author: jailletc36
> Date: Sun Feb 20 15:08:30 2022
> New Revision: 1898255
>
> URL: http://svn.apache.org/viewvc?rev=1898255&view=rev
> Log:
> Remove some APR 0.x stuff.
>
> The minimum supported version is 1.3 in 2.4.x
>
> Modified:
> httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
> httpd/httpd/trunk/modules/proxy/proxy_util.c
>
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=1898255&r1=1898254&r2=1898255&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Sun Feb 20 15:08:30 2022
> @@ -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
>
> Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1898255&r1=1898254&r2=1898255&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
> +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sun Feb 20 15:08:30 2022
> @@ -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
>
>