Commit 9e882e8e authored by Graham Leggett's avatar Graham Leggett
Browse files

Add the Retry-After support that was commented out in proxy_ftp.c 

PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88868 13f79535-47bb-0310-9956-ffa450edef68
parent 08238a6f

modules/proxy/proxy_ftp.c

+9 −8
Original line number Diff line number Diff line
@@ -777,22 +777,23 @@ PROXY_DECLARE (int) ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf 
    if (i == -1) {

	return ap_proxyerror(r, HTTP_BAD_GATEWAY, "Error reading from remote server");

    }

#if 0

    if (i == 120) {

	/* RFC2068 states:

	 * 14.38 Retry-After

	/* RFC2616 states:

	 * 14.37 Retry-After

	 * 

	 *  The Retry-After response-header field can be used with a 503 (Service

	 *  Unavailable) response to indicate how long the service is expected to

	 *  be unavailable to the requesting client. The value of this field can

	 *  be either an HTTP-date or an integer number of seconds (in decimal)

	 *  be unavailable to the requesting client. [...] The value of this field

	 *  can be either an HTTP-date or an integer number of seconds (in decimal)

	 *  after the time of the response.

	 *     Retry-After  = "Retry-After" ":" ( HTTP-date | delta-seconds )

	 */

	ap_table_add(r->headers_out, "Retry-After", apr_psprintf(p, "%u", 60*wait_mins);

	for (i=0 ; buffer[i] && !isdigit(buffer[i]); i++);

	if (buffer[i]) {

	    ap_table_add(r->headers_out, "Retry-After", apr_psprintf(p, "%lu", 60*atol(buffer+i)));

	}

	return ap_proxyerror(r, HTTP_SERVICE_UNAVAILABLE, buffer);

    }

#endif

    if (i != 220) {

	return ap_proxyerror(r, HTTP_BAD_GATEWAY, buffer);

    }