You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/06/06 21:30:57 UTC
cvs commit: httpd-2.0/server protocol.c util_script.c
trawick 01/06/06 12:30:57
Modified: modules/http http_protocol.c
server protocol.c util_script.c
Log:
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
Revision Changes Path
1.324 +4 -4 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- http_protocol.c 2001/06/04 21:43:08 1.323
+++ http_protocol.c 2001/06/06 19:30:49 1.324
@@ -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 @@
*/
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 @@
&& ((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;
1.25 +0 -1 httpd-2.0/server/protocol.c
Index: protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- protocol.c 2001/06/01 17:26:19 1.24
+++ protocol.c 2001/06/06 19:30:53 1.25
@@ -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"
1.58 +2 -2 httpd-2.0/server/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- util_script.c 2001/05/08 20:55:23 1.57
+++ util_script.c 2001/06/06 19:30:54 1.58
@@ -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 @@
* 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")) {