Call apr_create_socket() instead of apr_create_tcp_socket() (deprecated).

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

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index 0563f01964430d6b01663fd68665b92719d296f3..9b8c277bf561a8f6e5410146cffcbdbf45ae4234 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -172,7 +172,7 @@ int ap_proxy_connect_handler(request_rec *r, char *url,
             "CONNECT to %s on port %d", host, port);
     }
 
-    if ((apr_create_tcp_socket(&sock, r->pool)) != APR_SUCCESS) {
+    if ((apr_create_socket(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
             "proxy: error creating socket");
         return HTTP_INTERNAL_SERVER_ERROR;

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index b14c3f5b8eb49d91e1103aa5715571e84d671f13..e679f1931b6dee65b36b1a018f13fedc8bd598a4 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -246,7 +246,7 @@ int ap_proxy_http_handler(request_rec *r, char *url,
                                 "Connect to remote machine blocked");
     }
 
-    if ((apr_create_tcp_socket(&sock, r->pool)) != APR_SUCCESS) {
+    if ((apr_create_socket(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "proxy: error creating socket");
         return HTTP_INTERNAL_SERVER_ERROR;

diff --git a/support/ab.c b/support/ab.c
index 5b64d93db9754d4941d49679fd716cfebf453de0..c2d107b767916b24fc3e20302f257a7375334db7 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -492,11 +492,16 @@ static void start_connect(struct connection *c)
     c->cbx = 0;
     c->gotheader = 0;
 
-    if ((rv = apr_getaddrinfo(&destsa, hostname, AF_INET, port, 0, cntxt))
+    if ((rv = apr_getaddrinfo(&destsa, hostname, APR_UNSPEC, port, 0, cntxt))
          != APR_SUCCESS) {
-        apr_err("apr_getaddrinfo()", rv);
+        char buf[120];
+
+        apr_snprintf(buf, sizeof(buf), 
+                     "apr_getaddrinfo() for %s", hostname);
+        apr_err(buf, rv);
     }
-    if ((rv = apr_create_tcp_socket(&c->aprsock, cntxt)) != APR_SUCCESS) {
+    if ((rv = apr_create_socket(&c->aprsock, destsa->sa.sin.sin_family, 
+                                SOCK_STREAM, cntxt)) != APR_SUCCESS) {
         apr_err("Socket:", rv);
     }
     c->start = apr_now();
@@ -878,14 +883,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.33 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.34 $> apache-2.0");
         printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
         printf("\n");
     }
     else {
         printf("<p>\n");
-        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.33 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.34 $");
         printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");