svn commit: r1935498 - in apr/apr/branches/1.7.x: . test

Author: brane
Date: Fri Jun 19 07:15:00 2026
New Revision: 1935498

Log:
Merge rMerge r1935495 from trunk:

Change the port used by sendfile and socket tests from 8021 to 38021.
The former clashes with the built-in FTP proxy on macOS.

Modified:
   apr/apr/branches/1.7.x/   (props changed)
   apr/apr/branches/1.7.x/test/sendfile.c
   apr/apr/branches/1.7.x/test/sockchild.c
   apr/apr/branches/1.7.x/test/testsock.c

Modified: apr/apr/branches/1.7.x/test/sendfile.c
==============================================================================
--- apr/apr/branches/1.7.x/test/sendfile.c	Fri Jun 19 06:54:04 2026	(r1935497)
+++ apr/apr/branches/1.7.x/test/sendfile.c	Fri Jun 19 07:15:00 2026	(r1935498)
@@ -50,7 +50,7 @@ int main(void)
 #define TRL3_LEN       90000
 #define TRL3_CHAR      '@'
 
-#define TESTSF_PORT    8021
+#define TESTSF_PORT    38021
 
 #define TESTFILE       "testsf.dat"
 

Modified: apr/apr/branches/1.7.x/test/sockchild.c
==============================================================================
--- apr/apr/branches/1.7.x/test/sockchild.c	Fri Jun 19 06:54:04 2026	(r1935497)
+++ apr/apr/branches/1.7.x/test/sockchild.c	Fri Jun 19 07:15:00 2026	(r1935498)
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
 
-    rv = apr_sockaddr_info_get(&remote_sa, argv[2], APR_UNSPEC, 8021, 0, p);
+    rv = apr_sockaddr_info_get(&remote_sa, argv[2], APR_UNSPEC, 38021, 0, p);
     if (rv != APR_SUCCESS) {
         exit(-1);
     }

Modified: apr/apr/branches/1.7.x/test/testsock.c
==============================================================================
--- apr/apr/branches/1.7.x/test/testsock.c	Fri Jun 19 06:54:04 2026	(r1935497)
+++ apr/apr/branches/1.7.x/test/testsock.c	Fri Jun 19 07:15:00 2026	(r1935498)
@@ -173,7 +173,7 @@ static apr_socket_t *setup_socket(abts_c
     apr_sockaddr_t *sa;
     apr_socket_t *sock;
 
-    rv = apr_sockaddr_info_get(&sa, socket_name, socket_type, 8021, 0, p);
+    rv = apr_sockaddr_info_get(&sa, socket_name, socket_type, 38021, 0, p);
     APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
 
     rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, p);