Commit bec3cecf authored by Ian Holsman's avatar Ian Holsman
Browse files

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'
PR:
Obtained from:
Submitted by:
Reviewed by:


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

modules/proxy/proxy_connect.c

+1 −1
Original line number Diff line number Diff line
@@ -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, 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;

modules/proxy/proxy_ftp.c

+4 −4
Original line number Diff line number Diff line
@@ -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, 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 @@ 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, 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 @@ 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, 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 @@ 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, 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;

modules/proxy/proxy_http.c

+2 −2
Original line number Diff line number Diff line
@@ -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, 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 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf, 
    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;

    }