use apr-util's apr_date_parse_http() instead of the to-be-removed

ap_parseHTTPdate()

(proxy needs to make similar changes)

build changes forthcoming...

Submitted by:	Justin Erenkrantz

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

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index ab5f15245ba013d977ff1ac49250767f78d54e51..0d2b9ed65e5c1901ee7e655013ba16240a66505e 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -86,7 +86,7 @@
 #include "http_vhost.h"
 #include "http_log.h"           /* For errors detected in basic auth common
                                  * support code... */
-#include "util_date.h"          /* For parseHTTPdate and BAD_DATE */
+#include "apr_date.h"           /* For apr_date_parse_http and APR_DATE_BAD */
 #include "util_charset.h"
 #include "util_ebcdic.h"
 
@@ -235,9 +235,9 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)
          */
         if_unmodified = apr_table_get(r->headers_in, "If-Unmodified-Since");
         if (if_unmodified != NULL) {
-            apr_time_t ius = ap_parseHTTPdate(if_unmodified);
+            apr_time_t ius = apr_date_parse_http(if_unmodified);
 
-            if ((ius != BAD_DATE) && (mtime > ius)) {
+            if ((ius != APR_DATE_BAD) && (mtime > ius)) {
                 return HTTP_PRECONDITION_FAILED;
             }
         }
@@ -290,7 +290,7 @@ AP_DECLARE(int) ap_meets_conditions(request_rec *r)
              && ((if_modified_since =
                   apr_table_get(r->headers_in,
                                "If-Modified-Since")) != NULL)) {
-        apr_time_t ims = ap_parseHTTPdate(if_modified_since);
+        apr_time_t ims = apr_date_parse_http(if_modified_since);
 
        if ((ims >= mtime) && (ims <= r->request_time)) {
             return HTTP_NOT_MODIFIED;

diff --git a/server/protocol.c b/server/protocol.c
index 987e01c4b67c681f871ab4970460bc79fffaff0b..5bf304969dbd30647b48282e9f5ba84f0a9a5d53 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -86,7 +86,6 @@
 #include "http_vhost.h"
 #include "http_log.h"           /* For errors detected in basic auth common
                                  * support code... */
-#include "util_date.h"          /* For parseHTTPdate and BAD_DATE */
 #include "util_charset.h"
 #include "util_ebcdic.h"
 

diff --git a/server/util_script.c b/server/util_script.c
index 41c888ec3d5760842074ac6f703c25e64a017d78..12e22537ab736ac9ba1b8d7d5227b6f5243e2ce6 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -77,7 +77,7 @@
 #include "http_protocol.h"
 #include "http_request.h"      /* for sub_req_lookup_uri() */
 #include "util_script.h"
-#include "util_date.h"         /* For parseHTTPdate() */
+#include "apr_date.h"          /* For apr_date_parse_http() */
 #include "util_ebcdic.h"
 
 #ifdef OS2
@@ -546,7 +546,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
         * pass it on blindly because of restrictions on future values.
         */
        else if (!strcasecmp(w, "Last-Modified")) {
-           ap_update_mtime(r, ap_parseHTTPdate(l));
+           ap_update_mtime(r, apr_date_parse_http(l));
            ap_set_last_modified(r);
        }
        else if (!strcasecmp(w, "Set-Cookie")) {