httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 proxy_connect.c proxy_ftp.c proxy_http.c
Date Tue, 17 Jul 2001 21:43:36 GMT
ianh        01/07/17 14:43:36

  Modified:    module-2.0 proxy_connect.c proxy_ftp.c proxy_http.c
  Log:
  Change the APR_INHERIT flag to APR_NO_INHERIT,which is the default (as recommended by rbb)
  
  Revision  Changes    Path
  1.47      +1 -1      httpd-proxy/module-2.0/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_connect.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- proxy_connect.c	2001/07/16 17:54:37	1.46
  +++ proxy_connect.c	2001/07/17 21:43:35	1.47
  @@ -216,7 +216,7 @@
       }
   
       /* create a new socket */
  -    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM,APR_INHERIT, r->pool))
!= APR_SUCCESS) {
  +    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM,APR_NO_INHERIT, r->pool))
!= APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
               "proxy: error creating socket");
           return HTTP_INTERNAL_SERVER_ERROR;
  
  
  
  1.74      +4 -4      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- proxy_ftp.c	2001/07/16 17:54:38	1.73
  +++ proxy_ftp.c	2001/07/17 21:43:35	1.74
  @@ -673,7 +673,7 @@
       }
   
   
  -    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_INHERIT, r->pool))
!= APR_SUCCESS) {
  +    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, 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 @@
                                "proxy: FTP: EPSV contacting remote host on port %d",
                                remote_port);
   
  -		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_INHERIT, r->pool))
!= APR_SUCCESS) {
  +		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT,
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 @@
                                "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_INHERIT, r->pool))
!= APR_SUCCESS) {
  +		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT,
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 @@
   	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_INHERIT, r->pool))
!= APR_SUCCESS) {
  +	if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, r->pool))
!= APR_SUCCESS) {
   	    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
   			 "proxy: FTP: error creating local socket");
   	    return HTTP_INTERNAL_SERVER_ERROR;
  
  
  
  1.80      +1 -1      httpd-proxy/module-2.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_http.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- proxy_http.c	2001/07/16 17:54:38	1.79
  +++ proxy_http.c	2001/07/17 21:43:35	1.80
  @@ -363,7 +363,7 @@
   	backend->connection = NULL;
   
   	/* see memory note above */
  -	if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_INHERIT, c->pool))
!= APR_SUCCESS) {
  +	if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_NO_INHERIT, c->pool))
!= APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
   			 "proxy: error creating socket");
   	    return HTTP_INTERNAL_SERVER_ERROR;
  
  
  

Mime
View raw message