From: Jeff Trawick <trawick@apache.org>
Date: Wed, 6 Jun 2001 19:30:54 +0000 (+0000)
Subject: use apr-util's apr_date_parse_http() instead of the to-be-removed
X-Git-Tag: 2.0.19~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1464feb1864aede5b9d50c8ee322600fb4e7e93;p=thirdparty%2Fapache%2Fhttpd.git

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 ab5f15245ba..0d2b9ed65e5 100644
--- 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 987e01c4b67..5bf304969db 100644
--- 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 41c888ec3d5..12e22537ab7 100644
--- 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")) {