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 Mon, 16 Jul 2001 17:54:40 GMT
ianh        01/07/16 10:54:40

  Modified:    module-2.0 proxy_connect.c proxy_ftp.c proxy_http.c
  Log:
  applies change in APR function apr_socket_create, which added a new parameter.
  I defaulted these to APR_INHERIT.
  Also..
  the connection-close was being merged, insted of 'set'
  
  Revision  Changes    Path
  1.46      +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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- proxy_connect.c	2001/05/23 06:43:45	1.45
  +++ proxy_connect.c	2001/07/16 17:54:37	1.46
  @@ -216,7 +216,7 @@
       }
   
       /* create a new socket */
  -    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS)
{
  +    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM,APR_INHERIT, r->pool))
!= APR_SUCCESS) {
           ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
               "proxy: error creating socket");
           return HTTP_INTERNAL_SERVER_ERROR;
  
  
  
  1.73      +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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- proxy_ftp.c	2001/07/02 03:37:37	1.72
  +++ proxy_ftp.c	2001/07/16 17:54:38	1.73
  @@ -673,7 +673,7 @@
       }
   
   
  -    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, r->pool)) != APR_SUCCESS)
{
  +    if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_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, r->pool)) !=
APR_SUCCESS) {
  +		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_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, r->pool)) !=
APR_SUCCESS) {
  +		if ((rv = apr_socket_create(&remote_sock, APR_INET, SOCK_STREAM, APR_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, r->pool)) != APR_SUCCESS)
{
  +	if ((rv = apr_socket_create(&local_sock, APR_INET, SOCK_STREAM, APR_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.79      +2 -2      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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- proxy_http.c	2001/07/14 20:18:45	1.78
  +++ proxy_http.c	2001/07/16 17:54:38	1.79
  @@ -363,7 +363,7 @@
   	backend->connection = NULL;
   
   	/* see memory note above */
  -	if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, c->pool)) != APR_SUCCESS)
{
  +	if ((rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_INHERIT, c->pool))
!= APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
   			 "proxy: error creating socket");
   	    return HTTP_INTERNAL_SERVER_ERROR;
  @@ -466,7 +466,7 @@
       close += ap_proxy_liststr(apr_table_get(r->headers_in, "Connection"), "close");
       ap_proxy_clear_connection(p, r->headers_in);
       if (close) {
  -	apr_table_mergen(r->headers_in, "Connection", "close");
  +	apr_table_setn(r->headers_in, "Connection", "close");
   	origin->keepalive = 0;
       }
   
  
  
  

Mime
View raw message