X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_date_api.c;h=91c16766aba994136783995584ccfcb27a77d341;hp=fc67a89f57b525163aa2b8e9a5a36aa3d7cae2c1;hb=f2d0dbf38d7b00455d3dfba8f2de087105ae0f35;hpb=0ac32c9b8590e88a5f110cc8b3154001d5c0c089

diff --git a/http_date_api.c b/http_date_api.c
index fc67a89..91c1676 100644
--- a/http_date_api.c
+++ b/http_date_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -19,11 +16,8 @@
 #	include "config.h"
 #endif
 
-#include <ctype.h>
-
-#include "php.h"
 #include "php_http.h"
-#include "php_http_std_defs.h"
+#include "php_http_date_api.h"
 
 static int check_day(char *day, size_t len);
 static int check_month(char *month);
@@ -42,13 +36,14 @@ static const char *weekdays[] = {
 };
 static const char *months[] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Okt", "Nov", "Dec"
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
 enum assume_next {
 	DATE_MDAY,
 	DATE_YEAR,
 	DATE_TIME
 };
+#define DS -60
 static const struct time_zone {
 	const char *name;
 	const int offset;
@@ -56,22 +51,22 @@ static const struct time_zone {
     {"GMT", 0},     /* Greenwich Mean */
     {"UTC", 0},     /* Universal (Coordinated) */
     {"WET", 0},     /* Western European */
-    {"BST", 0},     /* British Summer */
+    {"BST", 0 DS}, /* British Summer */
     {"WAT", 60},    /* West Africa */
     {"AST", 240},   /* Atlantic Standard */
-    {"ADT", 240},   /* Atlantic Daylight */
+    {"ADT", 240 DS},/* Atlantic Daylight */
     {"EST", 300},   /* Eastern Standard */
-    {"EDT", 300},   /* Eastern Daylight */
+    {"EDT", 300 DS},/* Eastern Daylight */
     {"CST", 360},   /* Central Standard */
-    {"CDT", 360},   /* Central Daylight */
+    {"CDT", 360 DS},/* Central Daylight */
     {"MST", 420},   /* Mountain Standard */
-    {"MDT", 420},   /* Mountain Daylight */
+    {"MDT", 420 DS},/* Mountain Daylight */
     {"PST", 480},   /* Pacific Standard */
-    {"PDT", 480},   /* Pacific Daylight */
+    {"PDT", 480 DS},/* Pacific Daylight */
     {"YST", 540},   /* Yukon Standard */
-    {"YDT", 540},   /* Yukon Daylight */
+    {"YDT", 540 DS},/* Yukon Daylight */
     {"HST", 600},   /* Hawaii Standard */
-    {"HDT", 600},   /* Hawaii Daylight */
+    {"HDT", 600 DS},/* Hawaii Daylight */
     {"CAT", 600},   /* Central Alaska */
     {"AHST", 600},  /* Alaska-Hawaii Standard */
     {"NT",  660},   /* Nome */
@@ -79,22 +74,22 @@ static const struct time_zone {
     {"CET", -60},   /* Central European */
     {"MET", -60},   /* Middle European */
     {"MEWT", -60},  /* Middle European Winter */
-    {"MEST", -120}, /* Middle European Summer */
-    {"CEST", -120}, /* Central European Summer */
-    {"MESZ", -60},  /* Middle European Summer */
+    {"MEST", -60 DS},/* Middle European Summer */
+    {"CEST", -60 DS},/* Central European Summer */
+    {"MESZ", -60 DS},/* Middle European Summer */
     {"FWT", -60},   /* French Winter */
-    {"FST", -60},   /* French Summer */
+    {"FST", -60 DS},/* French Summer */
     {"EET", -120},  /* Eastern Europe, USSR Zone 1 */
     {"WAST", -420}, /* West Australian Standard */
-    {"WADT", -420}, /* West Australian Daylight */
+    {"WADT", -420 DS},/* West Australian Daylight */
     {"CCT", -480},  /* China Coast, USSR Zone 7 */
     {"JST", -540},  /* Japan Standard, USSR Zone 8 */
     {"EAST", -600}, /* Eastern Australian Standard */
-    {"EADT", -600}, /* Eastern Australian Daylight */
+    {"EADT", -600 DS},/* Eastern Australian Daylight */
     {"GST", -600},  /* Guam Standard, USSR Zone 9 */
     {"NZT", -720},  /* New Zealand */
     {"NZST", -720}, /* New Zealand Standard */
-    {"NZDT", -720}, /* New Zealand Daylight */
+    {"NZDT", -720 DS},/* New Zealand Daylight */
     {"IDLE", -720}, /* International Date Line East */
 };
 /* }}} */
@@ -132,7 +127,7 @@ static int check_month(char *month)
 
 static int check_tzone(char *tzone)
 {
-	int i;
+	unsigned i;
 	const struct time_zone *check = time_zones;
 	for (i = 0; i < sizeof(time_zones) / sizeof(time_zones[0]); i++) {
 		if (!strcmp(tzone, check->name)) {
@@ -149,7 +144,7 @@ PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
 {
 	struct tm *gmtime, tmbuf;
 
-	if (gmtime = php_gmtime_r(&t, &tmbuf)) {
+	if ((gmtime = php_gmtime_r(&t, &tmbuf))) {
 		char *date = ecalloc(1, 31);
 		snprintf(date, 30,
 			"%s, %02d %s %04d %02d:%02d:%02d GMT",
@@ -175,7 +170,7 @@ PHP_HTTP_API time_t _http_parse_date(const char *date)
 	enum assume_next dignext = DATE_MDAY;
 	const char *indate = date;
 
-	int found = 0, part = 0; /* max 6 parts */
+	int part = 0; /* max 6 parts */
 
 	while (*date && (part < 6)) {
 		int found = 0;