Remove APR_NO_INHERIT as it is now private.

sigh... the cost of being bleeding edge
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index 82dd7337d6bda0d61788aa60035fdb0418d29bd4..e238c66fdc26d7b420010360dd2eb1a6c6d64f04 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -216,7 +216,7 @@ int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf,
     }
 
     /* create a new socket */
-    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM,APR_NO_INHERIT, r->pool)) != APR_SUCCESS) {
+    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
             "proxy: error creating socket");
         return HTTP_INTERNAL_SERVER_ERROR;

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 0bc8fc60b703fc9f5a843d89475811ddc586c7bf..a6fca3498029111b0be678f1e7d07d6f0f2f93ec 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -673,7 +673,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     }
 
 
-    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, r->pool)) != APR_SUCCESS) {
+    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                       "proxy: FTP: error creating socket");
         return HTTP_INTERNAL_SERVER_ERROR;
@@ -1038,7 +1038,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
                              "proxy: FTP: EPSV contacting remote host on port %d",
                              remote_port);
 
-               if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, r->pool)) != APR_SUCCESS) {
+               if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                                  "proxy: FTP: error creating EPSV socket");
                    return HTTP_INTERNAL_SERVER_ERROR;
@@ -1132,7 +1132,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
                              "proxy: FTP: PASV contacting host %d.%d.%d.%d:%d",
                              h3, h2, h1, h0, pasvport);
 
-               if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, r->pool)) != APR_SUCCESS) {
+               if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                                  "proxy: error creating PASV socket");
                    return HTTP_INTERNAL_SERVER_ERROR;
@@ -1174,7 +1174,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
        apr_port_t local_port;
        unsigned int h0, h1, h2, h3, p0, p1;
 
-       if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, r->pool)) != APR_SUCCESS) {
+       if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS) {
            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                         "proxy: FTP: error creating local socket");
            return HTTP_INTERNAL_SERVER_ERROR;

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index d1dcd2cf2d47d75d79ea7f1293617b9adde44bfc..446a4707ac30b8b94125243156db33d5c0a38d9a 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -363,7 +363,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
        backend->connection = NULL;
 
        /* see memory note above */
-       if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, c->pool)) != APR_SUCCESS) {
+       if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, c->pool)) != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
                         "proxy: error creating socket");
            return HTTP_INTERNAL_SERVER_ERROR;