Commit d788dd0c authored by Chuck Murcko's avatar Chuck Murcko
Browse files

Use apr-util's date functions now 


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

modules/proxy/mod_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#include "apr_pools.h"

#include "apr_strings.h"

#include "apr_uri.h"

#include "apr_date.h"



#include "httpd.h"

#include "http_config.h"
@@ -103,7 +104,6 @@ 
#include "http_log.h"

#include "http_connection.h"

#include "util_filter.h"

#include "util_date.h"

#include "mod_core.h"

modules/proxy/proxy_http.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf, 
    len = strlen(buffer);



    /* Is it an HTTP/1 response?  This is buggy if we ever see an HTTP/1.10 */

    if (ap_checkmask(buffer, "HTTP/#.# ###*")) {

    if (apr_date_checkmask(buffer, "HTTP/#.# ###*")) {

	int major, minor;



	if (2 != sscanf(buffer, "HTTP/%u.%u", &major, &minor)) {

modules/proxy/proxy_util.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ PROXY_DECLARE(apr_table_t *)ap_proxy_read_headers(request_rec *r, request_rec *r 
	     * way, but log the fact.

	     * XXX: The mask check is buggy if we ever see an HTTP/1.10 */



	    if (!ap_checkmask(buffer, "HTTP/#.# ###*")) {

	    if (!apr_date_checkmask(buffer, "HTTP/#.# ###*")) {

		/* Nope, it wasn't even an extra HTTP header. Give up. */

		return NULL;

	    }