X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_date_api.c;h=32efdfb8bc6b706c6af6c480d4dda2100c0a2fe1;hp=02f619c27a18d7713188d3c06bb013d525a70c0b;hb=fb8b98d958d628027081c1a140c488665588d37c;hpb=d8523b1334eaf61f71233401fe401925230fe1e5

diff --git a/http_date_api.c b/http_date_api.c
index 02f619c..32efdfb 100644
--- a/http_date_api.c
+++ b/http_date_api.c
@@ -6,22 +6,17 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #include "php_http.h"
+
 #include "php_http_api.h"
 #include "php_http_date_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 static inline int check_day(const char *day, size_t len);
 static inline int check_month(const char *month);
 static inline int check_tzone(const char *tzone);
@@ -164,7 +159,7 @@ PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
 /* }}} */
 
 /* {{{ time_t http_parse_date(char *) */
-PHP_HTTP_API time_t _http_parse_date(const char *date TSRMLS_DC)
+PHP_HTTP_API time_t _http_parse_date_ex(const char *date, zend_bool silent TSRMLS_DC)
 {
 	time_t t = -1;
 	
@@ -185,7 +180,7 @@ PHP_HTTP_API time_t _http_parse_date(const char *date TSRMLS_DC)
 	putenv(tzput);
 #endif
 
-	if (-1 == t) {
+	if (-1 == t && !silent) {
 		http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Could not parse date: %s", date);
 	}
 	
@@ -209,11 +204,11 @@ static inline time_t parse_date(const char *date)
 	while (*date && (part < 6)) {
 		int found = 0;
 
-		while (*date && !isalnum(*date)) {
+		while (*date && !HTTP_IS_CTYPE(alnum, *date)) {
 			date++;
 		}
 
-		if (isalpha(*date)) {
+		if (HTTP_IS_CTYPE(alpha, *date)) {
 			/* a name coming up */
 			char buf[32] = "";
 			size_t len;
@@ -247,7 +242,7 @@ static inline time_t parse_date(const char *date)
 			}
 			date += len;
 		}
-		else if (isdigit(*date)) {
+		else if (HTTP_IS_CTYPE(digit, *date)) {
 			/* a digit */
 			int val;
 			char *end;