From: Chuck Murcko <chuck@apache.org>
Date: Wed, 6 Jun 2001 21:51:58 +0000 (+0000)
Subject: Use apr-util's date functions now
X-Git-Tag: 2.0.19~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd71fdf9ac8c4fc6363a18018a47c56cc4abf8e5;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 7c2e9a7bd6f..155786e94c2 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -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"
 
 
diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index c34af9c9ac8..107f2cd21ba 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -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)) {
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index f3c0a697ffa..335952f564a 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -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;
 	    }