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 7c2e9a7bd6f4002fe994a0b88c261fed4a9e9f0e..155786e94c2c58f5d46c60c66302bbf643c608a0 100644 (file)
--- 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 c34af9c9ac81d8e348b6fac9c70a3b8455bb4a67..107f2cd21ba6d0ef13ef67d155f83dd869fc4470 100644 (file)
--- 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 f3c0a697ffa00855c3fdfe2010bef6f96f04637e..335952f564acb8a505a68dd1f49f0633488e4c95 100644 (file)
--- 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;
            }