svn commit: r1935495 - apr/apr/trunk/test

[email protected] Fri, 19 Jun 2026 06:35:54 -0000
Newsgroups gmane.comp.apache.apr.cvs
Message-ID <178185095418.3208038.7797900666246694979@svn03-he-fi>
Author: brane
Date: Fri Jun 19 06:35:53 2026
New Revision: 1935495

Log:
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/trunk/test/sendfile.c
   apr/apr/trunk/test/sockchild.c
   apr/apr/trunk/test/testsock.c

Modified: apr/apr/trunk/test/sendfile.c
==============================================================================
--- apr/apr/trunk/test/sendfile.c	Fri Jun 19 04:20:07 2026	(r1935494)
+++ apr/apr/trunk/test/sendfile.c	Fri Jun 19 06:35:53 2026	(r1935495)
@@ -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/trunk/test/sockchild.c
==============================================================================
--- apr/apr/trunk/test/sockchild.c	Fri Jun 19 04:20:07 2026	(r1935494)
+++ apr/apr/trunk/test/sockchild.c	Fri Jun 19 06:35:53 2026	(r1935495)
@@ -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/trunk/test/testsock.c
==============================================================================
--- apr/apr/trunk/test/testsock.c	Fri Jun 19 04:20:07 2026	(r1935494)
+++ apr/apr/trunk/test/testsock.c	Fri Jun 19 06:35:53 2026	(r1935495)
@@ -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);
@@ -512,7 +512,7 @@ static void test_wait(abts_case *tc, voi
     server = setup_socket(tc);
     if (!server) return;
 
-    rv = apr_sockaddr_info_get(&server_addr, socket_name, socket_type, 8021, 0, p);
+    rv = apr_sockaddr_info_get(&server_addr, socket_name, socket_type, 38021, 0, p);
     APR_ASSERT_SUCCESS(tc, "setting up sockaddr", rv);
 
     rv = apr_socket_create(&client, server_addr->family, SOCK_STREAM, 0, p);