diff options
| author | Ian Holsman <ianh@apache.org> | 2001-07-18 22:35:13 +0200 |
|---|---|---|
| committer | Ian Holsman <ianh@apache.org> | 2001-07-18 22:35:13 +0200 |
| commit | 4318882a793af036056878674e2c0e6973654dea (patch) | |
| tree | 635934fdf567e618344e73a38bab439d9370da54 /modules/proxy | |
| parent | s/destroy/free/g; likeness to SSL naming (diff) | |
| download | apache2-4318882a793af036056878674e2c0e6973654dea.tar.xz apache2-4318882a793af036056878674e2c0e6973654dea.zip | |
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
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/proxy_connect.c | 2 | ||||
| -rw-r--r-- | modules/proxy/proxy_ftp.c | 8 | ||||
| -rw-r--r-- | modules/proxy/proxy_http.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c index 82dd7337d6..e238c66fdc 100644 --- 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 0bc8fc60b7..a6fca34980 100644 --- 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 d1dcd2cf2d..446a4707ac 100644 --- 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; |