Attachment #38066 for bug #65631

View | Details | Raw Unified | Return to bug 65631
Collapse All | Expand All




                  scheme, timeout >= 0 ? (double)timeout / APR_USEC_PER_SEC
                                       : (double)-1.0);

    /* Loop until either of direction of the connection is closed,
     * or a failure occurs.
     */
    do {

                }
            }
        }
    } while (!client->down_out && !origin->down_out);

    if (!client->down_out)  {
        ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
                      "proxy: %s: %s write shutdown",
                      scheme, client->name);
        apr_socket_shutdown(client->pfd->desc.s, 1);
    }

    if (!origin->down_out)  {
        ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
                      "proxy: %s: %s write shutdown",
                      scheme, origin->name);
        apr_socket_shutdown(origin->pfd->desc.s, 1);
    }

    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(10223)
                  "proxy: %s: tunnel finished", scheme);

Return to bug 65631

Lines 4868-4874 Link Here

(-)a/modules/proxy/proxy_util.c (-2 / +16 lines)
4868	scheme, timeout >= 0 ? (double)timeout / APR_USEC_PER_SEC	4868	scheme, timeout >= 0 ? (double)timeout / APR_USEC_PER_SEC
4869	: (double)-1.0);	4869	: (double)-1.0);
4870		4870
4871	/* Loop until both directions of the connection are closed,	4871	/* Loop until either of direction of the connection is closed,
4872	* or a failure occurs.	4872	* or a failure occurs.
4873	*/	4873	*/
4874	do {	4874	do {
Lines 5003-5009 Link Here
5003	}	5003	}
5004	}	5004	}
5005	}	5005	}
5006	} while (!client->down_out \|\| !origin->down_out);	5006	} while (!client->down_out && !origin->down_out);
		5007
		5008	if (!client->down_out) {
		5009	ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
		5010	"proxy: %s: %s write shutdown",
		5011	scheme, client->name);
		5012	apr_socket_shutdown(client->pfd->desc.s, 1);
		5013	}
		5014
		5015	if (!origin->down_out) {
		5016	ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r,
		5017	"proxy: %s: %s write shutdown",
		5018	scheme, origin->name);
		5019	apr_socket_shutdown(origin->pfd->desc.s, 1);
		5020	}
5007		5021
5008	ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(10223)	5022	ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(10223)
5009	"proxy: %s: tunnel finished", scheme);	5023	"proxy: %s: tunnel finished", scheme);